206395 2020-01-16 20:45:57 -0800 [LFC][IFC] Optimize nextWrapOpportunity/isAtSoftWrapOpportunity for the most common inline content 2020-01-17 07:03:41 -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 1607853 0 zalan 2020-01-16 20:45:57 -0800 ssia 1607854 1 webkit-bug-importer 2020-01-16 20:46:16 -0800 <rdar://problem/58670070> 1607855 2 388007 zalan 2020-01-16 20:48:14 -0800 Created attachment 388007 Patch 1607970 3 388007 commit-queue 2020-01-17 07:03:39 -0800 Comment on attachment 388007 Patch Clearing flags on attachment: 388007 Committed r254743: <https://trac.webkit.org/changeset/254743> 1607971 4 commit-queue 2020-01-17 07:03:41 -0800 All reviewed patches have been landed. Closing bug. 388007 2020-01-16 20:48:14 -0800 2020-01-17 07:03:39 -0800 Patch bug-206395-20200116204814.patch text/plain 9176 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0NzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzNmN2M2ZjYyZWE4OGNh M2M5NzA3YTIzYzg1NDY3NzM4NzlkZjdhZS4uYTY2N2ZjZGFlMDljOTZjZjA3ZWMwOTkwZjM3ZTIx NTRhZjBiNDg1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTAxLTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBPcHRpbWl6 ZSBuZXh0V3JhcE9wcG9ydHVuaXR5L2lzQXRTb2Z0V3JhcE9wcG9ydHVuaXR5IGZvciB0aGUgbW9z dCBjb21tb24gaW5saW5lIGNvbnRlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwNjM5NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTg2NzAwNzA+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgfjIlIHBy b2dyZXNzaW9uIG9uIFBlcmZvcm1hbmNlVGVzdHMvTGF5b3V0L2xpbmUtbGF5b3V0LXNpbXBsZS5o dG1sLgorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRl eHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0Ojppc0F0U29mdFdyYXBPcHBvcnR1bml0 eSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Om5leHRXcmFwT3Bwb3J0dW5pdHkpOgorCiAy MDIwLTAxLTE2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xG Q11bSUZDXSBPcHRpbWl6ZSBMaW5lTGF5b3V0Q29udGV4dDo6dHJ5QWRkaW5nSW5saW5lSXRlbXMg Zm9yIHRoZSBtb3N0IGNvbW1vbiBpbmxpbmUgY29udGVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRleHQuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRleHQuY3Bw CmluZGV4IGRmYmY5Y2E4Nzc2OTM1N2Y5YTE4NDYwM2RjNmFkMjBmZjhkMjY3NWIuLjUwNjA5ODNm MjUxZWM3NjM4MGZkY2U5MzNmNDI1M2QyNGI0YjQwN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5j cHAKQEAgLTc0LDMxICs3NCwzNSBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNBdFNvZnRXcmFwT3Bw b3J0dW5pdHkoY29uc3QgSW5saW5lSXRlbSYgY3VycmVudCwgY29uc3QgSW5saQogICAgIC8vIGJ1 dCBhbiBpbmNvbWluZyB0ZXh0IGNvbnRlbnQgd291bGQgbm90IG5lY2Vzc2FyaWx5LgogICAgIEFT U0VSVChjdXJyZW50LmlzVGV4dCgpIHx8IGN1cnJlbnQuaXNCb3goKSk7CiAgICAgQVNTRVJUKG5l eHQuaXNUZXh0KCkgfHwgbmV4dC5pc0JveCgpKTsKKyAgICBpZiAoY3VycmVudC5pc1RleHQoKSAm JiBuZXh0LmlzVGV4dCgpKSB7CisgICAgICAgIGF1dG8mIGN1cnJlbnRJbmxpbmVUZXh0SXRlbSA9 IGRvd25jYXN0PElubGluZVRleHRJdGVtPihjdXJyZW50KTsKKyAgICAgICAgYXV0byYgbmV4dElu bGluZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KG5leHQpOworICAgICAgICBp ZiAoY3VycmVudElubGluZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgpKSB7CisgICAgICAgICAgICAv LyBbIF1bdGV4dF0gOiBhZnRlciBbd2hpdGVzcGFjZV0gcG9zaXRpb24gaXMgYSBzb2Z0IHdyYXAg b3Bwb3J0dW5pdHkuCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorICAgICAg ICBpZiAobmV4dElubGluZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgpKSB7CisgICAgICAgICAgICAv LyBbdGV4dF1bIF0gKDxzcGFuPnRleHQ8L3NwYW4+ICkKKyAgICAgICAgICAgIC8vIHdoaXRlLXNw YWNlOiBicmVhay1zcGFjZXM6IGxpbmUgYnJlYWtpbmcgb3Bwb3J0dW5pdHkgZXhpc3RzIGFmdGVy IGV2ZXJ5IHByZXNlcnZlZCB3aGl0ZSBzcGFjZSBjaGFyYWN0ZXIsIGJ1dCBub3QgYmVmb3JlLgor ICAgICAgICAgICAgcmV0dXJuIG5leHRJbmxpbmVUZXh0SXRlbS5zdHlsZSgpLndoaXRlU3BhY2Uo KSAhPSBXaGl0ZVNwYWNlOjpCcmVha1NwYWNlczsKKyAgICAgICAgfQorICAgICAgICBpZiAoY3Vy cmVudC5zdHlsZSgpLmxpbmVCcmVhaygpID09IExpbmVCcmVhazo6QW55d2hlcmUgfHwgbmV4dC5z dHlsZSgpLmxpbmVCcmVhaygpID09IExpbmVCcmVhazo6QW55d2hlcmUpIHsKKyAgICAgICAgICAg IC8vIFRoZXJlIGlzIGEgc29mdCB3cmFwIG9wcG9ydHVuaXR5IGFyb3VuZCBldmVyeSB0eXBvZ3Jh cGhpYyBjaGFyYWN0ZXIgdW5pdCwgaW5jbHVkaW5nIGFyb3VuZCBhbnkgcHVuY3R1YXRpb24gY2hh cmFjdGVyCisgICAgICAgICAgICAvLyBvciBwcmVzZXJ2ZWQgd2hpdGUgc3BhY2VzLCBvciBpbiB0 aGUgbWlkZGxlIG9mIHdvcmRzLgorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0K KyAgICAgICAgLy8gQm90aCBjdXJyZW50IGFuZCBuZXh0IGl0ZW1zIGFyZSBub24td2hpdGVzcGFj ZSB0ZXh0LgorICAgICAgICAvLyBbdGV4dF1bdGV4dF0gOiBpcyBhIGNvbnRpbnVvdXMgY29udGVu dC4KKyAgICAgICAgLy8gW3RleHQtXVt0ZXh0XSA6IGFmdGVyIFtoeXBoZW5dIHBvc2l0aW9uIGlz IGEgc29mdCB3cmFwIG9wcG9ydHVuaXR5LgorICAgICAgICByZXR1cm4gZW5kc1dpdGhTb2Z0V3Jh cE9wcG9ydHVuaXR5KGN1cnJlbnRJbmxpbmVUZXh0SXRlbSwgbmV4dElubGluZVRleHRJdGVtKTsK KyAgICB9CiAgICAgaWYgKGN1cnJlbnQuaXNCb3goKSB8fCBuZXh0LmlzQm94KCkpIHsKICAgICAg ICAgLy8gW3RleHRdW2NvbnRhaW5lciBzdGFydF1bY29udGFpbmVyIGVuZF1baW5saW5lIGJveF0g KHRleHQ8c3Bhbj48L3NwYW4+PGltZz4pIDogdGhlcmUncyBhIHNvZnQgd3JhcCBvcHBvcnR1bml0 eSBiZXR3ZWVuIHRoZSBbdGV4dF0gYW5kIFtpbWddLgogICAgICAgICAvLyBUaGUgbGluZSBicmVh a2luZyBiZWhhdmlvciBvZiBhIHJlcGxhY2VkIGVsZW1lbnQgb3Igb3RoZXIgYXRvbWljIGlubGlu ZSBpcyBlcXVpdmFsZW50IHRvIGFuIGlkZW9ncmFwaGljIGNoYXJhY3Rlci4KICAgICAgICAgcmV0 dXJuIHRydWU7CiAgICAgfQotICAgIGlmIChjdXJyZW50LnN0eWxlKCkubGluZUJyZWFrKCkgPT0g TGluZUJyZWFrOjpBbnl3aGVyZSB8fCBuZXh0LnN0eWxlKCkubGluZUJyZWFrKCkgPT0gTGluZUJy ZWFrOjpBbnl3aGVyZSkgewotICAgICAgICAvLyBUaGVyZSBpcyBhIHNvZnQgd3JhcCBvcHBvcnR1 bml0eSBhcm91bmQgZXZlcnkgdHlwb2dyYXBoaWMgY2hhcmFjdGVyIHVuaXQsIGluY2x1ZGluZyBh cm91bmQgYW55IHB1bmN0dWF0aW9uIGNoYXJhY3RlcgotICAgICAgICAvLyBvciBwcmVzZXJ2ZWQg d2hpdGUgc3BhY2VzLCBvciBpbiB0aGUgbWlkZGxlIG9mIHdvcmRzLgotICAgICAgICByZXR1cm4g dHJ1ZTsKLSAgICB9Ci0gICAgYXV0byYgY3VycmVudElubGluZVRleHRJdGVtID0gZG93bmNhc3Q8 SW5saW5lVGV4dEl0ZW0+KGN1cnJlbnQpOwotICAgIGF1dG8mIG5leHRJbmxpbmVUZXh0SXRlbSA9 IGRvd25jYXN0PElubGluZVRleHRJdGVtPihuZXh0KTsKLSAgICBpZiAoY3VycmVudElubGluZVRl eHRJdGVtLmlzV2hpdGVzcGFjZSgpKSB7Ci0gICAgICAgIC8vIFsgXVt0ZXh0XSA6IGFmdGVyIFt3 aGl0ZXNwYWNlXSBwb3NpdGlvbiBpcyBhIHNvZnQgd3JhcCBvcHBvcnR1bml0eS4KLSAgICAgICAg cmV0dXJuIHRydWU7Ci0gICAgfQotICAgIGlmIChuZXh0SW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNw YWNlKCkpIHsKLSAgICAgICAgLy8gW3RleHRdWyBdICg8c3Bhbj50ZXh0PC9zcGFuPiApCi0gICAg ICAgIC8vIHdoaXRlLXNwYWNlOiBicmVhay1zcGFjZXM6IGxpbmUgYnJlYWtpbmcgb3Bwb3J0dW5p dHkgZXhpc3RzIGFmdGVyIGV2ZXJ5IHByZXNlcnZlZCB3aGl0ZSBzcGFjZSBjaGFyYWN0ZXIsIGJ1 dCBub3QgYmVmb3JlLgotICAgICAgICByZXR1cm4gbmV4dElubGluZVRleHRJdGVtLnN0eWxlKCku d2hpdGVTcGFjZSgpICE9IFdoaXRlU3BhY2U6OkJyZWFrU3BhY2VzOwotICAgIH0KLSAgICAvLyBC b3RoIGN1cnJlbnQgYW5kIG5leHQgaXRlbXMgYXJlIG5vbi13aGl0ZXNwYWNlIHRleHQuCi0gICAg Ly8gW3RleHRdW3RleHRdIDogaXMgYSBjb250aW51b3VzIGNvbnRlbnQuCi0gICAgLy8gW3RleHQt XVt0ZXh0XSA6IGFmdGVyIFtoeXBoZW5dIHBvc2l0aW9uIGlzIGEgc29mdCB3cmFwIG9wcG9ydHVu aXR5LgotICAgIHJldHVybiBlbmRzV2l0aFNvZnRXcmFwT3Bwb3J0dW5pdHkoY3VycmVudElubGlu ZVRleHRJdGVtLCBuZXh0SW5saW5lVGV4dEl0ZW0pOworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgp OworICAgIHJldHVybiB0cnVlOwogfQogCiBzdGF0aWMgaW5saW5lIHNpemVfdCBuZXh0V3JhcE9w cG9ydHVuaXR5KGNvbnN0IElubGluZUl0ZW1zJiBpbmxpbmVDb250ZW50LCB1bnNpZ25lZCBzdGFy dEluZGV4KQpAQCAtMTExLDU2ICsxMTUsNDcgQEAgc3RhdGljIGlubGluZSBzaXplX3QgbmV4dFdy YXBPcHBvcnR1bml0eShjb25zdCBJbmxpbmVJdGVtcyYgaW5saW5lQ29udGVudCwgdW5zaWcKICAg ICAvLyBbZXgtXVtjb250YWluZXIgc3RhcnRdW2NvbnRhaW5lciBlbmRdW2Zsb2F0XVthbXBsZV0g KGV4LTxzcGFuPjwvc3Bhbj48ZGl2IHN0eWxlPSJmbG9hdDpsZWZ0Ij48L2Rpdj5hbXBsZSkgOiB3 cmFwIGluZGV4IGlzIGF0IFtleC1dLgogICAgIC8vIFtleF1bY29udGFpbmVyIHN0YXJ0XVthbXAt XVtjb250YWluZXIgc3RhcnRdW2xlXSAoZXg8c3Bhbj5hbXAtPHNwYW4+YW1wbGUpIDogd3JhcCBp bmRleCBpcyBhdCBbYW1wLV0uCiAgICAgLy8gW2V4LV1bY29udGFpbmVyIHN0YXJ0XVtsaW5lIGJy ZWFrXVthbXBsZV0gKGV4LTxzcGFuPjxicj5hbXBsZSkgOiB3cmFwIGluZGV4IGlzIGFmdGVyIFti cl0uCi0gICAgYXV0byBlbmQgPSBpbmxpbmVDb250ZW50LnNpemUoKTsKKyAgICB1bnNpZ25lZCBp bmxpbmVJdGVtQ291bnQgPSBpbmxpbmVDb250ZW50LnNpemUoKTsKKyAgICBhdXRvIGlzQXRMaW5l QnJlYWsgPSBmYWxzZTsKIAotICAgIHN0cnVjdCBXcmFwQ29udGVudCB7Ci0gICAgICAgIFdyYXBD b250ZW50KHNpemVfdCBpbmRleCwgYm9vbCBpc0F0TGluZUJyZWFrKQotICAgICAgICAgICAgOiBt X2luZGV4KGluZGV4KQotICAgICAgICAgICAgLCBtX2lzQXRMaW5lQnJlYWsoaXNBdExpbmVCcmVh aykKLSAgICAgICAgewotICAgICAgICB9Ci0gICAgICAgIHNpemVfdCBvcGVyYXRvciooKSBjb25z dCB7IHJldHVybiBtX2luZGV4OyB9Ci0gICAgICAgIGJvb2wgaXNBdExpbmVCcmVhaygpIGNvbnN0 IHsgcmV0dXJuIG1faXNBdExpbmVCcmVhazsgfQotCi0gICAgcHJpdmF0ZToKLSAgICAgICAgc2l6 ZV90IG1faW5kZXggeyAwIH07Ci0gICAgICAgIGJvb2wgbV9pc0F0TGluZUJyZWFrIHsgZmFsc2Ug fTsKLSAgICB9OwotICAgIGF1dG8gbmV4dElubGluZUl0ZW1XaXRoQ29udGVudCA9IFsmXSAoYXV0 byBpbmRleCkgeworICAgIGF1dG8gaW5saW5lSXRlbUluZGV4V2l0aENvbnRlbnQgPSBbJl0gKGF1 dG8gaW5kZXgpIHsKICAgICAgICAgLy8gQnJlYWsgYXQgdGhlIGZpcnN0IHRleHQvYm94L2xpbmUg YnJlYWsgaW5saW5lIGl0ZW0uCi0gICAgICAgIGZvciAoOyBpbmRleCA8IGVuZDsgKytpbmRleCkg eworICAgICAgICBmb3IgKDsgaW5kZXggPCBpbmxpbmVJdGVtQ291bnQ7ICsraW5kZXgpIHsKICAg ICAgICAgICAgIGF1dG8mIGlubGluZUl0ZW0gPSAqaW5saW5lQ29udGVudFtpbmRleF07Ci0gICAg ICAgICAgICBpZiAoaW5saW5lSXRlbS5pc1RleHQoKSB8fCBpbmxpbmVJdGVtLmlzQm94KCkgfHwg aW5saW5lSXRlbS5pc0xpbmVCcmVhaygpKQotICAgICAgICAgICAgICAgIHJldHVybiBXcmFwQ29u dGVudCB7IGluZGV4LCBpbmxpbmVJdGVtLmlzTGluZUJyZWFrKCkgfTsKKyAgICAgICAgICAgIGlm IChpbmxpbmVJdGVtLmlzVGV4dCgpIHx8IGlubGluZUl0ZW0uaXNCb3goKSkKKyAgICAgICAgICAg ICAgICByZXR1cm4gaW5kZXg7CisgICAgICAgICAgICBpZiAoaW5saW5lSXRlbS5pc0xpbmVCcmVh aygpKSB7CisgICAgICAgICAgICAgICAgaXNBdExpbmVCcmVhayA9IHRydWU7CisgICAgICAgICAg ICAgICAgcmV0dXJuIGluZGV4OworICAgICAgICAgICAgfQogICAgICAgICB9Ci0gICAgICAgIHJl dHVybiBXcmFwQ29udGVudCB7IGVuZCwgZmFsc2UgfTsKKyAgICAgICAgcmV0dXJuIGlubGluZUl0 ZW1Db3VudDsKICAgICB9OwogCiAgICAgLy8gU3RhcnQgYXQgdGhlIGZpcnN0IGlubGluZSBpdGVt IHdpdGggY29udGVudC4KICAgICAvLyBbY29udGFpbmVyIHN0YXJ0XVtleC1dIDogc3RhcnQgYXQg W2V4LV0KLSAgICBhdXRvIHN0YXJ0Q29udGVudCA9IG5leHRJbmxpbmVJdGVtV2l0aENvbnRlbnQo c3RhcnRJbmRleCk7Ci0gICAgaWYgKHN0YXJ0Q29udGVudC5pc0F0TGluZUJyZWFrKCkpIHsKKyAg ICBhdXRvIHN0YXJ0Q29udGVudEluZGV4ID0gaW5saW5lSXRlbUluZGV4V2l0aENvbnRlbnQoc3Rh cnRJbmRleCk7CisgICAgaWYgKGlzQXRMaW5lQnJlYWspIHsKICAgICAgICAgLy8gQ29udGVudCBz dGFydHMgd2l0aCBhIGxpbmUgYnJlYWsuIFRoZSB3cmFwIHBvc2l0aW9uIGlzIGFmdGVyIHRoZSBs aW5lIGJyZWFrLgotICAgICAgICByZXR1cm4gKnN0YXJ0Q29udGVudCArIDE7CisgICAgICAgIHJl dHVybiBzdGFydENvbnRlbnRJbmRleCArIDE7CiAgICAgfQogCi0gICAgd2hpbGUgKCpzdGFydENv bnRlbnQgIT0gZW5kKSB7CisgICAgd2hpbGUgKHN0YXJ0Q29udGVudEluZGV4IDwgaW5saW5lSXRl bUNvdW50KSB7CiAgICAgICAgIC8vIDEuIEZpbmQgdGhlIG5leHQgaW5saW5lIGl0ZW0gd2l0aCBj b250ZW50LgogICAgICAgICAvLyAyLiBDaGVjayBpZiB0aGVyZSdzIGEgc29mdCB3cmFwIG9wcG9y dHVuaXR5IGJldHdlZW4gdGhlIHN0YXJ0IGFuZCB0aGUgbmV4dCBpbmxpbmUgaXRlbS4KLSAgICAg ICAgYXV0byBuZXh0Q29udGVudCA9IG5leHRJbmxpbmVJdGVtV2l0aENvbnRlbnQoKnN0YXJ0Q29u dGVudCArIDEpOwotICAgICAgICBpZiAoKm5leHRDb250ZW50ID09IGVuZCkKLSAgICAgICAgICAg IHJldHVybiAqbmV4dENvbnRlbnQ7Ci0gICAgICAgIGlmIChuZXh0Q29udGVudC5pc0F0TGluZUJy ZWFrKCkpIHsKKyAgICAgICAgYXV0byBuZXh0Q29udGVudEluZGV4ID0gaW5saW5lSXRlbUluZGV4 V2l0aENvbnRlbnQoc3RhcnRDb250ZW50SW5kZXggKyAxKTsKKyAgICAgICAgaWYgKG5leHRDb250 ZW50SW5kZXggPT0gaW5saW5lSXRlbUNvdW50KQorICAgICAgICAgICAgcmV0dXJuIG5leHRDb250 ZW50SW5kZXg7CisgICAgICAgIGlmIChpc0F0TGluZUJyZWFrKSB7CiAgICAgICAgICAgICAvLyBX ZSBhbHdheXMgc3RvcCBhdCBsaW5lIGJyZWFrcy4gVGhlIHdyYXAgcG9zaXRpb24gaXMgYWZ0ZXIg dGhlIGxpbmUgYnJlYWsuCi0gICAgICAgICAgICByZXR1cm4gKm5leHRDb250ZW50ICsgMTsKKyAg ICAgICAgICAgIHJldHVybiBuZXh0Q29udGVudEluZGV4ICsgMTsKICAgICAgICAgfQotICAgICAg ICBpZiAoaXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkoKmlubGluZUNvbnRlbnRbKnN0YXJ0Q29udGVu dF0sICppbmxpbmVDb250ZW50WypuZXh0Q29udGVudF0pKSB7CisgICAgICAgIGlmIChpc0F0U29m dFdyYXBPcHBvcnR1bml0eSgqaW5saW5lQ29udGVudFtzdGFydENvbnRlbnRJbmRleF0sICppbmxp bmVDb250ZW50W25leHRDb250ZW50SW5kZXhdKSkgewogICAgICAgICAgICAgLy8gVGhlcmUncyBh IHNvZnQgd3JhcCBvcHBvcnR1bml0eSBiZXR3ZWVuIHRoZSBzdGFydCBhbmQgdGhlIG5leHRDb250 ZW50LgogICAgICAgICAgICAgLy8gTm93IGZvcndhcmQtZmluZCBmcm9tIHRoZSBzdGFydCBwb3Np dGlvbiB0byBzZWUgd2hlcmUgd2UgY2FuIGFjdHVhbGx5IHdyYXAuCiAgICAgICAgICAgICAvLyBb ZXgtXVthbXBsZV0gdnMuIFtleC1dW2NvbnRhaW5lciBzdGFydF1bY29udGFpbmVyIGVuZF1bYW1w bGVdCiAgICAgICAgICAgICAvLyB3aGVyZSBbZXgtXSBpcyBzdGFydENvbnRlbnQgYW5kIFthbXBs ZV0gaXMgdGhlIG5leHRDb250ZW50LgotICAgICAgICAgICAgYXV0byBjYW5kaWRhdGVJbmRleCA9 ICpzdGFydENvbnRlbnQgKyAxOwotICAgICAgICAgICAgZm9yICg7IGNhbmRpZGF0ZUluZGV4IDwg Km5leHRDb250ZW50OyArK2NhbmRpZGF0ZUluZGV4KSB7CisgICAgICAgICAgICBmb3IgKGF1dG8g Y2FuZGlkYXRlSW5kZXggPSBzdGFydENvbnRlbnRJbmRleCArIDE7IGNhbmRpZGF0ZUluZGV4IDwg bmV4dENvbnRlbnRJbmRleDsgKytjYW5kaWRhdGVJbmRleCkgewogICAgICAgICAgICAgICAgIGlm IChpbmxpbmVDb250ZW50W2NhbmRpZGF0ZUluZGV4XS0+aXNDb250YWluZXJTdGFydCgpKSB7CiAg ICAgICAgICAgICAgICAgICAgIC8vIGlubGluZSBjb250ZW50IGFuZCBbY29udGFpbmVyIHN0YXJ0 XSBhbmQgW2NvbnRhaW5lciBlbmRdIGZvcm0gdW5icmVha2FibGUgY29udGVudC4KICAgICAgICAg ICAgICAgICAgICAgLy8gZXgtPHNwYW4+PC9zcGFuPmFtcGxlICA6IHdyYXAgb3Bwb3J0dW5pdHkg aXMgYWZ0ZXIgImV4LSIuCkBAIC0xNzAsMTEgKzE2NSwxMSBAQCBzdGF0aWMgaW5saW5lIHNpemVf dCBuZXh0V3JhcE9wcG9ydHVuaXR5KGNvbnN0IElubGluZUl0ZW1zJiBpbmxpbmVDb250ZW50LCB1 bnNpZwogICAgICAgICAgICAgICAgICAgICByZXR1cm4gY2FuZGlkYXRlSW5kZXg7CiAgICAgICAg ICAgICAgICAgfQogICAgICAgICAgICAgfQotICAgICAgICAgICAgcmV0dXJuIGNhbmRpZGF0ZUlu ZGV4OworICAgICAgICAgICAgcmV0dXJuIG5leHRDb250ZW50SW5kZXg7CiAgICAgICAgIH0KLSAg ICAgICAgc3RhcnRDb250ZW50ID0gbmV4dENvbnRlbnQ7CisgICAgICAgIHN0YXJ0Q29udGVudElu ZGV4ID0gbmV4dENvbnRlbnRJbmRleDsKICAgICB9Ci0gICAgcmV0dXJuIGVuZDsKKyAgICByZXR1 cm4gaW5saW5lSXRlbUNvdW50OwogfQogCiBzdHJ1Y3QgTGluZUNhbmRpZGF0ZUNvbnRlbnQgewo=