221502 2021-02-05 14:25:41 -0800 [LFC][IFC] Continuation pre and post block inline boxes should not have both the start and end decorations of the original inline box 2021-02-10 14:38:24 -0800 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 1726274 0 zalan 2021-02-05 14:25:41 -0800 <span style="margin-left: 10px;><div></div></span> the inline box inside the post block should not have left margin. 1726287 1 419467 zalan 2021-02-05 14:43:12 -0800 Created attachment 419467 Patch 1726387 2 419467 koivisto 2021-02-06 07:16:55 -0800 Comment on attachment 419467 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=419467&action=review > Source/WebCore/layout/integration/LayoutIntegrationBoxTree.cpp:88 > + if (!childRenderer.parent()->isAnonymousBlock()) > + return makeUnique<Layout::ContainerBox>(Layout::Box::ElementAttributes { Layout::Box::ElementType::GenericElement }, WTFMove(style)); I'd just revert the condition and use the makeUnique at the end in all cases. 1726390 3 419502 zalan 2021-02-06 08:02:02 -0800 Created attachment 419502 Patch 1726399 4 ews-feeder 2021-02-06 10:01:32 -0800 Committed r272463: <https://commits.webkit.org/r272463> All reviewed patches have been landed. Closing bug and clearing flags on attachment 419502. 1727809 5 webkit-bug-importer 2021-02-10 14:38:24 -0800 <rdar://problem/74206895> 419467 2021-02-05 14:43:12 -0800 2021-02-06 08:02:00 -0800 Patch bug-221502-20210205144311.patch text/plain 6440 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNDE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWNjNjBjNTFmNmMyMjIx ZTVjZjU3NzFmMWU0YWJkMTFkZmQxNjRlNi4uNGZmMGYwMzUwZDU1YmM4Nzk2ODBlNjRmMjZmNGMy ZWJmMTUwNDBlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIxLTAyLTA1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBDb250aW51 YXRpb24gcHJlIGFuZCBwb3N0IGJsb2NrIGlubGluZSBib3hlcyBzaG91bGQgbm90IGhhdmUgYm90 aCB0aGUgc3RhcnQgYW5kIGVuZCBkZWNvcmF0aW9ucyBvZiB0aGUgb3JpZ2luYWwgaW5saW5lIGJv eAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxNTAy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGdl bmVyYXRlZCBpbmxpbmUgYm94ZXMgaW5zaWRlIHRoZSBwcmUvcG9zdCBibG9jayBjb250YWluZXJz IG9mIGEgY29udGludWF0aW9uICJpbmhlcml0IiBhbGwgdGhlIG9yaWdpbmFsIHN0eWxlcyBlLmcu CisgICAgICAgIAorICAgICAgICA8c3BhbiBzdHlsZT0ibWFyZ2luLWxlZnQ6IDEwcHgiPjxkaXY+ PC9kaXY+PC9zcGFuPgorICAgICAgICAKKyAgICAgICAgV2UgdHVybiB0aGlzIGludG8gYSBjb250 aW51YXRpb24gYnkgY29uc3RydWN0aW5nIGEgc2V0IG9mIHByZSBhbmQgYSBwb3N0IGJsb2NrIGNv bnRhaW5lcnMuCisgICAgICAgIAorICAgICAgICAocHJlKUJsb2NrIGNvbnRhaW5lciAoYW5vbnlt b3VzKQorICAgICAgICAgIElubGluZSBjb250YWluZXIgKDxzcGFuPikKKyAgICAgICAgQmxvY2sg Y29udGFpbmVyICg8ZGl2PjwvZGl2PikKKyAgICAgICAgKHBvc3QpQmxvY2sgY29udGFpbmVyIChh bm9ueW1vdXMpCisgICAgICAgICAgSW5saW5lIGNvbnRhaW5lciAoPC9zcGFuPikKKworICAgICAg ICBOb3cgdGhlIGJvcmRlciBib3ggb2YgdGhlIGlubGluZSBjb250YWluZXIgaW5zaWRlIHRoZSBw b3N0IGJsb2NrIGNvbnRhaW5lciBzaG91bGQgbm90IGhhdmUgYSAxcHggbWFyZ2luIG9mZnNldC4g T25seSB0aGUgaW5saW5lIGNvbnRhaW5lciBpbiB0aGUgcHJlIGJsb2NrIHNob3VsZCAiaW5oZXJp dCIgdGhlIGxlZnQgbWFyZ2luIGZyb20gdGhlIG9yaWdpbmFsIDxzcGFuPi4KKyAgICAgICAgTGVn YWN5IGxpbmUgbGF5b3V0IHNvbHZlcyB0aGlzIGlzc3VlIGJ5IGNhbGxpbmcgaGFzSW5saW5lRGly ZWN0aW9uQm9yZGVyc1BhZGRpbmdPck1hcmdpbigpIGR1cmluZyBsYXlvdXQgdG8gZGVjaWRlIHdo aWNoIHNpZGUgb2YgdGhlIGRlY29yYXRpb25zIHRvIGFwcGx5LAorICAgICAgICBidXQgdGhlc2Ug aW5saW5lIGJveGVzIHNob3VsZCBub3QgaGF2ZSB0aG9zZSBzdGFydC9lbmQgdmFsdWVzIHRoZSBm aXJzdCBwbGFjZS4KKyAgICAgICAgKHNlZSBmYXN0L2lubGluZS9pbmxpbmUtd2l0aC1lbXB0eS1p bmxpbmUtY29udGludWF0aW9ucy5odG1sKQorCisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJ bnRlZ3JhdGlvbjo6Qm94VHJlZTo6YnVpbGRUcmVlKToKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdy YXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0Ojp1cGRhdGVJbmxpbmVCb3hEaW1lbnNpb25z KToKKwogMjAyMS0wMS0yNSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFtMRkNdW0ludGVncmF0aW9uXSBFbmFibGUgaW5saW5lIGJveCBzdXBwb3J0IChSZW5kZXJJ bmxpbmUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3Jh dGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuY3BwCmluZGV4IDdmYTQ0YjgwNDQ2NjBkZDdk MTFhOTYwNThmZTg2NTZjZTY3OTBjY2IuLjZhNjU5MTYwMDEwMGQyMDZlNzgyNjBiOTcwZjBlOWIy Y2NhNzZmNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9M YXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuY3BwCkBAIC04Myw4ICs4MywyNSBA QCB2b2lkIEJveFRyZWU6OmJ1aWxkVHJlZSgpCiAgICAgICAgIGlmIChpczxSZW5kZXJCbG9jaz4o Y2hpbGRSZW5kZXJlcikpCiAgICAgICAgICAgICByZXR1cm4gbWFrZVVuaXF1ZTxMYXlvdXQ6OlJl cGxhY2VkQm94PihMYXlvdXQ6OkJveDo6RWxlbWVudEF0dHJpYnV0ZXMgeyBMYXlvdXQ6OkJveDo6 RWxlbWVudFR5cGU6OkdlbmVyaWNFbGVtZW50IH0sIFdURk1vdmUoc3R5bGUpKTsKIAotICAgICAg ICBpZiAoaXM8UmVuZGVySW5saW5lPihjaGlsZFJlbmRlcmVyKSkKKyAgICAgICAgaWYgKGlzPFJl bmRlcklubGluZT4oY2hpbGRSZW5kZXJlcikpIHsKKyAgICAgICAgICAgIGlmICghY2hpbGRSZW5k ZXJlci5wYXJlbnQoKS0+aXNBbm9ueW1vdXNCbG9jaygpKQorICAgICAgICAgICAgICAgIHJldHVy biBtYWtlVW5pcXVlPExheW91dDo6Q29udGFpbmVyQm94PihMYXlvdXQ6OkJveDo6RWxlbWVudEF0 dHJpYnV0ZXMgeyBMYXlvdXQ6OkJveDo6RWxlbWVudFR5cGU6OkdlbmVyaWNFbGVtZW50IH0sIFdU Rk1vdmUoc3R5bGUpKTsKKyAgICAgICAgICAgIC8vIFRoaXMgbG9va3MgbGlrZSBjb250aW51YXRp b24gcmVuZGVyZXIuCisgICAgICAgICAgICBhdXRvJiByZW5kZXJJbmxpbmUgPSBkb3duY2FzdDxS ZW5kZXJJbmxpbmU+KGNoaWxkUmVuZGVyZXIpOworICAgICAgICAgICAgYXV0byBzaG91bGROb3RS ZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luU3RhcnQgPSByZW5kZXJJbmxpbmUuaXNDb250aW51 YXRpb24oKTsKKyAgICAgICAgICAgIGF1dG8gc2hvdWxkTm90UmV0YWluQm9yZGVyUGFkZGluZ0Fu ZE1hcmdpbkVuZCA9ICFyZW5kZXJJbmxpbmUuaXNDb250aW51YXRpb24oKSAmJiByZW5kZXJJbmxp bmUuaW5saW5lQ29udGludWF0aW9uKCk7CisgICAgICAgICAgICBpZiAoc2hvdWxkTm90UmV0YWlu Qm9yZGVyUGFkZGluZ0FuZE1hcmdpblN0YXJ0KSB7CisgICAgICAgICAgICAgICAgc3R5bGUuc2V0 TWFyZ2luU3RhcnQoUmVuZGVyU3R5bGU6OmluaXRpYWxNYXJnaW4oKSk7CisgICAgICAgICAgICAg ICAgc3R5bGUucmVzZXRCb3JkZXJMZWZ0KCk7CisgICAgICAgICAgICAgICAgc3R5bGUuc2V0UGFk ZGluZ0xlZnQoUmVuZGVyU3R5bGU6OmluaXRpYWxQYWRkaW5nKCkpOworICAgICAgICAgICAgfQor ICAgICAgICAgICAgaWYgKHNob3VsZE5vdFJldGFpbkJvcmRlclBhZGRpbmdBbmRNYXJnaW5FbmQp IHsKKyAgICAgICAgICAgICAgICBzdHlsZS5zZXRNYXJnaW5FbmQoUmVuZGVyU3R5bGU6OmluaXRp YWxNYXJnaW4oKSk7CisgICAgICAgICAgICAgICAgc3R5bGUucmVzZXRCb3JkZXJSaWdodCgpOwor ICAgICAgICAgICAgICAgIHN0eWxlLnNldFBhZGRpbmdSaWdodChSZW5kZXJTdHlsZTo6aW5pdGlh bFBhZGRpbmcoKSk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm4gbWFrZVVuaXF1 ZTxMYXlvdXQ6OkNvbnRhaW5lckJveD4oTGF5b3V0OjpCb3g6OkVsZW1lbnRBdHRyaWJ1dGVzIHsg TGF5b3V0OjpCb3g6OkVsZW1lbnRUeXBlOjpHZW5lcmljRWxlbWVudCB9LCBXVEZNb3ZlKHN0eWxl KSk7CisgICAgICAgIH0KIAogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAg cmV0dXJuIG51bGxwdHI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCmluZGV4IGQ4 ZmZkNGI2M2Y4NTFjZDNlNmVmZWJmMzIwMzU0MTlhMjdjYTg0MDAuLmY5ZmU4N2E3M2YzYTgzMmVk YWYyYzE1NDU3OWQwYjFhYmNhMmIxYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQu Y3BwCkBAIC0xNzMsOSArMTczLDE3IEBAIHZvaWQgTGluZUxheW91dDo6dXBkYXRlSW5saW5lQm94 RGltZW5zaW9ucyhjb25zdCBSZW5kZXJJbmxpbmUmIHJlbmRlcklubGluZSkKIHsKICAgICBhdXRv JiBib3hHZW9tZXRyeSA9IG1fbGF5b3V0U3RhdGUuZW5zdXJlR2VvbWV0cnlGb3JCb3gobV9ib3hU cmVlLmxheW91dEJveEZvclJlbmRlcmVyKHJlbmRlcklubGluZSkpOwogCi0gICAgYm94R2VvbWV0 cnkuc2V0Qm9yZGVyKHsgeyByZW5kZXJJbmxpbmUuYm9yZGVyTGVmdCgpLCByZW5kZXJJbmxpbmUu Ym9yZGVyUmlnaHQoKSB9LCB7IHJlbmRlcklubGluZS5ib3JkZXJUb3AoKSwgcmVuZGVySW5saW5l LmJvcmRlckJvdHRvbSgpIH0gfSk7Ci0gICAgYm94R2VvbWV0cnkuc2V0UGFkZGluZyhMYXlvdXQ6 OkVkZ2VzIHsgeyByZW5kZXJJbmxpbmUucGFkZGluZ0xlZnQoKSwgcmVuZGVySW5saW5lLnBhZGRp bmdSaWdodCgpIH0sIHsgcmVuZGVySW5saW5lLnBhZGRpbmdUb3AoKSwgcmVuZGVySW5saW5lLnBh ZGRpbmdCb3R0b20oKSB9IH0pOwotICAgIGJveEdlb21ldHJ5LnNldEhvcml6b250YWxNYXJnaW4o eyByZW5kZXJJbmxpbmUubWFyZ2luTGVmdCgpLCByZW5kZXJJbmxpbmUubWFyZ2luUmlnaHQoKSB9 KTsKKyAgICAvLyBDaGVjayBpZiB0aGlzIHJlbmRlcmVyIGlzIHBhcnQgb2YgYSBjb250aW51YXRp b24gYW5kIGFkanVzdCBob3Jpem9udGFsIG1hcmdpbi9ib3JkZXIvcGFkZGluZyBhY2NvcmRpbmds eS4KKyAgICBhdXRvIHNob3VsZE5vdFJldGFpbkJvcmRlclBhZGRpbmdBbmRNYXJnaW5TdGFydCA9 IHJlbmRlcklubGluZS5wYXJlbnQoKS0+aXNBbm9ueW1vdXNCbG9jaygpICYmIHJlbmRlcklubGlu ZS5pc0NvbnRpbnVhdGlvbigpOworICAgIGF1dG8gc2hvdWxkTm90UmV0YWluQm9yZGVyUGFkZGlu Z0FuZE1hcmdpbkVuZCA9IHJlbmRlcklubGluZS5wYXJlbnQoKS0+aXNBbm9ueW1vdXNCbG9jaygp ICYmICFyZW5kZXJJbmxpbmUuaXNDb250aW51YXRpb24oKSAmJiByZW5kZXJJbmxpbmUuaW5saW5l Q29udGludWF0aW9uKCk7CisgICAgCisgICAgYXV0byBob3Jpem9udGFsTWFyZ2luID0gTGF5b3V0 OjpCb3hHZW9tZXRyeTo6SG9yaXpvbnRhbE1hcmdpbiB7IHNob3VsZE5vdFJldGFpbkJvcmRlclBh ZGRpbmdBbmRNYXJnaW5TdGFydCA/IDBfbHUgOiByZW5kZXJJbmxpbmUubWFyZ2luTGVmdCgpLCBz aG91bGROb3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luRW5kID8gMF9sdSA6IHJlbmRlcklu bGluZS5tYXJnaW5SaWdodCgpIH07CisgICAgYXV0byBob3Jpem9udGFsQm9yZGVyID0gTGF5b3V0 OjpIb3Jpem9udGFsRWRnZXMgeyBzaG91bGROb3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2lu U3RhcnQgPyAwX2x1IDogcmVuZGVySW5saW5lLmJvcmRlckxlZnQoKSwgc2hvdWxkTm90UmV0YWlu Qm9yZGVyUGFkZGluZ0FuZE1hcmdpbkVuZCA/IDBfbHUgOiByZW5kZXJJbmxpbmUuYm9yZGVyUmln aHQoKSB9OworICAgIGF1dG8gaG9yaXpvbnRhbFBhZGRpbmcgPSBMYXlvdXQ6Okhvcml6b250YWxF ZGdlcyB7IHNob3VsZE5vdFJldGFpbkJvcmRlclBhZGRpbmdBbmRNYXJnaW5TdGFydCA/IDBfbHUg OiByZW5kZXJJbmxpbmUucGFkZGluZ0xlZnQoKSwgc2hvdWxkTm90UmV0YWluQm9yZGVyUGFkZGlu Z0FuZE1hcmdpbkVuZCA/IDBfbHUgOiByZW5kZXJJbmxpbmUucGFkZGluZ1JpZ2h0KCkgfTsKKyAg ICAKKyAgICBib3hHZW9tZXRyeS5zZXRQYWRkaW5nKExheW91dDo6RWRnZXMgeyBob3Jpem9udGFs UGFkZGluZywgeyByZW5kZXJJbmxpbmUucGFkZGluZ1RvcCgpLCByZW5kZXJJbmxpbmUucGFkZGlu Z0JvdHRvbSgpIH0gfSk7CisgICAgYm94R2VvbWV0cnkuc2V0Qm9yZGVyKHsgaG9yaXpvbnRhbEJv cmRlciwgeyByZW5kZXJJbmxpbmUuYm9yZGVyVG9wKCksIHJlbmRlcklubGluZS5ib3JkZXJCb3R0 b20oKSB9IH0pOworICAgIGJveEdlb21ldHJ5LnNldEhvcml6b250YWxNYXJnaW4oaG9yaXpvbnRh bE1hcmdpbik7CiAgICAgYm94R2VvbWV0cnkuc2V0VmVydGljYWxNYXJnaW4oeyB9KTsKIH0KIAo= 419502 2021-02-06 08:02:02 -0800 2021-02-06 10:01:33 -0800 Patch bug-221502-20210206080202.patch text/plain 6377 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNDYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWZkNDE2NDFmYzM3MWEx ZjA4ODIzNDNlOWUzMjA3MGI3NWM2NTY0Zi4uY2Y3M2FjZWQwNTFlMmM4M2ZiMzg5NmI4ZTBjMGRl NTE2ODQwODY0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIxLTAyLTA2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBDb250aW51 YXRpb24gcHJlIGFuZCBwb3N0IGJsb2NrIGlubGluZSBib3hlcyBzaG91bGQgbm90IGhhdmUgYm90 aCB0aGUgc3RhcnQgYW5kIGVuZCBkZWNvcmF0aW9ucyBvZiB0aGUgb3JpZ2luYWwgaW5saW5lIGJv eAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxNTAy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgVGhlIGdl bmVyYXRlZCBpbmxpbmUgYm94ZXMgaW5zaWRlIHRoZSBwcmUvcG9zdCBibG9jayBjb250YWluZXJz IG9mIGEgY29udGludWF0aW9uICJpbmhlcml0IiBhbGwgdGhlIG9yaWdpbmFsIHN0eWxlcyBlLmcu CisgICAgICAgIAorICAgICAgICA8c3BhbiBzdHlsZT0ibWFyZ2luLWxlZnQ6IDEwcHgiPjxkaXY+ PC9kaXY+PC9zcGFuPgorICAgICAgICAKKyAgICAgICAgV2UgdHVybiB0aGlzIGludG8gYSBjb250 aW51YXRpb24gYnkgY29uc3RydWN0aW5nIGEgc2V0IG9mIHByZSBhbmQgYSBwb3N0IGJsb2NrIGNv bnRhaW5lcnMuCisgICAgICAgIAorICAgICAgICAocHJlKUJsb2NrIGNvbnRhaW5lciAoYW5vbnlt b3VzKQorICAgICAgICAgIElubGluZSBjb250YWluZXIgKDxzcGFuPikKKyAgICAgICAgQmxvY2sg Y29udGFpbmVyICg8ZGl2PjwvZGl2PikKKyAgICAgICAgKHBvc3QpQmxvY2sgY29udGFpbmVyIChh bm9ueW1vdXMpCisgICAgICAgICAgSW5saW5lIGNvbnRhaW5lciAoPC9zcGFuPikKKworICAgICAg ICBOb3cgdGhlIGJvcmRlciBib3ggb2YgdGhlIGlubGluZSBjb250YWluZXIgaW5zaWRlIHRoZSBw b3N0IGJsb2NrIGNvbnRhaW5lciBzaG91bGQgbm90IGhhdmUgYSAxcHggbWFyZ2luIG9mZnNldC4g T25seSB0aGUgaW5saW5lIGNvbnRhaW5lciBpbiB0aGUgcHJlIGJsb2NrIHNob3VsZCAiaW5oZXJp dCIgdGhlIGxlZnQgbWFyZ2luIGZyb20gdGhlIG9yaWdpbmFsIDxzcGFuPi4KKyAgICAgICAgTGVn YWN5IGxpbmUgbGF5b3V0IHNvbHZlcyB0aGlzIGlzc3VlIGJ5IGNhbGxpbmcgaGFzSW5saW5lRGly ZWN0aW9uQm9yZGVyc1BhZGRpbmdPck1hcmdpbigpIGR1cmluZyBsYXlvdXQgdG8gZGVjaWRlIHdo aWNoIHNpZGUgb2YgdGhlIGRlY29yYXRpb25zIHRvIGFwcGx5LAorICAgICAgICBidXQgdGhlc2Ug aW5saW5lIGJveGVzIHNob3VsZCBub3QgaGF2ZSB0aG9zZSBzdGFydC9lbmQgdmFsdWVzIHRoZSBm aXJzdCBwbGFjZS4KKyAgICAgICAgKHNlZSBmYXN0L2lubGluZS9pbmxpbmUtd2l0aC1lbXB0eS1p bmxpbmUtY29udGludWF0aW9ucy5odG1sKQorCisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJ bnRlZ3JhdGlvbjo6Qm94VHJlZTo6YnVpbGRUcmVlKToKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdy YXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0Ojp1cGRhdGVJbmxpbmVCb3hEaW1lbnNpb25z KToKKwogMjAyMS0wMi0wNiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAg ICAgIEFTU0VSVCBOT1QgUkVBQ0hFRCBpbiBXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpj YW5kaWRhdGVDb250ZW50Rm9yTGluZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcAppbmRleCA3 ZmE0NGI4MDQ0NjYwZGQ3ZDExYTk2MDU4ZmU4NjU2Y2U2NzkwY2NiLi5hNjgwNmMzMDE0MWRhMjQx NDQwYWJiYTY4NmJjMDVhNzE1Yjk0ZjlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Cb3hUcmVlLmNwcApA QCAtODMsOCArODMsMjUgQEAgdm9pZCBCb3hUcmVlOjpidWlsZFRyZWUoKQogICAgICAgICBpZiAo aXM8UmVuZGVyQmxvY2s+KGNoaWxkUmVuZGVyZXIpKQogICAgICAgICAgICAgcmV0dXJuIG1ha2VV bmlxdWU8TGF5b3V0OjpSZXBsYWNlZEJveD4oTGF5b3V0OjpCb3g6OkVsZW1lbnRBdHRyaWJ1dGVz IHsgTGF5b3V0OjpCb3g6OkVsZW1lbnRUeXBlOjpHZW5lcmljRWxlbWVudCB9LCBXVEZNb3ZlKHN0 eWxlKSk7CiAKLSAgICAgICAgaWYgKGlzPFJlbmRlcklubGluZT4oY2hpbGRSZW5kZXJlcikpCisg ICAgICAgIGlmIChpczxSZW5kZXJJbmxpbmU+KGNoaWxkUmVuZGVyZXIpKSB7CisgICAgICAgICAg ICBpZiAoY2hpbGRSZW5kZXJlci5wYXJlbnQoKS0+aXNBbm9ueW1vdXNCbG9jaygpKSB7CisgICAg ICAgICAgICAgICAgLy8gVGhpcyBsb29rcyBsaWtlIGNvbnRpbnVhdGlvbiByZW5kZXJlci4KKyAg ICAgICAgICAgICAgICBhdXRvJiByZW5kZXJJbmxpbmUgPSBkb3duY2FzdDxSZW5kZXJJbmxpbmU+ KGNoaWxkUmVuZGVyZXIpOworICAgICAgICAgICAgICAgIGF1dG8gc2hvdWxkTm90UmV0YWluQm9y ZGVyUGFkZGluZ0FuZE1hcmdpblN0YXJ0ID0gcmVuZGVySW5saW5lLmlzQ29udGludWF0aW9uKCk7 CisgICAgICAgICAgICAgICAgYXV0byBzaG91bGROb3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFy Z2luRW5kID0gIXJlbmRlcklubGluZS5pc0NvbnRpbnVhdGlvbigpICYmIHJlbmRlcklubGluZS5p bmxpbmVDb250aW51YXRpb24oKTsKKyAgICAgICAgICAgICAgICBpZiAoc2hvdWxkTm90UmV0YWlu Qm9yZGVyUGFkZGluZ0FuZE1hcmdpblN0YXJ0KSB7CisgICAgICAgICAgICAgICAgICAgIHN0eWxl LnNldE1hcmdpblN0YXJ0KFJlbmRlclN0eWxlOjppbml0aWFsTWFyZ2luKCkpOworICAgICAgICAg ICAgICAgICAgICBzdHlsZS5yZXNldEJvcmRlckxlZnQoKTsKKyAgICAgICAgICAgICAgICAgICAg c3R5bGUuc2V0UGFkZGluZ0xlZnQoUmVuZGVyU3R5bGU6OmluaXRpYWxQYWRkaW5nKCkpOworICAg ICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBpZiAoc2hvdWxkTm90UmV0YWluQm9yZGVy UGFkZGluZ0FuZE1hcmdpbkVuZCkgeworICAgICAgICAgICAgICAgICAgICBzdHlsZS5zZXRNYXJn aW5FbmQoUmVuZGVyU3R5bGU6OmluaXRpYWxNYXJnaW4oKSk7CisgICAgICAgICAgICAgICAgICAg IHN0eWxlLnJlc2V0Qm9yZGVyUmlnaHQoKTsKKyAgICAgICAgICAgICAgICAgICAgc3R5bGUuc2V0 UGFkZGluZ1JpZ2h0KFJlbmRlclN0eWxlOjppbml0aWFsUGFkZGluZygpKTsKKyAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm4gbWFrZVVuaXF1ZTxMYXlv dXQ6OkNvbnRhaW5lckJveD4oTGF5b3V0OjpCb3g6OkVsZW1lbnRBdHRyaWJ1dGVzIHsgTGF5b3V0 OjpCb3g6OkVsZW1lbnRUeXBlOjpHZW5lcmljRWxlbWVudCB9LCBXVEZNb3ZlKHN0eWxlKSk7Cisg ICAgICAgIH0KIAogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJu IG51bGxwdHI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24v TGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCmluZGV4IDZmNGMzNzE2 YTViY2Q3ZWM1MmMwZmUyNDllMzE5M2NiODAzNDBmN2EuLjBiYTM0MmVmYTU1OTFkNmI3YjU4Yjk3 NzA5M2M1NmE1ODZkNjIwMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwCkBA IC0xNzMsOSArMTczLDE3IEBAIHZvaWQgTGluZUxheW91dDo6dXBkYXRlSW5saW5lQm94RGltZW5z aW9ucyhjb25zdCBSZW5kZXJJbmxpbmUmIHJlbmRlcklubGluZSkKIHsKICAgICBhdXRvJiBib3hH ZW9tZXRyeSA9IG1fbGF5b3V0U3RhdGUuZW5zdXJlR2VvbWV0cnlGb3JCb3gobV9ib3hUcmVlLmxh eW91dEJveEZvclJlbmRlcmVyKHJlbmRlcklubGluZSkpOwogCi0gICAgYm94R2VvbWV0cnkuc2V0 Qm9yZGVyKHsgeyByZW5kZXJJbmxpbmUuYm9yZGVyTGVmdCgpLCByZW5kZXJJbmxpbmUuYm9yZGVy UmlnaHQoKSB9LCB7IHJlbmRlcklubGluZS5ib3JkZXJUb3AoKSwgcmVuZGVySW5saW5lLmJvcmRl ckJvdHRvbSgpIH0gfSk7Ci0gICAgYm94R2VvbWV0cnkuc2V0UGFkZGluZyhMYXlvdXQ6OkVkZ2Vz IHsgeyByZW5kZXJJbmxpbmUucGFkZGluZ0xlZnQoKSwgcmVuZGVySW5saW5lLnBhZGRpbmdSaWdo dCgpIH0sIHsgcmVuZGVySW5saW5lLnBhZGRpbmdUb3AoKSwgcmVuZGVySW5saW5lLnBhZGRpbmdC b3R0b20oKSB9IH0pOwotICAgIGJveEdlb21ldHJ5LnNldEhvcml6b250YWxNYXJnaW4oeyByZW5k ZXJJbmxpbmUubWFyZ2luTGVmdCgpLCByZW5kZXJJbmxpbmUubWFyZ2luUmlnaHQoKSB9KTsKKyAg ICAvLyBDaGVjayBpZiB0aGlzIHJlbmRlcmVyIGlzIHBhcnQgb2YgYSBjb250aW51YXRpb24gYW5k IGFkanVzdCBob3Jpem9udGFsIG1hcmdpbi9ib3JkZXIvcGFkZGluZyBhY2NvcmRpbmdseS4KKyAg ICBhdXRvIHNob3VsZE5vdFJldGFpbkJvcmRlclBhZGRpbmdBbmRNYXJnaW5TdGFydCA9IHJlbmRl cklubGluZS5wYXJlbnQoKS0+aXNBbm9ueW1vdXNCbG9jaygpICYmIHJlbmRlcklubGluZS5pc0Nv bnRpbnVhdGlvbigpOworICAgIGF1dG8gc2hvdWxkTm90UmV0YWluQm9yZGVyUGFkZGluZ0FuZE1h cmdpbkVuZCA9IHJlbmRlcklubGluZS5wYXJlbnQoKS0+aXNBbm9ueW1vdXNCbG9jaygpICYmICFy ZW5kZXJJbmxpbmUuaXNDb250aW51YXRpb24oKSAmJiByZW5kZXJJbmxpbmUuaW5saW5lQ29udGlu dWF0aW9uKCk7CisgICAgCisgICAgYXV0byBob3Jpem9udGFsTWFyZ2luID0gTGF5b3V0OjpCb3hH ZW9tZXRyeTo6SG9yaXpvbnRhbE1hcmdpbiB7IHNob3VsZE5vdFJldGFpbkJvcmRlclBhZGRpbmdB bmRNYXJnaW5TdGFydCA/IDBfbHUgOiByZW5kZXJJbmxpbmUubWFyZ2luTGVmdCgpLCBzaG91bGRO b3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luRW5kID8gMF9sdSA6IHJlbmRlcklubGluZS5t YXJnaW5SaWdodCgpIH07CisgICAgYXV0byBob3Jpem9udGFsQm9yZGVyID0gTGF5b3V0OjpIb3Jp em9udGFsRWRnZXMgeyBzaG91bGROb3RSZXRhaW5Cb3JkZXJQYWRkaW5nQW5kTWFyZ2luU3RhcnQg PyAwX2x1IDogcmVuZGVySW5saW5lLmJvcmRlckxlZnQoKSwgc2hvdWxkTm90UmV0YWluQm9yZGVy UGFkZGluZ0FuZE1hcmdpbkVuZCA/IDBfbHUgOiByZW5kZXJJbmxpbmUuYm9yZGVyUmlnaHQoKSB9 OworICAgIGF1dG8gaG9yaXpvbnRhbFBhZGRpbmcgPSBMYXlvdXQ6Okhvcml6b250YWxFZGdlcyB7 IHNob3VsZE5vdFJldGFpbkJvcmRlclBhZGRpbmdBbmRNYXJnaW5TdGFydCA/IDBfbHUgOiByZW5k ZXJJbmxpbmUucGFkZGluZ0xlZnQoKSwgc2hvdWxkTm90UmV0YWluQm9yZGVyUGFkZGluZ0FuZE1h cmdpbkVuZCA/IDBfbHUgOiByZW5kZXJJbmxpbmUucGFkZGluZ1JpZ2h0KCkgfTsKKyAgICAKKyAg ICBib3hHZW9tZXRyeS5zZXRQYWRkaW5nKExheW91dDo6RWRnZXMgeyBob3Jpem9udGFsUGFkZGlu ZywgeyByZW5kZXJJbmxpbmUucGFkZGluZ1RvcCgpLCByZW5kZXJJbmxpbmUucGFkZGluZ0JvdHRv bSgpIH0gfSk7CisgICAgYm94R2VvbWV0cnkuc2V0Qm9yZGVyKHsgaG9yaXpvbnRhbEJvcmRlciwg eyByZW5kZXJJbmxpbmUuYm9yZGVyVG9wKCksIHJlbmRlcklubGluZS5ib3JkZXJCb3R0b20oKSB9 IH0pOworICAgIGJveEdlb21ldHJ5LnNldEhvcml6b250YWxNYXJnaW4oaG9yaXpvbnRhbE1hcmdp bik7CiAgICAgYm94R2VvbWV0cnkuc2V0VmVydGljYWxNYXJnaW4oeyB9KTsKIH0KIAo=