198502 2019-06-03 15:53:49 -0700 [LFC][IFC] Remove InlineItem::width 2019-06-04 08:48:09 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1541367 0 zalan 2019-06-03 15:53:49 -0700 InlineItems are supposed to be reused across multiple layouts (and also in preferred width computation) so they should not hold layout dependent information (run width). 1541370 1 webkit-bug-importer 2019-06-03 15:54:25 -0700 <rdar://problem/51371744> 1541374 2 371225 zalan 2019-06-03 16:02:33 -0700 Created attachment 371225 Patch 1541587 3 zalan 2019-06-04 08:48:09 -0700 Committed r246065: <https://trac.webkit.org/changeset/246065> 371225 2019-06-03 16:02:33 -0700 2019-06-04 07:24:17 -0700 Patch bug-198502-20190603160231.patch text/plain 13500 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MDI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGQxY2JkZDNiOTczZTc3 YmJmNzNhNjZiNGRiNTU5ZGFlMTFiMzdjYS4uOTJmM2FkMDBjYmNmMTI2OTRmMGVlZTVhODg5YmYx Y2Y1YmI2ODZkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE5LTA2LTAzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBSZW1vdmUg SW5saW5lSXRlbTo6d2lkdGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE5ODUwMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTEzNzE3NDQ+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5saW5lSXRlbXMg YXJlIHN1cHBvc2QgdG8gd29yayBhY3Jvc3Mgc3Vic2VxdWVudCBsYXlvdXRzIChhbmQgaW4gcHJl ZmVycmVkIHdpZHRoIGNvbXB1dGF0aW9uIGFzIHdlbGwpIHNvIHRoZXkgc2hvdWxkCisgICAgICAg IG5vdCBob2xkIG9uIHRvIGxheW91dCBpbmZvcm1hdGlvbiAocnVuIHdpZHRoKS4gVGhpcyB3b3Vs ZCBub3Qgd29yayB3aXRoIHNwbGl0IHJ1bnMgZWl0aGVyLgorCisgICAgICAgICogbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpVbmNvbW1pdHRlZENvbnRlbnQ6OnJ1bnMpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpVbmNvbW1pdHRlZENvbnRlbnQ6OmlzRW1wdHkgY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpVbmNvbW1pdHRlZENvbnRlbnQ6OnNpemUg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpVbmNvbW1pdHRlZENvbnRlbnQ6OmFk ZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlVuY29tbWl0dGVkQ29udGVudDo6cmVzZXQp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGlu ZUxheW91dDo6cGxhY2VJbmxpbmVJdGVtcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0Ojpjb21wdXRlZEludHJpbnNp Y1dpZHRoIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ6OkxpbmVMYXlvdXQ6OmNyZWF0ZURpc3BsYXlSdW5zIGNvbnN0KToKKyAgICAgICAg KCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdD b250ZXh0OjpMaW5lTGF5b3V0Ojpjb21taXRJbmxpbmVJdGVtVG9MaW5lIGNvbnN0KTogRGVsZXRl ZC4KKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVJdGVtLmg6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUl0ZW06OnN0eWxlIGNvbnN0KToKKyAgICAgICAg KCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUl0ZW06OnNldFdp ZHRoKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lSXRlbTo6d2lk dGggY29uc3QpOiBEZWxldGVkLgorCiAyMDE5LTA2LTAzICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBh cHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIHJ1biB3aWR0aCBtZWFzdXJpbmcg b3V0IG9mIExpbmVCcmVha2VyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCAz YTVkN2JjZmJkZGQwOTZiOTRkZDE4M2Q4ZTM4NThiZDcxYjJiZDdhLi4yOGZiYWQzNDk4NGIwNjdh MzY1MzlhNjkzMjI4MmU2MzUzZTVmZGU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 LmgKQEAgLTc0LDcgKzc0LDYgQEAgcHJpdmF0ZToKICAgICAgICAgfTsKICAgICAgICAgTGluZUNv bnRlbnQgcGxhY2VJbmxpbmVJdGVtcyhjb25zdCBMaW5lSW5wdXQmKSBjb25zdDsKICAgICAgICAg dm9pZCBjcmVhdGVEaXNwbGF5UnVucyhjb25zdCBMaW5lOjpDb250ZW50JiwgTGF5b3V0VW5pdCB3 aWR0aENvbnN0cmFpbnQpIGNvbnN0OwotICAgICAgICB2b2lkIGNvbW1pdElubGluZUl0ZW1Ub0xp bmUoTGluZSYsIGNvbnN0IElubGluZUl0ZW0mKSBjb25zdDsKICAgICAgICAgdm9pZCBoYW5kbGVG bG9hdChMaW5lJiwgY29uc3QgRmxvYXRpbmdDb250ZXh0JiwgY29uc3QgSW5saW5lSXRlbSYgZmxv YXRCb3gpIGNvbnN0OwogICAgICAgICB2b2lkIGFsaWduUnVucyhUZXh0QWxpZ25Nb2RlLCB1bnNp Z25lZCBmaXJzdFJ1bkluZGV4LCBMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoKSBjb25zdDsKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91dC5jcHAKaW5k ZXggNzdkMmE0NDc2M2IwYjgxZjFjNThmNDI3Y2JiMWVjNDIxOWEzYjIxYy4uYjdkMTljYjZhNjE0 YTg4OWJmNzg4NDFlYjdkZmUxZjRjZDEwNWI5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVG b3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuY3BwCkBAIC00MiwyOCArNDIsMzMgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIExheW91dCB7CiAKIHN0cnVjdCBVbmNvbW1pdHRlZENv bnRlbnQgewotICAgIHZvaWQgYWRkKElubGluZUl0ZW0mKTsKKyAgICBzdHJ1Y3QgUnVuIHsKKyAg ICAgICAgY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbTsKKyAgICAgICAgTGF5b3V0VW5pdCBs b2dpY2FsV2lkdGg7CisgICAgICAgIC8vIEZJWE1FOiBhZGQgb3B0aW9uYWwgYnJlYWtpbmcgY29u dGV4dCAoc3RhcnQgYW5kIGVuZCBwb3NpdGlvbikgZm9yIHNwbGl0IHRleHQgY29udGVudC4KKyAg ICB9OworICAgIHZvaWQgYWRkKGNvbnN0IElubGluZUl0ZW0mLCBMYXlvdXRVbml0IGxvZ2ljYWxX aWR0aCk7CiAgICAgdm9pZCByZXNldCgpOwogCi0gICAgVmVjdG9yPElubGluZUl0ZW0qPiBpbmxp bmVJdGVtcygpIHsgcmV0dXJuIG1faW5saW5lSXRlbXM7IH0KLSAgICBib29sIGlzRW1wdHkoKSBj b25zdCB7IHJldHVybiBtX2lubGluZUl0ZW1zLmlzRW1wdHkoKTsgfQotICAgIHVuc2lnbmVkIHNp emUoKSBjb25zdCB7IHJldHVybiBtX2lubGluZUl0ZW1zLnNpemUoKTsgfQorICAgIFZlY3RvcjxS dW4+IHJ1bnMoKSB7IHJldHVybiBtX3VuY29tbWl0dGVkUnVuczsgfQorICAgIGJvb2wgaXNFbXB0 eSgpIGNvbnN0IHsgcmV0dXJuIG1fdW5jb21taXR0ZWRSdW5zLmlzRW1wdHkoKTsgfQorICAgIHVu c2lnbmVkIHNpemUoKSBjb25zdCB7IHJldHVybiBtX3VuY29tbWl0dGVkUnVucy5zaXplKCk7IH0K ICAgICBMYXlvdXRVbml0IHdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV93aWR0aDsgfQogCiBwcml2 YXRlOgotICAgIFZlY3RvcjxJbmxpbmVJdGVtKj4gbV9pbmxpbmVJdGVtczsKKyAgICBWZWN0b3I8 UnVuPiBtX3VuY29tbWl0dGVkUnVuczsKICAgICBMYXlvdXRVbml0IG1fd2lkdGg7CiB9OwogCi12 b2lkIFVuY29tbWl0dGVkQ29udGVudDo6YWRkKElubGluZUl0ZW0mIGlubGluZUl0ZW0pCit2b2lk IFVuY29tbWl0dGVkQ29udGVudDo6YWRkKGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIExh eW91dFVuaXQgbG9naWNhbFdpZHRoKQogewotICAgIG1faW5saW5lSXRlbXMuYXBwZW5kKCZpbmxp bmVJdGVtKTsKLSAgICBtX3dpZHRoICs9IGlubGluZUl0ZW0ud2lkdGgoKTsKKyAgICBtX3VuY29t bWl0dGVkUnVucy5hcHBlbmQoeyBpbmxpbmVJdGVtLCBsb2dpY2FsV2lkdGggfSk7CisgICAgbV93 aWR0aCArPSBsb2dpY2FsV2lkdGg7CiB9CiAKIHZvaWQgVW5jb21taXR0ZWRDb250ZW50OjpyZXNl dCgpCiB7Ci0gICAgbV9pbmxpbmVJdGVtcy5jbGVhcigpOworICAgIG1fdW5jb21taXR0ZWRSdW5z LmNsZWFyKCk7CiAgICAgbV93aWR0aCA9IDA7CiB9CiAKQEAgLTE1OCw4ICsxNjMsNDEgQEAgSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmVMYXlvdXQ6OkxpbmVDb250ZW50IElubGluZUZvcm1h dHRpbmdDb250ZXh0OjpMaW5lTGEKICAgICAgICAgaWYgKHVuY29tbWl0dGVkQ29udGVudC5pc0Vt cHR5KCkpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIGNvbW1pdHRlZElubGluZUl0ZW1D b3VudCArPSB1bmNvbW1pdHRlZENvbnRlbnQuc2l6ZSgpOwotICAgICAgICBmb3IgKGF1dG8qIHVu Y29tbWl0dGVkIDogdW5jb21taXR0ZWRDb250ZW50LmlubGluZUl0ZW1zKCkpCi0gICAgICAgICAg ICBjb21taXRJbmxpbmVJdGVtVG9MaW5lKCpsaW5lLCAqdW5jb21taXR0ZWQpOworICAgICAgICBm b3IgKGF1dG8mIHVuY29tbWl0dGVkUnVuIDogdW5jb21taXR0ZWRDb250ZW50LnJ1bnMoKSkgewor ICAgICAgICAgICAgYXV0byYgaW5saW5lSXRlbSA9IHVuY29tbWl0dGVkUnVuLmlubGluZUl0ZW07 CisgICAgICAgICAgICBpZiAoaW5saW5lSXRlbS5pc0hhcmRMaW5lQnJlYWsoKSkgeworICAgICAg ICAgICAgICAgIGxpbmUtPmFwcGVuZEhhcmRMaW5lQnJlYWsoaW5saW5lSXRlbSk7CisgICAgICAg ICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGF1dG8gd2lk dGggPSB1bmNvbW1pdHRlZFJ1bi5sb2dpY2FsV2lkdGg7CisgICAgICAgICAgICBhdXRvJiBmb250 TWV0cmljcyA9IGlubGluZUl0ZW0uc3R5bGUoKS5mb250TWV0cmljcygpOworICAgICAgICAgICAg aWYgKGlzPElubGluZVRleHRJdGVtPihpbmxpbmVJdGVtKSkgeworICAgICAgICAgICAgICAgIGxp bmUtPmFwcGVuZFRleHRDb250ZW50KGRvd25jYXN0PElubGluZVRleHRJdGVtPihpbmxpbmVJdGVt KSwgeyB3aWR0aCwgZm9udE1ldHJpY3MuaGVpZ2h0KCkgfSk7CisgICAgICAgICAgICAgICAgY29u dGludWU7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGlu bGluZUl0ZW0ubGF5b3V0Qm94KCk7CisgICAgICAgICAgICBhdXRvJiBkaXNwbGF5Qm94ID0gbGF5 b3V0U3RhdGUoKS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7CisKKyAgICAgICAg ICAgIGlmIChpbmxpbmVJdGVtLmlzQ29udGFpbmVyU3RhcnQoKSkgeworICAgICAgICAgICAgICAg IGF1dG8gY29udGFpbmVySGVpZ2h0ID0gZm9udE1ldHJpY3MuaGVpZ2h0KCkgKyBkaXNwbGF5Qm94 LnZlcnRpY2FsQm9yZGVyKCkgKyBkaXNwbGF5Qm94LnZlcnRpY2FsUGFkZGluZygpLnZhbHVlT3Io MCk7CisgICAgICAgICAgICAgICAgbGluZS0+YXBwZW5kSW5saW5lQ29udGFpbmVyU3RhcnQoaW5s aW5lSXRlbSwgeyB3aWR0aCwgY29udGFpbmVySGVpZ2h0IH0pOworICAgICAgICAgICAgICAgIGNv bnRpbnVlOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBpZiAoaW5saW5lSXRlbS5pc0Nv bnRhaW5lckVuZCgpKSB7CisgICAgICAgICAgICAgICAgbGluZS0+YXBwZW5kSW5saW5lQ29udGFp bmVyRW5kKGlubGluZUl0ZW0sIHsgd2lkdGgsIDAgfSk7CisgICAgICAgICAgICAgICAgY29udGlu dWU7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGlmIChsYXlvdXRCb3guaXNSZXBsYWNl ZCgpKSB7CisgICAgICAgICAgICAgICAgbGluZS0+YXBwZW5kUmVwbGFjZWRJbmxpbmVCb3goaW5s aW5lSXRlbSwgeyB3aWR0aCwgZGlzcGxheUJveC5oZWlnaHQoKSB9KTsKKyAgICAgICAgICAgICAg ICBjb250aW51ZTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgbGluZS0+YXBwZW5kTm9u UmVwbGFjZWRJbmxpbmVCb3goaW5saW5lSXRlbSwgeyB3aWR0aCwgZGlzcGxheUJveC5oZWlnaHQo KSB9KTsKKyAgICAgICAgfQogICAgICAgICB1bmNvbW1pdHRlZENvbnRlbnQucmVzZXQoKTsKICAg ICB9OwogCkBAIC0xNzEsMTcgKzIwOSwxOCBAQCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGlu ZUxheW91dDo6TGluZUNvbnRlbnQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmVMYQogICAg IExpbmVCcmVha2VyIGxpbmVCcmVha2VyOwogICAgIC8vIEl0ZXJhdGUgdGhyb3VnaCB0aGUgaW5s aW5lIGNvbnRlbnQgYW5kIHBsYWNlIHRoZSBpbmxpbmUgYm94ZXMgb24gdGhlIGN1cnJlbnQgbGlu ZS4KICAgICBmb3IgKGF1dG8gaW5saW5lSXRlbUluZGV4ID0gbGluZUlucHV0LmZpcnN0SW5saW5l SXRlbUluZGV4OyBpbmxpbmVJdGVtSW5kZXggPCBsaW5lSW5wdXQuaW5saW5lSXRlbXMuc2l6ZSgp OyArK2lubGluZUl0ZW1JbmRleCkgeworICAgICAgICBhdXRvIGF2YWlsYWJsZVdpZHRoID0gbGlu ZS0+YXZhaWxhYmxlV2lkdGgoKSAtIHVuY29tbWl0dGVkQ29udGVudC53aWR0aCgpOworICAgICAg ICBhdXRvIGN1cnJlbnRMb2dpY2FsUmlnaHQgPSBsaW5lLT5jb250ZW50TG9naWNhbFJpZ2h0KCkg KyB1bmNvbW1pdHRlZENvbnRlbnQud2lkdGgoKTsKICAgICAgICAgYXV0byYgaW5saW5lSXRlbSA9 IGxpbmVJbnB1dC5pbmxpbmVJdGVtc1tpbmxpbmVJdGVtSW5kZXhdOworICAgICAgICBhdXRvIGlu bGluZUl0ZW1XaWR0aCA9IFdlYkNvcmU6OkxheW91dDo6aW5saW5lSXRlbVdpZHRoKGxheW91dFN0 YXRlKCksICppbmxpbmVJdGVtLCBjdXJyZW50TG9naWNhbFJpZ2h0KTsKKwogICAgICAgICBpZiAo aW5saW5lSXRlbS0+aXNIYXJkTGluZUJyZWFrKCkpIHsKLSAgICAgICAgICAgIHVuY29tbWl0dGVk Q29udGVudC5hZGQoKmlubGluZUl0ZW0pOworICAgICAgICAgICAgdW5jb21taXR0ZWRDb250ZW50 LmFkZCgqaW5saW5lSXRlbSwgaW5saW5lSXRlbVdpZHRoKTsKICAgICAgICAgICAgIGNvbW1pdFBl bmRpbmdDb250ZW50KCk7CiAgICAgICAgICAgICByZXR1cm4gY2xvc2VMaW5lKCk7CiAgICAgICAg IH0KLSAgICAgICAgYXV0byBhdmFpbGFibGVXaWR0aCA9IGxpbmUtPmF2YWlsYWJsZVdpZHRoKCkg LSB1bmNvbW1pdHRlZENvbnRlbnQud2lkdGgoKTsKLSAgICAgICAgYXV0byBjdXJyZW50TG9naWNh bFJpZ2h0ID0gbGluZS0+Y29udGVudExvZ2ljYWxSaWdodCgpICsgdW5jb21taXR0ZWRDb250ZW50 LndpZHRoKCk7Ci0gICAgICAgIGlubGluZUl0ZW0tPnNldFdpZHRoKGlubGluZUl0ZW1XaWR0aChs YXlvdXRTdGF0ZSgpLCAqaW5saW5lSXRlbSwgY3VycmVudExvZ2ljYWxSaWdodCkpOwogICAgICAg ICAvLyBGSVhNRTogRW5zdXJlIExpbmVDb250ZXh0Ojp0cmltbWFibGVXaWR0aCBpbmNsdWRlcyB1 bmNvbW1pdHRlZCBjb250ZW50IGlmIG5lZWRlZC4KLSAgICAgICAgYXV0byBicmVha2luZ0NvbnRl eHQgPSBsaW5lQnJlYWtlci5icmVha2luZ0NvbnRleHQoKmlubGluZUl0ZW0sIGlubGluZUl0ZW0t PndpZHRoKCksIHsgYXZhaWxhYmxlV2lkdGgsIGN1cnJlbnRMb2dpY2FsUmlnaHQsIGxpbmUtPnRy YWlsaW5nVHJpbW1hYmxlV2lkdGgoKSwgIWxpbmUtPmhhc0NvbnRlbnQoKSB9KTsKKyAgICAgICAg YXV0byBicmVha2luZ0NvbnRleHQgPSBsaW5lQnJlYWtlci5icmVha2luZ0NvbnRleHQoKmlubGlu ZUl0ZW0sIGlubGluZUl0ZW1XaWR0aCwgeyBhdmFpbGFibGVXaWR0aCwgY3VycmVudExvZ2ljYWxS aWdodCwgbGluZS0+dHJhaWxpbmdUcmltbWFibGVXaWR0aCgpLCAhbGluZS0+aGFzQ29udGVudCgp IH0pOwogICAgICAgICBpZiAoYnJlYWtpbmdDb250ZXh0LmlzQXRCcmVha2luZ09wcG9ydHVuaXR5 KQogICAgICAgICAgICAgY29tbWl0UGVuZGluZ0NvbnRlbnQoKTsKIApAQCAtMjAzLDcgKzI0Miw3 IEBAIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0OjpMaW5lQ29udGVudCBJbmxp bmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZUxhCiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAg ICAgfQogCi0gICAgICAgIHVuY29tbWl0dGVkQ29udGVudC5hZGQoKmlubGluZUl0ZW0pOworICAg ICAgICB1bmNvbW1pdHRlZENvbnRlbnQuYWRkKCppbmxpbmVJdGVtLCBpbmxpbmVJdGVtV2lkdGgp OwogICAgICAgICBpZiAoYnJlYWtpbmdDb250ZXh0LmlzQXRCcmVha2luZ09wcG9ydHVuaXR5KQog ICAgICAgICAgICAgY29tbWl0UGVuZGluZ0NvbnRlbnQoKTsKICAgICB9CkBAIC0yMzksNyArMjc4 LDYgQEAgTGF5b3V0VW5pdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZUxheW91dDo6Y29t cHV0ZWRJbnRyaW5zaWNXaWR0aChMYXlvdXRVbmkKICAgICBhdXRvJiBpbmxpbmVDb250ZW50ID0g bV9mb3JtYXR0aW5nU3RhdGUuaW5saW5lSXRlbXMoKTsKICAgICBmb3IgKGF1dG8mIGlubGluZUl0 ZW0gOiBpbmxpbmVDb250ZW50KSB7CiAgICAgICAgIGF1dG8gbG9naWNhbFdpZHRoID0gaW5saW5l SXRlbVdpZHRoKGxheW91dFN0YXRlKCksICppbmxpbmVJdGVtLCBsaW5lTG9naWNhbFJpZ2h0KTsK LSAgICAgICAgaW5saW5lSXRlbS0+c2V0V2lkdGgobG9naWNhbFdpZHRoKTsKICAgICAgICAgYXV0 byBicmVha2luZ0NvbnRleHQgPSBsaW5lQnJlYWtlci5icmVha2luZ0NvbnRleHQoKmlubGluZUl0 ZW0sIGxvZ2ljYWxXaWR0aCwgeyB3aWR0aENvbnN0cmFpbnQsIGxpbmVMb2dpY2FsUmlnaHQsICFs aW5lTG9naWNhbFJpZ2h0IH0pOwogICAgICAgICBpZiAoYnJlYWtpbmdDb250ZXh0LmJyZWFraW5n QmVoYXZpb3IgPT0gTGluZUJyZWFrZXI6OkJyZWFraW5nQmVoYXZpb3I6OldyYXApIHsKICAgICAg ICAgICAgIG1heGltdW1MaW5lV2lkdGggPSBzdGQ6Om1heChtYXhpbXVtTGluZVdpZHRoLCBsaW5l TG9naWNhbFJpZ2h0IC0gdHJpbW1hYmxlVHJhaWxpbmdXaWR0aCk7CkBAIC0zMzAsMTQgKzM2OCwx MyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0OjpjcmVhdGVEaXNw bGF5UnVucyhjb25zdCBMaW5lOjpDb250ZW50JgogICAgICAgICBBU1NFUlQoaW5saW5lUnVuLnRl eHRDb250ZXh0KCkpOyAgICAgICAgCiAgICAgICAgIGNvbnN0IExpbmU6OkNvbnRlbnQ6OlJ1biog cHJldmlvdXNMaW5lUnVuID0gIWluZGV4ID8gbnVsbHB0ciA6IGxpbmVSdW5zW2luZGV4IC0gMV0u Z2V0KCk7CiAgICAgICAgIGlmICghbGluZVJ1bi0+aXNDb2xsYXBzZWQpIHsKLSAgICAgICAgICAg IGF1dG8mIGlubGluZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KGlubGluZUl0 ZW0pOwogICAgICAgICAgICAgYXV0byBwcmV2aW91c1J1bkNhbkJlRXh0ZW5kZWQgPSBwcmV2aW91 c0xpbmVSdW4gPyBwcmV2aW91c0xpbmVSdW4tPmNhbkJlRXh0ZW5kZWQgOiBmYWxzZTsKICAgICAg ICAgICAgIGF1dG8gcmVxdWlyZXNOZXdSdW4gPSAhaW5kZXggfHwgIXByZXZpb3VzUnVuQ2FuQmVF eHRlbmRlZCB8fCAmbGF5b3V0Qm94ICE9ICZwcmV2aW91c0xpbmVSdW4tPmlubGluZUl0ZW0ubGF5 b3V0Qm94KCk7CiAgICAgICAgICAgICBpZiAocmVxdWlyZXNOZXdSdW4pCiAgICAgICAgICAgICAg ICAgbV9mb3JtYXR0aW5nU3RhdGUuYWRkSW5saW5lUnVuKHN0ZDo6bWFrZV91bmlxdWU8RGlzcGxh eTo6UnVuPihpbmxpbmVSdW4pKTsKICAgICAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgICAg IGF1dG8mIGxhc3REaXNwbGF5UnVuID0gbV9mb3JtYXR0aW5nU3RhdGUuaW5saW5lUnVucygpLmxh c3QoKTsKLSAgICAgICAgICAgICAgICBsYXN0RGlzcGxheVJ1bi0+ZXhwYW5kSG9yaXpvbnRhbGx5 KGlubGluZVRleHRJdGVtLndpZHRoKCkpOworICAgICAgICAgICAgICAgIGxhc3REaXNwbGF5UnVu LT5leHBhbmRIb3Jpem9udGFsbHkoaW5saW5lUnVuLmxvZ2ljYWxXaWR0aCgpKTsKICAgICAgICAg ICAgICAgICBsYXN0RGlzcGxheVJ1bi0+dGV4dENvbnRleHQoKS0+ZXhwYW5kKGlubGluZVJ1bi50 ZXh0Q29udGV4dCgpLT5sZW5ndGgoKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBsaW5l Qm94LmV4cGFuZEhvcml6b250YWxseShpbmxpbmVSdW4ubG9naWNhbFdpZHRoKCkpOwpAQCAtMzc1 LDMzICs0MTIsNiBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0Ojpo YW5kbGVGbG9hdChMaW5lJiBsaW5lLCBjb25zdCBGbG9hdGluZwogICAgIGZsb2F0Qm94LmlzTGVm dEZsb2F0aW5nUG9zaXRpb25lZCgpID8gbGluZS5tb3ZlTG9naWNhbExlZnQoZmxvYXRCb3hXaWR0 aCkgOiBsaW5lLm1vdmVMb2dpY2FsUmlnaHQoZmxvYXRCb3hXaWR0aCk7CiB9CiAKLXZvaWQgSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmVMYXlvdXQ6OmNvbW1pdElubGluZUl0ZW1Ub0xpbmUo TGluZSYgbGluZSwgY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSkgY29uc3QKLXsKLSAgICBp ZiAoaW5saW5lSXRlbS5pc0hhcmRMaW5lQnJlYWsoKSkKLSAgICAgICAgcmV0dXJuIGxpbmUuYXBw ZW5kSGFyZExpbmVCcmVhayhpbmxpbmVJdGVtKTsKLQotICAgIGF1dG8gd2lkdGggPSBpbmxpbmVJ dGVtLndpZHRoKCk7Ci0gICAgYXV0byYgZm9udE1ldHJpY3MgPSBpbmxpbmVJdGVtLnN0eWxlKCku Zm9udE1ldHJpY3MoKTsKLSAgICBpZiAoaXM8SW5saW5lVGV4dEl0ZW0+KGlubGluZUl0ZW0pKQot ICAgICAgICByZXR1cm4gbGluZS5hcHBlbmRUZXh0Q29udGVudChkb3duY2FzdDxJbmxpbmVUZXh0 SXRlbT4oaW5saW5lSXRlbSksIHsgd2lkdGgsIGZvbnRNZXRyaWNzLmhlaWdodCgpIH0pOwotCi0g ICAgYXV0byYgbGF5b3V0Qm94ID0gaW5saW5lSXRlbS5sYXlvdXRCb3goKTsKLSAgICBhdXRvJiBk aXNwbGF5Qm94ID0gbGF5b3V0U3RhdGUoKS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGxheW91dEJv eCk7Ci0KLSAgICBpZiAoaW5saW5lSXRlbS5pc0NvbnRhaW5lclN0YXJ0KCkpIHsKLSAgICAgICAg YXV0byBjb250YWluZXJIZWlnaHQgPSBmb250TWV0cmljcy5oZWlnaHQoKSArIGRpc3BsYXlCb3gu dmVydGljYWxCb3JkZXIoKSArIGRpc3BsYXlCb3gudmVydGljYWxQYWRkaW5nKCkudmFsdWVPcigw KTsKLSAgICAgICAgcmV0dXJuIGxpbmUuYXBwZW5kSW5saW5lQ29udGFpbmVyU3RhcnQoaW5saW5l SXRlbSwgeyB3aWR0aCwgY29udGFpbmVySGVpZ2h0IH0pOwotICAgIH0KLQotICAgIGlmIChpbmxp bmVJdGVtLmlzQ29udGFpbmVyRW5kKCkpCi0gICAgICAgIHJldHVybiBsaW5lLmFwcGVuZElubGlu ZUNvbnRhaW5lckVuZChpbmxpbmVJdGVtLCB7IHdpZHRoLCAwIH0pOwotCi0gICAgaWYgKGxheW91 dEJveC5pc1JlcGxhY2VkKCkpCi0gICAgICAgIHJldHVybiBsaW5lLmFwcGVuZFJlcGxhY2VkSW5s aW5lQm94KGlubGluZUl0ZW0sIHsgd2lkdGgsIGRpc3BsYXlCb3guaGVpZ2h0KCkgfSk7Ci0KLSAg ICBsaW5lLmFwcGVuZE5vblJlcGxhY2VkSW5saW5lQm94KGlubGluZUl0ZW0sIHsgd2lkdGgsIGRp c3BsYXlCb3guaGVpZ2h0KCkgfSk7Ci19Ci0KIHN0YXRpYyBPcHRpb25hbDxMYXlvdXRVbml0PiBo b3Jpem9udGFsQWRqdXN0bWVudEZvckFsaWdubWVudChUZXh0QWxpZ25Nb2RlIGFsaWduLCBMYXlv dXRVbml0IHJlbWFpbmluZ1dpZHRoKQogewogICAgIHN3aXRjaCAoYWxpZ24pIHsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUl0ZW0uaCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUl0ZW0uaAppbmRl eCA4N2VkOWMzNmY2YzkyM2FlOGU0Zjg5OTc0OTZlYmNhYzVhY2ZlOWM0Li5hOGE3ODY5OWZiM2Y3 MWMzZTUyMTU0ODFjMzk2ODBiYWE1NzA1YzFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVJdGVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lSXRlbS5oCkBAIC00Miw4ICs0Miw2IEBAIHB1 YmxpYzoKICAgICBUeXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBtX3R5cGU7IH0KICAgICBjb25z dCBCb3gmIGxheW91dEJveCgpIGNvbnN0IHsgcmV0dXJuIG1fbGF5b3V0Qm94OyB9CiAgICAgY29u c3QgUmVuZGVyU3R5bGUmIHN0eWxlKCkgY29uc3QgeyByZXR1cm4gbV9sYXlvdXRCb3guc3R5bGUo KTsgfQotICAgIHZvaWQgc2V0V2lkdGgoTGF5b3V0VW5pdCk7Ci0gICAgTGF5b3V0VW5pdCB3aWR0 aCgpIGNvbnN0OwogCiAgICAgYm9vbCBpc1RleHQoKSBjb25zdCB7IHJldHVybiB0eXBlKCkgPT0g VHlwZTo6VGV4dDsgfQogICAgIGJvb2wgaXNCb3goKSBjb25zdCB7IHJldHVybiB0eXBlKCkgPT0g VHlwZTo6Qm94OyB9CkBAIC01NiwxMCArNTQsNiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGNv bnN0IEJveCYgbV9sYXlvdXRCb3g7CiAgICAgY29uc3QgVHlwZSBtX3R5cGU7Ci0gICAgTGF5b3V0 VW5pdCBtX3dpZHRoOwotI2lmICFBU1NFUlRfRElTQUJMRUQKLSAgICBib29sIG1faGFzVmFsaWRX aWR0aCB7IGZhbHNlIH07Ci0jZW5kaWYKIH07CiAKIGlubGluZSBJbmxpbmVJdGVtOjpJbmxpbmVJ dGVtKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBUeXBlIHR5cGUpCkBAIC02OCwyMCArNjIsNiBAQCBp bmxpbmUgSW5saW5lSXRlbTo6SW5saW5lSXRlbShjb25zdCBCb3gmIGxheW91dEJveCwgVHlwZSB0 eXBlKQogewogfQogCi1pbmxpbmUgdm9pZCBJbmxpbmVJdGVtOjpzZXRXaWR0aChMYXlvdXRVbml0 IHdpZHRoKQotewotI2lmICFBU1NFUlRfRElTQUJMRUQKLSAgICBtX2hhc1ZhbGlkV2lkdGggPSB0 cnVlOwotI2VuZGlmCi0gICAgbV93aWR0aCA9IHdpZHRoOwotfQotCi1pbmxpbmUgTGF5b3V0VW5p dCBJbmxpbmVJdGVtOjp3aWR0aCgpIGNvbnN0Ci17Ci0gICAgQVNTRVJUKG1faGFzVmFsaWRXaWR0 aCk7Ci0gICAgcmV0dXJuIG1fd2lkdGg7Ci19Ci0KICNkZWZpbmUgU1BFQ0lBTElaRV9UWVBFX1RS QUlUU19JTkxJTkVfSVRFTShUb1ZhbHVlVHlwZU5hbWUsIHByZWRpY2F0ZSkgXAogU1BFQ0lBTEla RV9UWVBFX1RSQUlUU19CRUdJTihXZWJDb3JlOjpMYXlvdXQ6OlRvVmFsdWVUeXBlTmFtZSkgXAog ICAgIHN0YXRpYyBib29sIGlzVHlwZShjb25zdCBXZWJDb3JlOjpMYXlvdXQ6OklubGluZUl0ZW0m IGlubGluZUl0ZW0pIHsgcmV0dXJuIGlubGluZUl0ZW0ucHJlZGljYXRlOyB9IFwK