207612 2020-02-11 20:24:30 -0800 [LFC][IFC] Do not create Display::Boxes for anonymous inline text boxes 2020-02-12 12:01:21 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1617848 0 zalan 2020-02-11 20:24:30 -0800 <div>foobar</div> [foobar] needs only a Display::Run but no Display::Box. 1617849 1 webkit-bug-importer 2020-02-11 20:24:46 -0800 <rdar://problem/59374909> 1617850 2 390488 zalan 2020-02-11 20:27:18 -0800 Created attachment 390488 Patch 1618022 3 390488 koivisto 2020-02-12 08:30:25 -0800 Comment on attachment 390488 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390488&action=review > Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp:491 > if (lineRun.isLineBreak()) { > + auto& displayBox = formattingState.displayBox(layoutBox); Could we avoid this too? 1618129 4 390540 zalan 2020-02-12 11:18:13 -0800 Created attachment 390540 Patch 1618149 5 390540 commit-queue 2020-02-12 12:01:19 -0800 Comment on attachment 390540 Patch Clearing flags on attachment: 390540 Committed r256466: <https://trac.webkit.org/changeset/256466> 1618150 6 commit-queue 2020-02-12 12:01:21 -0800 All reviewed patches have been landed. Closing bug. 390488 2020-02-11 20:27:18 -0800 2020-02-12 11:18:11 -0800 Patch bug-207612-20200211202717.patch text/plain 4466 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2NDIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWZjZjRjZTVkODA3OGFh NjNkNTlmMzM5NTU4YjNjY2ZmYmJiZGMxMi4uYzcyN2FlNDFmZGU5ZTRjOGVjMzQ1OWQyYTM0NDIz NzU4YTg5ZTViOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTAyLTExICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBEbyBub3Qg Y3JlYXRlIERpc3BsYXk6OkJveGVzIGZvciBhbm9ueW1vdXMgaW5saW5lIHRleHQgYm94ZXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNzYxMgorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNTkzNzQ5MDk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgPGRpdj50ZXh0IGNvbnRlbnQ8L2Rpdj4gOiBbdGV4dCBj b250ZW50XSBvbmx5IG5lZWRzIGEgRGlzcGxheTo6UnVuLgorICAgICAgICA8ZGl2PjxzcGFuPnRl eHQgY29udGVudDwvc3Bhbj48L2Rpdj4gW3NwYW5dIG5lZWRzIGEgRGlzcGxheTo6Qm94IGFuZCBb dGV4dCBjb250ZW50XSBuZWVkcyBhIERpc3BsYXk6OlJ1bi4KKworICAgICAgICAqIGxheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OnNldERpc3BsYXlCb3hlc0Zv ckxpbmUpOgorCiAyMDIwLTAyLTExICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0xGQ11bSUZDXSBSZW5hbWUgRGlzcGxheTo6UnVuOjpUZXh0Q29udGV4dCB0byBU ZXh0Q29udGVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDJhZmY1 ZjdmMGNmYzc2YmRiYzMxOThjNTEzN2QwY2Y5ZDAxMzFiZjYuLmE1NmE0NWQ3YWRiNjg1MDM5NjE0 MzE3N2RkNGVmOGU0YTZmMTBlOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5j cHAKQEAgLTQ2MSw3ICs0NjEsNiBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpzZXRE aXNwbGF5Qm94ZXNGb3JMaW5lKGNvbnN0IExpbmVMYXlvdXRDb250ZXh0OjpMaQogICAgICAgICBh dXRvJiBsaW5lUnVuID0gbGluZVJ1bnMuYXQoaW5kZXgpOwogICAgICAgICBhdXRvJiBsb2dpY2Fs UmVjdCA9IGxpbmVSdW4ubG9naWNhbFJlY3QoKTsKICAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0g bGluZVJ1bi5sYXlvdXRCb3goKTsKLSAgICAgICAgYXV0byYgZGlzcGxheUJveCA9IGZvcm1hdHRp bmdTdGF0ZS5kaXNwbGF5Qm94KGxheW91dEJveCk7CiAKICAgICAgICAgLy8gQWRkIGZpbmFsIGRp c3BsYXkgcnVucyB0byBzdGF0ZSBmaXJzdC4KICAgICAgICAgLy8gSW5saW5lIGxldmVsIGNvbnRh aW5lcnMgKDxzcGFuPikgZG9uJ3QgZ2VuZXJhdGUgZGlzcGxheSBydW5zIGFuZCBuZWl0aGVyIGRv IGNvbXBsZXRlbHkgY29sbGFwc2VkIHJ1bnMuCkBAIC00ODksNiArNDg4LDcgQEAgdm9pZCBJbmxp bmVGb3JtYXR0aW5nQ29udGV4dDo6c2V0RGlzcGxheUJveGVzRm9yTGluZShjb25zdCBMaW5lTGF5 b3V0Q29udGV4dDo6TGkKICAgICAgICAgfQogCiAgICAgICAgIGlmIChsaW5lUnVuLmlzTGluZUJy ZWFrKCkpIHsKKyAgICAgICAgICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBmb3JtYXR0aW5nU3RhdGUu ZGlzcGxheUJveChsYXlvdXRCb3gpOwogICAgICAgICAgICAgZGlzcGxheUJveC5zZXRUb3BMZWZ0 KHRvTGF5b3V0UG9pbnQobG9naWNhbFJlY3QudG9wTGVmdCgpKSk7CiAgICAgICAgICAgICBkaXNw bGF5Qm94LnNldENvbnRlbnRCb3hXaWR0aCh0b0xheW91dFVuaXQobG9naWNhbFJlY3Qud2lkdGgo KSkpOwogICAgICAgICAgICAgZGlzcGxheUJveC5zZXRDb250ZW50Qm94SGVpZ2h0KHRvTGF5b3V0 VW5pdChsb2dpY2FsUmVjdC5oZWlnaHQoKSkpOwpAQCAtNTAwLDE4ICs1MDAsMjEgQEAgdm9pZCBJ bmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6c2V0RGlzcGxheUJveGVzRm9yTGluZShjb25zdCBMaW5l TGF5b3V0Q29udGV4dDo6TGkKICAgICAgICAgICAgIGF1dG8gdG9wTGVmdCA9IGxvZ2ljYWxSZWN0 LnRvcExlZnQoKTsKICAgICAgICAgICAgIGlmIChsYXlvdXRCb3guaXNJbkZsb3dQb3NpdGlvbmVk KCkpCiAgICAgICAgICAgICAgICAgdG9wTGVmdCArPSBnZW9tZXRyeSgpLmluRmxvd1Bvc2l0aW9u ZWRQb3NpdGlvbk9mZnNldChsYXlvdXRCb3gsIGhvcml6b250YWxDb25zdHJhaW50cyk7CisgICAg ICAgICAgICBhdXRvJiBkaXNwbGF5Qm94ID0gZm9ybWF0dGluZ1N0YXRlLmRpc3BsYXlCb3gobGF5 b3V0Qm94KTsKICAgICAgICAgICAgIGRpc3BsYXlCb3guc2V0VG9wTGVmdCh0b0xheW91dFBvaW50 KHRvcExlZnQpKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAKICAgICAgICAg Ly8gSW5saW5lIGxldmVsIGNvbnRhaW5lciBzdGFydCAoPHNwYW4+KQogICAgICAgICBpZiAobGlu ZVJ1bi5pc0NvbnRhaW5lclN0YXJ0KCkpIHsKKyAgICAgICAgICAgIGF1dG8mIGRpc3BsYXlCb3gg PSBmb3JtYXR0aW5nU3RhdGUuZGlzcGxheUJveChsYXlvdXRCb3gpOwogICAgICAgICAgICAgZGlz cGxheUJveC5zZXRUb3BMZWZ0KHRvTGF5b3V0UG9pbnQobG9naWNhbFJlY3QudG9wTGVmdCgpKSk7 CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIElubGluZSBs ZXZlbCBjb250YWluZXIgZW5kICg8L3NwYW4+KQogICAgICAgICBpZiAobGluZVJ1bi5pc0NvbnRh aW5lckVuZCgpKSB7CisgICAgICAgICAgICBhdXRvJiBkaXNwbGF5Qm94ID0gZm9ybWF0dGluZ1N0 YXRlLmRpc3BsYXlCb3gobGF5b3V0Qm94KTsKICAgICAgICAgICAgIGlmIChsYXlvdXRCb3guaXNJ bkZsb3dQb3NpdGlvbmVkKCkpIHsKICAgICAgICAgICAgICAgICBhdXRvIGluZmxvd09mZnNldCA9 IGdlb21ldHJ5KCkuaW5GbG93UG9zaXRpb25lZFBvc2l0aW9uT2Zmc2V0KGxheW91dEJveCwgaG9y aXpvbnRhbENvbnN0cmFpbnRzKTsKICAgICAgICAgICAgICAgICBkaXNwbGF5Qm94Lm1vdmVIb3Jp em9udGFsbHkoaW5mbG93T2Zmc2V0LndpZHRoKCkpOwpAQCAtNTI2LDE3ICs1MjksOCBAQCB2b2lk IElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpzZXREaXNwbGF5Qm94ZXNGb3JMaW5lKGNvbnN0IExp bmVMYXlvdXRDb250ZXh0OjpMaQogICAgICAgICB9CiAKICAgICAgICAgaWYgKGxpbmVSdW4uaXNU ZXh0KCkpIHsKKyAgICAgICAgICAgIC8vIEFub255bW91cyBpbmxpbmUgdGV4dCBib3hlcyBkbyBu b3QgY3JlYXRlIGRpc3BsYXkgYm94ZXMuCiAgICAgICAgICAgICBsYXN0VGV4dEl0ZW1JbmRleCA9 IGlubGluZUNvbnRlbnQucnVucy5zaXplKCkgLSAxOwotICAgICAgICAgICAgYXV0byBmaXJzdFJ1 bkZvckxheW91dEJveCA9ICFpbmRleCB8fCAmbGluZVJ1bnNbaW5kZXggLSAxXS5sYXlvdXRCb3go KSAhPSAmbGF5b3V0Qm94OyAKLSAgICAgICAgICAgIGlmIChmaXJzdFJ1bkZvckxheW91dEJveCkg ewotICAgICAgICAgICAgICAgIC8vIFNldHVwIGRpc3BsYXkgYm94IGZvciB0aGUgYXNzb2NpYXRl ZCBsYXlvdXQgYm94LgotICAgICAgICAgICAgICAgIGRpc3BsYXlCb3guc2V0VG9wTGVmdCh0b0xh eW91dFBvaW50KGxvZ2ljYWxSZWN0LnRvcExlZnQoKSkpOwotICAgICAgICAgICAgICAgIGRpc3Bs YXlCb3guc2V0Q29udGVudEJveFdpZHRoKHRvTGF5b3V0VW5pdChsb2dpY2FsUmVjdC53aWR0aCgp KSk7Ci0gICAgICAgICAgICAgICAgZGlzcGxheUJveC5zZXRDb250ZW50Qm94SGVpZ2h0KHRvTGF5 b3V0VW5pdChsb2dpY2FsUmVjdC5oZWlnaHQoKSkpOwotICAgICAgICAgICAgfSBlbHNlIHsKLSAg ICAgICAgICAgICAgICAvLyBGSVhNRSBmaXggaXQgZm9yIG11bHRpcnVuL211bHRpbGluZS4KLSAg ICAgICAgICAgICAgICBkaXNwbGF5Qm94LnNldENvbnRlbnRCb3hXaWR0aCh0b0xheW91dFVuaXQo ZGlzcGxheUJveC5jb250ZW50Qm94V2lkdGgoKSArIGxvZ2ljYWxSZWN0LndpZHRoKCkpKTsKLSAg ICAgICAgICAgIH0KICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAgICAgICAgIEFT U0VSVF9OT1RfUkVBQ0hFRCgpOwo= 390540 2020-02-12 11:18:13 -0800 2020-02-12 12:01:19 -0800 Patch bug-207612-20200212111812.patch text/plain 4572 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2NDU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGVlNDE4YTUxZjM3YWNl NzUzMjAwNjFiNDdhZGI5YTc1YzgzNGE5MC4uOWMyNWU2YjRhNWZjZDdmNTBhYzkyZjc4N2NhZTlm OTY2OWE0NjAwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTAyLTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBEbyBub3Qg Y3JlYXRlIERpc3BsYXk6OkJveGVzIGZvciBhbm9ueW1vdXMgaW5saW5lIHRleHQgYm94ZXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNzYxMgorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNTkzNzQ5MDk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50 dGkgS29pdmlzdG8uCisKKyAgICAgICAgPGRpdj50ZXh0IGNvbnRlbnQ8L2Rpdj4gOiBbdGV4dCBj b250ZW50XSBvbmx5IG5lZWRzIGEgRGlzcGxheTo6UnVuLgorICAgICAgICA8ZGl2PjxzcGFuPnRl eHQgY29udGVudDwvc3Bhbj48L2Rpdj4gW3NwYW5dIG5lZWRzIGEgRGlzcGxheTo6Qm94IGFuZCBb dGV4dCBjb250ZW50XSBuZWVkcyBhIERpc3BsYXk6OlJ1bi4KKworICAgICAgICAqIGxheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OnNldERpc3BsYXlCb3hlc0Zv ckxpbmUpOgorCiAyMDIwLTAyLTEyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0xGQ11bSUZDXSBEaXNwbGF5OjpSdW4gc2hvdWxkIG5vdCBoYXZlIGFueSBnZW9t ZXRyeSBtdXRhdGlvbiBmdW5jdGlvbnMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5j cHAKaW5kZXggNmVhMzEzMDJkNjAyOTA3NTM0YjNjOGVjNThhZjljYTZhMjEwMDBiMC4uYTU5NzMz NmNjMmE1ZDJhZTE3MmY5ODRhOGQ1NGQwYTMyOTZhYTNmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdDb250ZXh0LmNwcApAQCAtNDYxLDcgKzQ2MSw2IEBAIHZvaWQgSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ6OnNldERpc3BsYXlCb3hlc0ZvckxpbmUoY29uc3QgTGluZUxheW91dENvbnRleHQ6 OkxpCiAgICAgICAgIGF1dG8mIGxpbmVSdW4gPSBsaW5lUnVucy5hdChpbmRleCk7CiAgICAgICAg IGF1dG8mIGxvZ2ljYWxSZWN0ID0gbGluZVJ1bi5sb2dpY2FsUmVjdCgpOwogICAgICAgICBhdXRv JiBsYXlvdXRCb3ggPSBsaW5lUnVuLmxheW91dEJveCgpOwotICAgICAgICBhdXRvJiBkaXNwbGF5 Qm94ID0gZm9ybWF0dGluZ1N0YXRlLmRpc3BsYXlCb3gobGF5b3V0Qm94KTsKIAogICAgICAgICAv LyBBZGQgZmluYWwgZGlzcGxheSBydW5zIHRvIHN0YXRlIGZpcnN0LgogICAgICAgICAvLyBJbmxp bmUgbGV2ZWwgY29udGFpbmVycyAoPHNwYW4+KSBkb24ndCBnZW5lcmF0ZSBkaXNwbGF5IHJ1bnMg YW5kIG5laXRoZXIgZG8gY29tcGxldGVseSBjb2xsYXBzZWQgcnVucy4KQEAgLTQ4OSw5ICs0ODgs NyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpzZXREaXNwbGF5Qm94ZXNGb3JMaW5l KGNvbnN0IExpbmVMYXlvdXRDb250ZXh0OjpMaQogICAgICAgICB9CiAKICAgICAgICAgaWYgKGxp bmVSdW4uaXNMaW5lQnJlYWsoKSkgewotICAgICAgICAgICAgZGlzcGxheUJveC5zZXRUb3BMZWZ0 KHRvTGF5b3V0UG9pbnQobG9naWNhbFJlY3QudG9wTGVmdCgpKSk7Ci0gICAgICAgICAgICBkaXNw bGF5Qm94LnNldENvbnRlbnRCb3hXaWR0aCh0b0xheW91dFVuaXQobG9naWNhbFJlY3Qud2lkdGgo KSkpOwotICAgICAgICAgICAgZGlzcGxheUJveC5zZXRDb250ZW50Qm94SGVpZ2h0KHRvTGF5b3V0 VW5pdChsb2dpY2FsUmVjdC5oZWlnaHQoKSkpOworICAgICAgICAgICAgLy8gRklYTUU6IFNpbmNl IDxicj4gYW5kIDx3YnI+IHJ1bnMgaGF2ZSBhc3NvY2lhdGVkIERPTSBlbGVtZW50cywgd2UgbWln aHQgbmVlZCB0byBjb25zdHJ1Y3QgYSBkaXNwbGF5IGJveCBoZXJlLiAKICAgICAgICAgICAgIGNv bnRpbnVlOwogICAgICAgICB9CiAKQEAgLTUwMCwxOCArNDk3LDIxIEBAIHZvaWQgSW5saW5lRm9y bWF0dGluZ0NvbnRleHQ6OnNldERpc3BsYXlCb3hlc0ZvckxpbmUoY29uc3QgTGluZUxheW91dENv bnRleHQ6OkxpCiAgICAgICAgICAgICBhdXRvIHRvcExlZnQgPSBsb2dpY2FsUmVjdC50b3BMZWZ0 KCk7CiAgICAgICAgICAgICBpZiAobGF5b3V0Qm94LmlzSW5GbG93UG9zaXRpb25lZCgpKQogICAg ICAgICAgICAgICAgIHRvcExlZnQgKz0gZ2VvbWV0cnkoKS5pbkZsb3dQb3NpdGlvbmVkUG9zaXRp b25PZmZzZXQobGF5b3V0Qm94LCBob3Jpem9udGFsQ29uc3RyYWludHMpOworICAgICAgICAgICAg YXV0byYgZGlzcGxheUJveCA9IGZvcm1hdHRpbmdTdGF0ZS5kaXNwbGF5Qm94KGxheW91dEJveCk7 CiAgICAgICAgICAgICBkaXNwbGF5Qm94LnNldFRvcExlZnQodG9MYXlvdXRQb2ludCh0b3BMZWZ0 KSk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIElubGlu ZSBsZXZlbCBjb250YWluZXIgc3RhcnQgKDxzcGFuPikKICAgICAgICAgaWYgKGxpbmVSdW4uaXND b250YWluZXJTdGFydCgpKSB7CisgICAgICAgICAgICBhdXRvJiBkaXNwbGF5Qm94ID0gZm9ybWF0 dGluZ1N0YXRlLmRpc3BsYXlCb3gobGF5b3V0Qm94KTsKICAgICAgICAgICAgIGRpc3BsYXlCb3gu c2V0VG9wTGVmdCh0b0xheW91dFBvaW50KGxvZ2ljYWxSZWN0LnRvcExlZnQoKSkpOwogICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgIH0KIAogICAgICAgICAvLyBJbmxpbmUgbGV2ZWwgY29u dGFpbmVyIGVuZCAoPC9zcGFuPikKICAgICAgICAgaWYgKGxpbmVSdW4uaXNDb250YWluZXJFbmQo KSkgeworICAgICAgICAgICAgYXV0byYgZGlzcGxheUJveCA9IGZvcm1hdHRpbmdTdGF0ZS5kaXNw bGF5Qm94KGxheW91dEJveCk7CiAgICAgICAgICAgICBpZiAobGF5b3V0Qm94LmlzSW5GbG93UG9z aXRpb25lZCgpKSB7CiAgICAgICAgICAgICAgICAgYXV0byBpbmZsb3dPZmZzZXQgPSBnZW9tZXRy eSgpLmluRmxvd1Bvc2l0aW9uZWRQb3NpdGlvbk9mZnNldChsYXlvdXRCb3gsIGhvcml6b250YWxD b25zdHJhaW50cyk7CiAgICAgICAgICAgICAgICAgZGlzcGxheUJveC5tb3ZlSG9yaXpvbnRhbGx5 KGluZmxvd09mZnNldC53aWR0aCgpKTsKQEAgLTUyNiwxNyArNTI2LDggQEAgdm9pZCBJbmxpbmVG b3JtYXR0aW5nQ29udGV4dDo6c2V0RGlzcGxheUJveGVzRm9yTGluZShjb25zdCBMaW5lTGF5b3V0 Q29udGV4dDo6TGkKICAgICAgICAgfQogCiAgICAgICAgIGlmIChsaW5lUnVuLmlzVGV4dCgpKSB7 CisgICAgICAgICAgICAvLyBBbm9ueW1vdXMgaW5saW5lIHRleHQgYm94ZXMgZG8gbm90IGNyZWF0 ZSBkaXNwbGF5IGJveGVzLgogICAgICAgICAgICAgbGFzdFRleHRJdGVtSW5kZXggPSBpbmxpbmVD b250ZW50LnJ1bnMuc2l6ZSgpIC0gMTsKLSAgICAgICAgICAgIGF1dG8gZmlyc3RSdW5Gb3JMYXlv dXRCb3ggPSAhaW5kZXggfHwgJmxpbmVSdW5zW2luZGV4IC0gMV0ubGF5b3V0Qm94KCkgIT0gJmxh eW91dEJveDsgCi0gICAgICAgICAgICBpZiAoZmlyc3RSdW5Gb3JMYXlvdXRCb3gpIHsKLSAgICAg ICAgICAgICAgICAvLyBTZXR1cCBkaXNwbGF5IGJveCBmb3IgdGhlIGFzc29jaWF0ZWQgbGF5b3V0 IGJveC4KLSAgICAgICAgICAgICAgICBkaXNwbGF5Qm94LnNldFRvcExlZnQodG9MYXlvdXRQb2lu dChsb2dpY2FsUmVjdC50b3BMZWZ0KCkpKTsKLSAgICAgICAgICAgICAgICBkaXNwbGF5Qm94LnNl dENvbnRlbnRCb3hXaWR0aCh0b0xheW91dFVuaXQobG9naWNhbFJlY3Qud2lkdGgoKSkpOwotICAg ICAgICAgICAgICAgIGRpc3BsYXlCb3guc2V0Q29udGVudEJveEhlaWdodCh0b0xheW91dFVuaXQo bG9naWNhbFJlY3QuaGVpZ2h0KCkpKTsKLSAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAg ICAgICAgLy8gRklYTUUgZml4IGl0IGZvciBtdWx0aXJ1bi9tdWx0aWxpbmUuCi0gICAgICAgICAg ICAgICAgZGlzcGxheUJveC5zZXRDb250ZW50Qm94V2lkdGgodG9MYXlvdXRVbml0KGRpc3BsYXlC b3guY29udGVudEJveFdpZHRoKCkgKyBsb2dpY2FsUmVjdC53aWR0aCgpKSk7Ci0gICAgICAgICAg ICB9CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogICAgICAgICBBU1NFUlRfTk9U X1JFQUNIRUQoKTsK