217894 2020-10-18 11:08:56 -0700 [LFC][IFC][Quirk] No soft wrapping opportunity before/after image content when the root is a table cell 2020-10-18 11:46:16 -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 1699103 0 zalan 2020-10-18 11:08:56 -0700 very quirky 1699104 1 411710 zalan 2020-10-18 11:10:44 -0700 Created attachment 411710 Patch 1699106 2 ews-feeder 2020-10-18 11:45:56 -0700 Committed r268660: <https://trac.webkit.org/changeset/268660> All reviewed patches have been landed. Closing bug and clearing flags on attachment 411710. 1699107 3 webkit-bug-importer 2020-10-18 11:46:16 -0700 <rdar://problem/70419849> 411710 2020-10-18 11:10:44 -0700 2020-10-18 11:45:56 -0700 Patch bug-217894-20201018111043.patch text/plain 14226 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4NjU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWMyMGNhMDlhZmQ1YzE2 MGRlM2Q4ZDNhMDQ3ZDkxZTlhMGM4YmYwMS4uZjdhMjRkNzg2NTNjNGExMWVjNmNmMjA2OTEzZGEw YmZjNmQ1NjMzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTEwLTE4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXVtRdWlya10g Tm8gc29mdCB3cmFwcGluZyBvcHBvcnR1bml0eSBiZWZvcmUvYWZ0ZXIgaW1hZ2UgY29udGVudCB3 aGVuIHRoZSByb290IGlzIGEgdGFibGUgY2VsbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3ODk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhpcyBxdWlyayBiZWhhdmlvciBtYXRjaGVzIGJvdGggRkYg YW5kIENocm9tZS4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjpoYXNTb2Z0V3JhcE9wcG9ydHVuaXR5 QXRJbWFnZSBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0Ojppc0F0U29mdFdyYXBP cHBvcnR1bml0eSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpuZXh0 Q29udGVudEZvckxpbmUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6 bmV4dFdyYXBPcHBvcnR1bml0eSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Om5l eHRXcmFwT3Bwb3J0dW5pdHkpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmg6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJ bnRlZ3JhdGlvbjo6Qm94VHJlZTo6YnVpbGRUcmVlKToKKwogMjAyMC0xMC0xOCAgWmFsYW4gQnVq dGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gRG8gbm90IGNyZWF0 ZSBpbWFnaW5hcnkgc3RydXQgd2hlbiBpbiBsaW1pdGVkIHF1aXJrcyBtb2RlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5n Q29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCBjNDkwZjU0NjM3NmFkNjY0OTZhYjQ1NzA2YTg1YmNj YjdlZjY0OGZhLi4yMzQzMThkYTc5N2NlMzg2YmVlNzQ3MjM4M2IyNTc1YzA4MTQ0YTVlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3Jt YXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmgKQEAgLTQ5LDYgKzQ5LDcgQEAgcHVibGljOgog ICAgIGNsYXNzIFF1aXJrcyA6IHB1YmxpYyBGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzIHsKICAg ICBwdWJsaWM6CiAgICAgICAgIElubGluZUxheW91dFVuaXQgaW5pdGlhbExpbmVIZWlnaHQoKSBj b25zdDsKKyAgICAgICAgYm9vbCBoYXNTb2Z0V3JhcE9wcG9ydHVuaXR5QXRJbWFnZSgpIGNvbnN0 OwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgZnJpZW5kIGNsYXNzIElubGluZUZvcm1hdHRpbmdD b250ZXh0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwCmlu ZGV4IDA2MzExN2NhN2UzZWEzZjNhN2I5NDVjYWRlY2VkNTdkMjU0MjNiZjMuLjk4MTBlMzk3NjZh MjZlYTBkZjcwNzY1ODI5ODc0NmU4MTU3MTI2MDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3Jt YXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKQEAgLTQwLDYgKzQwLDExIEBAIElubGluZUxheW91dFVu aXQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6aW5pdGlhbExpbmVIZWlnaHQoKSBj b25zdAogICAgIHJldHVybiByb290LnN0eWxlKCkuZm9udE1ldHJpY3MoKS5mbG9hdEhlaWdodCgp OwogfQogCitib29sIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6Omhhc1NvZnRXcmFw T3Bwb3J0dW5pdHlBdEltYWdlKCkgY29uc3QKK3sKKyAgICByZXR1cm4gIWZvcm1hdHRpbmdDb250 ZXh0KCkucm9vdCgpLmlzVGFibGVDZWxsKCk7Cit9CisKIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxk ZXIuY3BwCmluZGV4IDNiODYwM2VlMWY0OTliNjZkMjE2NWUwODhmNWY2NDRjOWQzNDc3MjIuLmE4 YzkyZTM5NzM1NDYxMjM0YTUzMTI5MmM4NTc2NThmZGRhMjRhNDAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVp bGRlci5jcHAKQEAgLTY3LDcgKzY3LDcgQEAgc3RhdGljIGlubGluZSBib29sIGVuZHNXaXRoU29m dFdyYXBPcHBvcnR1bml0eShjb25zdCBJbmxpbmVUZXh0SXRlbSYgY3VycmVudFRleHQKICAgICBy ZXR1cm4gIVRleHRVdGlsOjpmaW5kTmV4dEJyZWFrYWJsZVBvc2l0aW9uKGxpbmVCcmVha0l0ZXJh dG9yLCAwLCBuZXh0SW5saW5lVGV4dEl0ZW0uc3R5bGUoKSk7CiB9CiAKLXN0YXRpYyBpbmxpbmUg Ym9vbCBpc0F0U29mdFdyYXBPcHBvcnR1bml0eShjb25zdCBJbmxpbmVJdGVtJiBjdXJyZW50LCBj b25zdCBJbmxpbmVJdGVtJiBuZXh0KQorc3RhdGljIGlubGluZSBib29sIGlzQXRTb2Z0V3JhcE9w cG9ydHVuaXR5KGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBpbmxpbmVGb3JtYXR0aW5n Q29udGV4dCwgY29uc3QgSW5saW5lSXRlbSYgY3VycmVudCwgY29uc3QgSW5saW5lSXRlbSYgbmV4 dCkKIHsKICAgICAvLyAiaXMgYXQiIHNpbXBsZSBtZWFucyB0aGF0IHRoZXJlJ3MgYSBzb2Z0IHdy YXAgb3Bwb3J0dW5pdHkgcmlnaHQgYWZ0ZXIgdGhlIFtjdXJyZW50XS4KICAgICAvLyBbdGV4dF1b IF1bdGV4dF1bY29udGFpbmVyIHN0YXJ0XS4uLiAoPGRpdj50ZXh0IGNvbnRlbnQ8c3Bhbj4uLjwv ZGl2PikKQEAgLTEwMyw2ICsxMDMsOSBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNBdFNvZnRXcmFw T3Bwb3J0dW5pdHkoY29uc3QgSW5saW5lSXRlbSYgY3VycmVudCwgY29uc3QgSW5saQogICAgICAg ICByZXR1cm4gZW5kc1dpdGhTb2Z0V3JhcE9wcG9ydHVuaXR5KGN1cnJlbnRJbmxpbmVUZXh0SXRl bSwgbmV4dElubGluZVRleHRJdGVtKTsKICAgICB9CiAgICAgaWYgKGN1cnJlbnQuaXNCb3goKSB8 fCBuZXh0LmlzQm94KCkpIHsKKyAgICAgICAgYXV0byBpc0ltYWdlQ29udGVudCA9IGN1cnJlbnQu bGF5b3V0Qm94KCkuaXNJbWFnZSgpIHx8IG5leHQubGF5b3V0Qm94KCkuaXNJbWFnZSgpOworICAg ICAgICBpZiAoaXNJbWFnZUNvbnRlbnQpCisgICAgICAgICAgICByZXR1cm4gaW5saW5lRm9ybWF0 dGluZ0NvbnRleHQucXVpcmtzKCkuaGFzU29mdFdyYXBPcHBvcnR1bml0eUF0SW1hZ2UoKTsKICAg ICAgICAgLy8gW3RleHRdW2NvbnRhaW5lciBzdGFydF1bY29udGFpbmVyIGVuZF1baW5saW5lIGJv eF0gKHRleHQ8c3Bhbj48L3NwYW4+PGltZz4pIDogdGhlcmUncyBhIHNvZnQgd3JhcCBvcHBvcnR1 bml0eSBiZXR3ZWVuIHRoZSBbdGV4dF0gYW5kIFtpbWddLgogICAgICAgICAvLyBUaGUgbGluZSBi cmVha2luZyBiZWhhdmlvciBvZiBhIHJlcGxhY2VkIGVsZW1lbnQgb3Igb3RoZXIgYXRvbWljIGlu bGluZSBpcyBlcXVpdmFsZW50IHRvIGFuIGlkZW9ncmFwaGljIGNoYXJhY3Rlci4KICAgICAgICAg cmV0dXJuIHRydWU7CkBAIC0xMTEsNTkgKzExNCw2IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc0F0 U29mdFdyYXBPcHBvcnR1bml0eShjb25zdCBJbmxpbmVJdGVtJiBjdXJyZW50LCBjb25zdCBJbmxp CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXN0YXRpYyBpbmxpbmUgc2l6ZV90IG5leHRXcmFwT3Bw b3J0dW5pdHkoY29uc3QgSW5saW5lSXRlbXMmIGlubGluZUNvbnRlbnQsIHNpemVfdCBzdGFydElu ZGV4LCBjb25zdCBMaW5lQnVpbGRlcjo6SW5saW5lSXRlbVJhbmdlIGxheW91dFJhbmdlKQotewot ICAgIC8vIDEuIEZpbmQgdGhlIHN0YXJ0IGNhbmRpZGF0ZSBieSBza2lwcGluZyBsZWFkaW5nIG5v bi1jb250ZW50IGl0ZW1zIGUuZyAiPHNwYW4+PHNwYW4+c3RhcnQiLiBPcHBvcnR1bml0eSBpcyBh ZnRlciAiPHNwYW4+PHNwYW4+Ii4KLSAgICAvLyAyLiBGaW5kIHRoZSBlbmQgY2FuZGlkYXRlIGJ5 IHNraXBwaW5nIG5vbi1jb250ZW50IGl0ZW1zIGluYmV0d2VlbiBlLmcuICI8c3Bhbj48c3Bhbj5z dGFydDwvc3Bhbj5lbmQiLiBPcHBvcnR1bml0eSBpcyBhZnRlciAiPC9zcGFuPiIuCi0gICAgLy8g My4gQ2hlY2sgaWYgdGhlcmUncyBhIHNvZnQgd3JhcCBvcHBvcnR1bml0eSBiZXR3ZWVuIHRoZSAy IGNhbmRpZGF0ZSBpbmxpbmUgaXRlbXMgYW5kIHJlcGVhdC4KLSAgICAvLyA0LiBBbnkgZm9yY2Ug bGluZSBicmVhay9leHBsaWNpdCB3cmFwIGNvbnRlbnQgaW5iZXR3ZWVuIGlzIGNvbnNpZGVyZWQg YXMgd3JhcCBvcHBvcnR1bml0eS4KLQotICAgIC8vIFtleC1dW2NvbnRhaW5lciBzdGFydF1bY29u dGFpbmVyIGVuZF1bZmxvYXRdW2FtcGxlXSAoZXgtPHNwYW4+PC9zcGFuPjxkaXYgc3R5bGU9ImZs b2F0OmxlZnQiPjwvZGl2PmFtcGxlKS4gV3JhcCBpbmRleCBpcyBhdCBbZXgtXS4KLSAgICAvLyBb ZXhdW2NvbnRhaW5lciBzdGFydF1bYW1wLV1bY29udGFpbmVyIHN0YXJ0XVtsZV0gKGV4PHNwYW4+ YW1wLTxzcGFuPmFtcGxlKS4gV3JhcCBpbmRleCBpcyBhdCBbYW1wLV0uCi0gICAgLy8gW2V4LV1b Y29udGFpbmVyIHN0YXJ0XVtsaW5lIGJyZWFrXVthbXBsZV0gKGV4LTxzcGFuPjxicj5hbXBsZSku IFdyYXAgaW5kZXggaXMgYWZ0ZXIgW2JyXS4KLSAgICBhdXRvIHByZXZpb3VzSW5saW5lSXRlbUlu ZGV4ID0gT3B0aW9uYWw8c2l6ZV90PiB7IH07Ci0gICAgZm9yIChhdXRvIGluZGV4ID0gc3RhcnRJ bmRleDsgaW5kZXggPCBsYXlvdXRSYW5nZS5lbmQ7ICsraW5kZXgpIHsKLSAgICAgICAgYXV0byYg aW5saW5lSXRlbSA9IGlubGluZUNvbnRlbnRbaW5kZXhdOwotICAgICAgICBpZiAoaW5saW5lSXRl bS5pc0xpbmVCcmVhaygpIHx8IGlubGluZUl0ZW0uaXNXb3JkQnJlYWtPcHBvcnR1bml0eSgpKSB7 Ci0gICAgICAgICAgICAvLyBXZSBhbHdheXMgc3RvcCBhdCBleHBsaWNpdCB3cmFwcGluZyBvcHBv cnR1bml0aWVzIGUuZy4gPGJyPi4gVGhlIHdyYXAgcG9zaXRpb24gaXMgYWZ0ZXIgdGhlIG9wcG9y dHVuaXR5IHBvc2l0aW9uLgotICAgICAgICAgICAgcmV0dXJuICsraW5kZXg7Ci0gICAgICAgIH0K LSAgICAgICAgaWYgKGlubGluZUl0ZW0uaXNGbG9hdCgpKSB7Ci0gICAgICAgICAgICAvLyBGbG9h dHMgYXJlIG5vdCBwYXJ0IG9mIHRoZSBpbmxpbmUgY29udGVudC4gV2UgaWdub3JlIHRoZW0gYXMg ZmFyIGFzIHdyYXAgb3Bwb3J0dW5pdGllcyBhcmUgY29uY2VybmVkLgotICAgICAgICAgICAgLy8g W3RleHRdW2Zsb2F0IGJveF1bdGV4dF0gaXMgZXNzZW50aWFsbHkganVzdCBbdGV4dF1bdGV4dF0K LSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0gICAgICAgIGlmIChpbmxpbmVJdGVt LmlzQ29udGFpbmVyU3RhcnQoKSB8fCBpbmxpbmVJdGVtLmlzQ29udGFpbmVyRW5kKCkpIHsKLSAg ICAgICAgICAgIC8vIFRoZXJlJ3Mgbm8gd3JhcHBpbmcgb3Bwb3J0dW5pdHkgYmV0d2VlbiA8c3Bh bj50ZXh0LCA8c3Bhbj48L3NwYW4+IG9yIDwvc3Bhbj50ZXh0LiAKLSAgICAgICAgICAgIGNvbnRp bnVlOwotICAgICAgICB9Ci0gICAgICAgIEFTU0VSVChpbmxpbmVJdGVtLmlzVGV4dCgpIHx8IGlu bGluZUl0ZW0uaXNCb3goKSk7Ci0gICAgICAgIGlmICghcHJldmlvdXNJbmxpbmVJdGVtSW5kZXgp IHsKLSAgICAgICAgICAgIHByZXZpb3VzSW5saW5lSXRlbUluZGV4ID0gaW5kZXg7Ci0gICAgICAg ICAgICBjb250aW51ZTsKLSAgICAgICAgfQotICAgICAgICBpZiAoaXNBdFNvZnRXcmFwT3Bwb3J0 dW5pdHkoaW5saW5lQ29udGVudFsqcHJldmlvdXNJbmxpbmVJdGVtSW5kZXhdLCBpbmxpbmVDb250 ZW50W2luZGV4XSkpIHsKLSAgICAgICAgICAgIC8vIFRoZXJlJ3MgYSBzb2Z0IHdyYXAgb3Bwb3J0 dW5pdHkgYmV0d2VlbiAncHJldmlvdXNJbmxpbmVJdGVtSW5kZXgnIGFuZCAnaW5kZXgnLgotICAg ICAgICAgICAgLy8gTm93IGZvcndhcmQtZmluZCBmcm9tIHRoZSBzdGFydCBwb3NpdGlvbiB0byBz ZWUgd2hlcmUgd2UgY2FuIGFjdHVhbGx5IHdyYXAuCi0gICAgICAgICAgICAvLyBbZXgtXVthbXBs ZV0gdnMuIFtleC1dW2NvbnRhaW5lciBzdGFydF1bY29udGFpbmVyIGVuZF1bYW1wbGVdCi0gICAg ICAgICAgICAvLyB3aGVyZSBbZXgtXSBpcyBzdGFydENvbnRlbnQgYW5kIFthbXBsZV0gaXMgdGhl IG5leHRDb250ZW50LgotICAgICAgICAgICAgZm9yIChhdXRvIGNhbmRpZGF0ZUluZGV4ID0gKnBy ZXZpb3VzSW5saW5lSXRlbUluZGV4ICsgMTsgY2FuZGlkYXRlSW5kZXggPCBpbmRleDsgKytjYW5k aWRhdGVJbmRleCkgewotICAgICAgICAgICAgICAgIGlmIChpbmxpbmVDb250ZW50W2NhbmRpZGF0 ZUluZGV4XS5pc0NvbnRhaW5lclN0YXJ0KCkpIHsKLSAgICAgICAgICAgICAgICAgICAgLy8gaW5s aW5lIGNvbnRlbnQgYW5kIFtjb250YWluZXIgc3RhcnRdIGFuZCBbY29udGFpbmVyIGVuZF0gZm9y bSB1bmJyZWFrYWJsZSBjb250ZW50LgotICAgICAgICAgICAgICAgICAgICAvLyBleC08c3Bhbj48 L3NwYW4+YW1wbGUgIDogd3JhcCBvcHBvcnR1bml0eSBpcyBhZnRlciAiZXgtIi4KLSAgICAgICAg ICAgICAgICAgICAgLy8gZXgtPC9zcGFuPjwvc3Bhbj5hbXBsZSA6IHdyYXAgb3Bwb3J0dW5pdHkg aXMgYWZ0ZXIgImV4LTwvc3Bhbj48L3NwYW4+Ii4KLSAgICAgICAgICAgICAgICAgICAgLy8gZXgt PC9zcGFuPjxzcGFuPmFtcGxlPC9zcGFuPiA6IHdyYXAgb3Bwb3J0dW5pdHkgaXMgYWZ0ZXIgImV4 LTwvc3Bhbj4iLgotICAgICAgICAgICAgICAgICAgICAvLyBleC08c3Bhbj48c3Bhbj5hbXBsZTwv c3Bhbj48L3NwYW4+IDogd3JhcCBvcHBvcnR1bml0eSBpcyBhZnRlciAiZXgtIi4KLSAgICAgICAg ICAgICAgICAgICAgcmV0dXJuIGNhbmRpZGF0ZUluZGV4OwotICAgICAgICAgICAgICAgIH0KLSAg ICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVybiBpbmRleDsKLSAgICAgICAgfQotICAgICAg ICBwcmV2aW91c0lubGluZUl0ZW1JbmRleCA9IGluZGV4OwotICAgIH0KLSAgICByZXR1cm4gbGF5 b3V0UmFuZ2UuZW5kOwotfQotCiBzdHJ1Y3QgTGluZUNhbmRpZGF0ZSB7CiAgICAgTGluZUNhbmRp ZGF0ZShib29sIGlnbm9yZVRyYWlsaW5nTGV0dGVyU3BhY2luZyk7CiAKQEAgLTUwMCw3ICs0NTAs NyBAQCB2b2lkIExpbmVCdWlsZGVyOjpuZXh0Q29udGVudEZvckxpbmUoTGluZUNhbmRpZGF0ZSYg bGluZUNhbmRpZGF0ZSwgc2l6ZV90IGN1cnJlbgogICAgIC8vIDEuIFNpbXBseSBhZGQgYW55IG92 ZXJmbG93IGNvbnRlbnQgZnJvbSB0aGUgcHJldmlvdXMgbGluZSB0byB0aGUgY2FuZGlkYXRlIGNv bnRlbnQuIEl0J3MgYWx3YXlzIGEgdGV4dCBjb250ZW50LgogICAgIC8vIDIuIEZpbmQgdGhlIG5l eHQgc29mdCB3cmFwIHBvc2l0aW9uIG9yIGV4cGxpY2l0IGxpbmUgYnJlYWsuCiAgICAgLy8gMy4g Q29sbGVjdCBmbG9hdHMgYmV0d2VlbiB0aGUgaW5saW5lIGNvbnRlbnQuCi0gICAgYXV0byBzb2Z0 V3JhcE9wcG9ydHVuaXR5SW5kZXggPSBuZXh0V3JhcE9wcG9ydHVuaXR5KG1faW5saW5lSXRlbXMs IGN1cnJlbnRJbmxpbmVJdGVtSW5kZXgsIGxheW91dFJhbmdlKTsKKyAgICBhdXRvIHNvZnRXcmFw T3Bwb3J0dW5pdHlJbmRleCA9IG5leHRXcmFwT3Bwb3J0dW5pdHkoY3VycmVudElubGluZUl0ZW1J bmRleCwgbGF5b3V0UmFuZ2UpOwogICAgIC8vIHNvZnRXcmFwT3Bwb3J0dW5pdHlJbmRleCA9PSBs YXlvdXRSYW5nZS5lbmQgbWVhbnMgd2UgZG9uJ3QgaGF2ZSBhbnkgd3JhcCBvcHBvcnR1bml0eSBp biB0aGlzIGNvbnRlbnQuCiAgICAgQVNTRVJUKHNvZnRXcmFwT3Bwb3J0dW5pdHlJbmRleCA8PSBs YXlvdXRSYW5nZS5lbmQpOwogCkBAIC01NDcsNiArNDk3LDU5IEBAIHZvaWQgTGluZUJ1aWxkZXI6 Om5leHRDb250ZW50Rm9yTGluZShMaW5lQ2FuZGlkYXRlJiBsaW5lQ2FuZGlkYXRlLCBzaXplX3Qg Y3VycmVuCiAgICAgfQogfQogCitzaXplX3QgTGluZUJ1aWxkZXI6Om5leHRXcmFwT3Bwb3J0dW5p dHkoc2l6ZV90IHN0YXJ0SW5kZXgsIGNvbnN0IExpbmVCdWlsZGVyOjpJbmxpbmVJdGVtUmFuZ2Um IGxheW91dFJhbmdlKSBjb25zdAoreworICAgIC8vIDEuIEZpbmQgdGhlIHN0YXJ0IGNhbmRpZGF0 ZSBieSBza2lwcGluZyBsZWFkaW5nIG5vbi1jb250ZW50IGl0ZW1zIGUuZyAiPHNwYW4+PHNwYW4+ c3RhcnQiLiBPcHBvcnR1bml0eSBpcyBhZnRlciAiPHNwYW4+PHNwYW4+Ii4KKyAgICAvLyAyLiBG aW5kIHRoZSBlbmQgY2FuZGlkYXRlIGJ5IHNraXBwaW5nIG5vbi1jb250ZW50IGl0ZW1zIGluYmV0 d2VlbiBlLmcuICI8c3Bhbj48c3Bhbj5zdGFydDwvc3Bhbj5lbmQiLiBPcHBvcnR1bml0eSBpcyBh ZnRlciAiPC9zcGFuPiIuCisgICAgLy8gMy4gQ2hlY2sgaWYgdGhlcmUncyBhIHNvZnQgd3JhcCBv cHBvcnR1bml0eSBiZXR3ZWVuIHRoZSAyIGNhbmRpZGF0ZSBpbmxpbmUgaXRlbXMgYW5kIHJlcGVh dC4KKyAgICAvLyA0LiBBbnkgZm9yY2UgbGluZSBicmVhay9leHBsaWNpdCB3cmFwIGNvbnRlbnQg aW5iZXR3ZWVuIGlzIGNvbnNpZGVyZWQgYXMgd3JhcCBvcHBvcnR1bml0eS4KKworICAgIC8vIFtl eC1dW2NvbnRhaW5lciBzdGFydF1bY29udGFpbmVyIGVuZF1bZmxvYXRdW2FtcGxlXSAoZXgtPHNw YW4+PC9zcGFuPjxkaXYgc3R5bGU9ImZsb2F0OmxlZnQiPjwvZGl2PmFtcGxlKS4gV3JhcCBpbmRl eCBpcyBhdCBbZXgtXS4KKyAgICAvLyBbZXhdW2NvbnRhaW5lciBzdGFydF1bYW1wLV1bY29udGFp bmVyIHN0YXJ0XVtsZV0gKGV4PHNwYW4+YW1wLTxzcGFuPmFtcGxlKS4gV3JhcCBpbmRleCBpcyBh dCBbYW1wLV0uCisgICAgLy8gW2V4LV1bY29udGFpbmVyIHN0YXJ0XVtsaW5lIGJyZWFrXVthbXBs ZV0gKGV4LTxzcGFuPjxicj5hbXBsZSkuIFdyYXAgaW5kZXggaXMgYWZ0ZXIgW2JyXS4KKyAgICBh dXRvIHByZXZpb3VzSW5saW5lSXRlbUluZGV4ID0gT3B0aW9uYWw8c2l6ZV90PiB7IH07CisgICAg Zm9yIChhdXRvIGluZGV4ID0gc3RhcnRJbmRleDsgaW5kZXggPCBsYXlvdXRSYW5nZS5lbmQ7ICsr aW5kZXgpIHsKKyAgICAgICAgYXV0byYgaW5saW5lSXRlbSA9IG1faW5saW5lSXRlbXNbaW5kZXhd OworICAgICAgICBpZiAoaW5saW5lSXRlbS5pc0xpbmVCcmVhaygpIHx8IGlubGluZUl0ZW0uaXNX b3JkQnJlYWtPcHBvcnR1bml0eSgpKSB7CisgICAgICAgICAgICAvLyBXZSBhbHdheXMgc3RvcCBh dCBleHBsaWNpdCB3cmFwcGluZyBvcHBvcnR1bml0aWVzIGUuZy4gPGJyPi4gVGhlIHdyYXAgcG9z aXRpb24gaXMgYWZ0ZXIgdGhlIG9wcG9ydHVuaXR5IHBvc2l0aW9uLgorICAgICAgICAgICAgcmV0 dXJuICsraW5kZXg7CisgICAgICAgIH0KKyAgICAgICAgaWYgKGlubGluZUl0ZW0uaXNGbG9hdCgp KSB7CisgICAgICAgICAgICAvLyBGbG9hdHMgYXJlIG5vdCBwYXJ0IG9mIHRoZSBpbmxpbmUgY29u dGVudC4gV2UgaWdub3JlIHRoZW0gYXMgZmFyIGFzIHdyYXAgb3Bwb3J0dW5pdGllcyBhcmUgY29u Y2VybmVkLgorICAgICAgICAgICAgLy8gW3RleHRdW2Zsb2F0IGJveF1bdGV4dF0gaXMgZXNzZW50 aWFsbHkganVzdCBbdGV4dF1bdGV4dF0KKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9 CisgICAgICAgIGlmIChpbmxpbmVJdGVtLmlzQ29udGFpbmVyU3RhcnQoKSB8fCBpbmxpbmVJdGVt LmlzQ29udGFpbmVyRW5kKCkpIHsKKyAgICAgICAgICAgIC8vIFRoZXJlJ3Mgbm8gd3JhcHBpbmcg b3Bwb3J0dW5pdHkgYmV0d2VlbiA8c3Bhbj50ZXh0LCA8c3Bhbj48L3NwYW4+IG9yIDwvc3Bhbj50 ZXh0LiAKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisgICAgICAgIEFTU0VSVChp bmxpbmVJdGVtLmlzVGV4dCgpIHx8IGlubGluZUl0ZW0uaXNCb3goKSk7CisgICAgICAgIGlmICgh cHJldmlvdXNJbmxpbmVJdGVtSW5kZXgpIHsKKyAgICAgICAgICAgIHByZXZpb3VzSW5saW5lSXRl bUluZGV4ID0gaW5kZXg7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAg ICBpZiAoaXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkobV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dCwg bV9pbmxpbmVJdGVtc1sqcHJldmlvdXNJbmxpbmVJdGVtSW5kZXhdLCBtX2lubGluZUl0ZW1zW2lu ZGV4XSkpIHsKKyAgICAgICAgICAgIC8vIFRoZXJlJ3MgYSBzb2Z0IHdyYXAgb3Bwb3J0dW5pdHkg YmV0d2VlbiAncHJldmlvdXNJbmxpbmVJdGVtSW5kZXgnIGFuZCAnaW5kZXgnLgorICAgICAgICAg ICAgLy8gTm93IGZvcndhcmQtZmluZCBmcm9tIHRoZSBzdGFydCBwb3NpdGlvbiB0byBzZWUgd2hl cmUgd2UgY2FuIGFjdHVhbGx5IHdyYXAuCisgICAgICAgICAgICAvLyBbZXgtXVthbXBsZV0gdnMu IFtleC1dW2NvbnRhaW5lciBzdGFydF1bY29udGFpbmVyIGVuZF1bYW1wbGVdCisgICAgICAgICAg ICAvLyB3aGVyZSBbZXgtXSBpcyBzdGFydENvbnRlbnQgYW5kIFthbXBsZV0gaXMgdGhlIG5leHRD b250ZW50LgorICAgICAgICAgICAgZm9yIChhdXRvIGNhbmRpZGF0ZUluZGV4ID0gKnByZXZpb3Vz SW5saW5lSXRlbUluZGV4ICsgMTsgY2FuZGlkYXRlSW5kZXggPCBpbmRleDsgKytjYW5kaWRhdGVJ bmRleCkgeworICAgICAgICAgICAgICAgIGlmIChtX2lubGluZUl0ZW1zW2NhbmRpZGF0ZUluZGV4 XS5pc0NvbnRhaW5lclN0YXJ0KCkpIHsKKyAgICAgICAgICAgICAgICAgICAgLy8gaW5saW5lIGNv bnRlbnQgYW5kIFtjb250YWluZXIgc3RhcnRdIGFuZCBbY29udGFpbmVyIGVuZF0gZm9ybSB1bmJy ZWFrYWJsZSBjb250ZW50LgorICAgICAgICAgICAgICAgICAgICAvLyBleC08c3Bhbj48L3NwYW4+ YW1wbGUgIDogd3JhcCBvcHBvcnR1bml0eSBpcyBhZnRlciAiZXgtIi4KKyAgICAgICAgICAgICAg ICAgICAgLy8gZXgtPC9zcGFuPjwvc3Bhbj5hbXBsZSA6IHdyYXAgb3Bwb3J0dW5pdHkgaXMgYWZ0 ZXIgImV4LTwvc3Bhbj48L3NwYW4+Ii4KKyAgICAgICAgICAgICAgICAgICAgLy8gZXgtPC9zcGFu PjxzcGFuPmFtcGxlPC9zcGFuPiA6IHdyYXAgb3Bwb3J0dW5pdHkgaXMgYWZ0ZXIgImV4LTwvc3Bh bj4iLgorICAgICAgICAgICAgICAgICAgICAvLyBleC08c3Bhbj48c3Bhbj5hbXBsZTwvc3Bhbj48 L3NwYW4+IDogd3JhcCBvcHBvcnR1bml0eSBpcyBhZnRlciAiZXgtIi4KKyAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIGNhbmRpZGF0ZUluZGV4OworICAgICAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIH0KKyAgICAgICAgICAgIHJldHVybiBpbmRleDsKKyAgICAgICAgfQorICAgICAgICBwcmV2 aW91c0lubGluZUl0ZW1JbmRleCA9IGluZGV4OworICAgIH0KKyAgICByZXR1cm4gbGF5b3V0UmFu Z2UuZW5kOworfQorCiB2b2lkIExpbmVCdWlsZGVyOjpjb21taXRGbG9hdHMoY29uc3QgTGluZUNh bmRpZGF0ZSYgbGluZUNhbmRpZGF0ZSwgQ29tbWl0SW50cnVzaXZlRmxvYXRzT25seSBjb21taXRJ bnRydXNpdmVPbmx5KQogewogICAgIGF1dG8mIGZsb2F0Q29udGVudCA9IGxpbmVDYW5kaWRhdGUu ZmxvYXRDb250ZW50OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmgKaW5kZXggODM1Yzk4YTk5OTZhZmZhMjJj NTQyYWVmYTEyYzMxZWQ1Yjk1ODBiYS4uNTgwMDFiZjhlNDIyNWU5NjJmYmI3N2NlMGNmZjUzOWUw Yzc4MTA5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZUJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oCkBAIC03NCw2ICs3NCw4IEBAIHB1YmxpYzoK IAogcHJpdmF0ZToKICAgICB2b2lkIG5leHRDb250ZW50Rm9yTGluZShMaW5lQ2FuZGlkYXRlJiwg c2l6ZV90IGlubGluZUl0ZW1JbmRleCwgY29uc3QgSW5saW5lSXRlbVJhbmdlJiBuZWVkc0xheW91 dFJhbmdlLCBzaXplX3Qgb3ZlcmZsb3dMZW5ndGgsIElubGluZUxheW91dFVuaXQgYXZhaWxhYmxl TGluZVdpZHRoLCBJbmxpbmVMYXlvdXRVbml0IGN1cnJlbnRMb2dpY2FsUmlnaHQpOworICAgIHNp emVfdCBuZXh0V3JhcE9wcG9ydHVuaXR5KHNpemVfdCBzdGFydEluZGV4LCBjb25zdCBMaW5lQnVp bGRlcjo6SW5saW5lSXRlbVJhbmdlJiBsYXlvdXRSYW5nZSkgY29uc3Q7CisKICAgICBzdHJ1Y3Qg UmVzdWx0IHsKICAgICAgICAgSW5saW5lQ29udGVudEJyZWFrZXI6OklzRW5kT2ZMaW5lIGlzRW5k T2ZMaW5lIHsgSW5saW5lQ29udGVudEJyZWFrZXI6OklzRW5kT2ZMaW5lOjpObyB9OwogICAgICAg ICBzdHJ1Y3QgQ29tbWl0dGVkQ29udGVudENvdW50IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRyZWUuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5j cHAKaW5kZXggNzc4MTEwMzcwY2M3YmVjOTMxZmI5NTI1ODA3YTAxN2U0Y2RiZGNkYy4uYWJiOGJl YzY1MzZmN2ExZWNkMzBjYmE4NDVlMWNiN2RmZDBmMmFhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQm94 VHJlZS5jcHAKQEAgLTczLDcgKzczLDcgQEAgdm9pZCBCb3hUcmVlOjpidWlsZFRyZWUoY29uc3Qg UmVuZGVyQmxvY2tGbG93JiBmbG93KQogICAgICAgICB9IGVsc2UgaWYgKGlzPFJlbmRlckltYWdl PihjaGlsZFJlbmRlcmVyKSkgewogICAgICAgICAgICAgYXV0byYgaW1hZ2UgPSBkb3duY2FzdDxS ZW5kZXJJbWFnZT4oY2hpbGRSZW5kZXJlcik7CiAgICAgICAgICAgICBhdXRvIGNsb25lZFN0eWxl ID0gUmVuZGVyU3R5bGU6OmNsb25lKGltYWdlLnN0eWxlKCkpOwotICAgICAgICAgICAgY2hpbGRC b3ggPSBtYWtlVW5pcXVlPExheW91dDo6UmVwbGFjZWRCb3g+KFdURjo6bnVsbG9wdCwgV1RGTW92 ZShjbG9uZWRTdHlsZSkpOworICAgICAgICAgICAgY2hpbGRCb3ggPSBtYWtlVW5pcXVlPExheW91 dDo6UmVwbGFjZWRCb3g+KExheW91dDo6Qm94OjpFbGVtZW50QXR0cmlidXRlcyB7IExheW91dDo6 Qm94OjpFbGVtZW50VHlwZTo6SW1hZ2UgfSwgV1RGTW92ZShjbG9uZWRTdHlsZSkpOwogICAgICAg ICB9CiAgICAgICAgIEFTU0VSVChjaGlsZEJveCk7CiAK