205235 2019-12-14 10:47:34 -0800 [LFC][IFC] Rename LineBreaker::Content::isAtContentBoundary to isAtSoftWrapOpportunity 2019-12-14 11:00:11 -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 1598643 0 zalan 2019-12-14 10:47:34 -0800 it's closer to the spec term. 1598644 1 webkit-bug-importer 2019-12-14 10:47:54 -0800 <rdar://problem/57939955> 1598646 2 385690 zalan 2019-12-14 10:53:53 -0800 Created attachment 385690 Patch 1598648 3 zalan 2019-12-14 11:00:11 -0800 Committed r253525: <https://trac.webkit.org/changeset/253525> 385690 2019-12-14 10:53:53 -0800 2019-12-14 10:56:38 -0800 Patch bug-205235-20191214105353.patch text/plain 13009 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjYxOGExMDJiMTFmNDRi YzJkZDQ0MjlkYmZmNWYzYzJiNjdlNGZkMC4uNDZlYzA3OGQ5NjA3ZDc0MzA5ODE3ZGUzMDc0NzA1 YmQ0ZjMwZGVjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTEyLTE0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBSZW5hbWUg TGluZUJyZWFrZXI6OkNvbnRlbnQ6OmlzQXRDb250ZW50Qm91bmRhcnkgdG8gaXNBdFNvZnRXcmFw T3Bwb3J0dW5pdHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwNTIzNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTc5Mzk5NTU+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlICJzb2Z0IHdyYXAgb3Bw b3J0dW5pdHkiIGlzIGNsb3NlciB0byB0aGUgc3BlYyB0ZXJtLgorCisgICAgICAgICogbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjplbmRzV2l0aFNvZnRXcmFwT3Bwb3J0dW5pdHkpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lQnJlYWtlcjo6Q29udGVudDo6aXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnJlYWtlcjo6Q29udGVudDo6YXBwZW5k KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6ZW5kc1dpdGhCcmVha2luZ09wcG9ydHVuaXR5 KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJyZWFrZXI6OkNvbnRl bnQ6OmlzQXRDb250ZW50Qm91bmRhcnkpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmg6CisgICAgICAgICogbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpMaW5lTGF5b3V0Q29udGV4dDo6cGxhY2VJbmxpbmVJdGVtKToKKwogMjAxOS0xMi0xNCAg WmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gQWRk IHN1cHBvcnQgZm9yIHdoaXRlLXNwYWNlOiBicmVhay1zcGFjZXMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2Vy LmNwcAppbmRleCA2MGVkMzcyNGM0YWNiODJiOTk2MWEyYWMzMWIwMGJiYjRlMWY2MGZkLi43M2Ux Y2I2YWY4YjczZGUwMTY1M2U1ZWE1NmQ0OGFjZTgxYWQ2NmNmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFr ZXIuY3BwCkBAIC0yMjcsNyArMjI3LDcgQEAgT3B0aW9uYWw8TGluZUJyZWFrZXI6OkxlZnRTaWRl PiBMaW5lQnJlYWtlcjo6dHJ5QnJlYWtpbmdUZXh0UnVuKGNvbnN0IENvbnRlbnQ6OlIKICAgICBy ZXR1cm4gTGVmdFNpZGUgeyBoeXBoZW5Mb2NhdGlvbiwgdHJhaWxpbmdQYXJ0aWFsUnVuV2lkdGhX aXRoSHlwaGVuLCB0cnVlIH07CiB9CiAKLXN0YXRpYyBib29sIGVuZHNXaXRoQnJlYWtpbmdPcHBv cnR1bml0eShjb25zdCBJbmxpbmVUZXh0SXRlbSYgcHJldmlvdXNUZXh0SXRlbSwgY29uc3QgSW5s aW5lVGV4dEl0ZW0mIG5leHRJbmxpbmVUZXh0SXRlbSkKK3N0YXRpYyBib29sIGVuZHNXaXRoU29m dFdyYXBPcHBvcnR1bml0eShjb25zdCBJbmxpbmVUZXh0SXRlbSYgcHJldmlvdXNUZXh0SXRlbSwg Y29uc3QgSW5saW5lVGV4dEl0ZW0mIG5leHRJbmxpbmVUZXh0SXRlbSkKIHsKICAgICBBU1NFUlQo IXByZXZpb3VzVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkpOwogICAgIEFTU0VSVCghbmV4dElubGlu ZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgpKTsKQEAgLTI1MSw4OCArMjUxLDEwMSBAQCBzdGF0aWMg Ym9vbCBlbmRzV2l0aEJyZWFraW5nT3Bwb3J0dW5pdHkoY29uc3QgSW5saW5lVGV4dEl0ZW0mIHBy ZXZpb3VzVGV4dEl0ZW0sCiAgICAgcmV0dXJuICFUZXh0VXRpbDo6ZmluZE5leHRCcmVha2FibGVQ b3NpdGlvbihsaW5lQnJlYWtJdGVyYXRvciwgMCwgbmV4dElubGluZVRleHRJdGVtLnN0eWxlKCkp OwogfQogCi1ib29sIExpbmVCcmVha2VyOjpDb250ZW50Ojppc0F0Q29udGVudEJvdW5kYXJ5KGNv bnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIGNvbnN0IENvbnRlbnQmIGNvbnRlbnQpCitib29s IExpbmVCcmVha2VyOjpDb250ZW50Ojppc0F0U29mdFdyYXBPcHBvcnR1bml0eShjb25zdCBJbmxp bmVJdGVtJiBpbmxpbmVJdGVtLCBjb25zdCBDb250ZW50JiBwcmlvckNvbnRlbnQpCiB7CiAgICAg Ly8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy10ZXh0LTMvI2xpbmUtYnJlYWstZGV0YWls cwotICAgIC8vIEZpZ3VyZSBvdXQgaWYgdGhlIG5ldyBpbmNvbWluZyBjb250ZW50IHB1dHMgdGhl IHVuY29tbWl0dGVkIGNvbnRlbnQgb24gY29tbWl0IGJvdW5kYXJ5LgotICAgIC8vIGUuZy4gPHNw YW4+Y29udGludW91czwvc3Bhbj4gPC0gdW5jb21pdHRlZCBjb250ZW50IC0+Ci0gICAgLy8gW2lu bGluZSBjb250YWluZXIgc3RhcnRdW3RleHQgY29udGVudF1baW5saW5lIGNvbnRhaW5lciBlbmRd Ci0gICAgLy8gQW4gaW5jb21pbmcgPGltZz4gYm94IHdvdWxkIGVuYWJsZSB1cyB0byBjb21taXQg dGhlICI8c3Bhbj5jb250aW51b3VzPC9zcGFuPiIgY29udGVudAotICAgIC8vIHdoaWxlIGFkZGl0 aW9uYWwgdGV4dCBjb250ZW50IHdvdWxkIG5vdC4KKyAgICAvLyBGaWd1cmUgb3V0IGlmIHRoZSBu ZXcgaW5jb21pbmcgY29udGVudCBwdXRzIHRoZSB1bmNvbW1pdHRlZCBjb250ZW50IG9uIGEgc29m dCB3cmFwIG9wcG9ydHVuaXR5LgorICAgIC8vIGUuZy4gW2NvbnRhaW5lciBzdGFydF1bcHJpb3Jf Y29udGludW91c19jb250ZW50XVtjb250YWluZXIgZW5kXSAoPHNwYW4+cHJpb3JfY29udGludW91 c19jb250ZW50PC9zcGFuPikKKyAgICAvLyBBbiBpbmNvbWluZyA8aW1nPiBib3ggd291bGQgZW5h YmxlIHVzIHRvIGNvbW1pdCB0aGUgIjxzcGFuPnByaW9yX2NvbnRpbnVvdXNfY29udGVudDwvc3Bh bj4iIGNvbnRlbnQKKyAgICAvLyBidXQgYW4gaW5jb21pbmcgdGV4dCBjb250ZW50IHdvdWxkIG5v dCBuZWNlc3NhcmlseS4KICAgICBBU1NFUlQoIWlubGluZUl0ZW0uaXNGbG9hdCgpICYmICFpbmxp bmVJdGVtLmlzTGluZUJyZWFrKCkpOwotICAgIGlmIChjb250ZW50LmlzRW1wdHkoKSkgeworICAg IGlmIChwcmlvckNvbnRlbnQuaXNFbXB0eSgpKSB7CiAgICAgICAgIC8vIENhbid0IGRlY2lkZSBp dCB5ZXQuCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9Ci0gICAgYXV0byogbGFzdFVuY29t aXR0ZWRDb250ZW50ID0gJmNvbnRlbnQucnVucygpLmxhc3QoKS5pbmxpbmVJdGVtOworICAgIGF1 dG8qIGxhc3RVbmNvbWl0dGVkQ29udGVudCA9ICZwcmlvckNvbnRlbnQucnVucygpLmxhc3QoKS5p bmxpbmVJdGVtOwogICAgIGlmIChpbmxpbmVJdGVtLmlzVGV4dCgpKSB7Ci0gICAgICAgIC8vIGFu eSBjb250ZW50JyAnIC0+IHdoaXRlc3BhY2UgaXMgYWx3YXlzIGEgY29tbWl0IGJvdW5kYXJ5Lgot ICAgICAgICBpZiAoZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KGlubGluZUl0ZW0pLmlzV2hpdGVz cGFjZSgpKQorICAgICAgICBpZiAoZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KGlubGluZUl0ZW0p LmlzV2hpdGVzcGFjZSgpKSB7CisgICAgICAgICAgICAvLyBbcHJpb3IgY29udGVudF1bIF0gKDxz cGFuPnNvbWVfY29udGVudDwvc3Bhbj4gKQorICAgICAgICAgICAgLy8gRklYTUU6IGNoZWNrIGlm IHdlIGNhbiBhY3R1YWxseSBicmVhayBiZWZvcmUgdGhlIFt3aGl0ZXNwYWNlXSBjb250ZW50Lgog ICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIC8vIDxzcGFuPnRleHQgLT4gdGhlIGlu bGluZSBjb250YWluZXIgc3RhcnQgYW5kIHRoZSB0ZXh0IGNvbnRlbnQgZm9ybSBhbiB1bmJyZWFr YWJsZSBjb250aW51b3VzIGNvbnRlbnQuCi0gICAgICAgIGlmIChsYXN0VW5jb21pdHRlZENvbnRl bnQtPmlzQ29udGFpbmVyU3RhcnQoKSkKKyAgICAgICAgfQorICAgICAgICBpZiAobGFzdFVuY29t aXR0ZWRDb250ZW50LT5pc0NvbnRhaW5lclN0YXJ0KCkpIHsKKyAgICAgICAgICAgIC8vIFtjb250 YWluZXIgc3RhcnRdW3RleHRdICg8c3Bhbj50ZXh0KSA6IHRoZSBbY29udGFpbmVyIHN0YXJ0XSBh bmQgdGhlIFt0ZXh0XSBjb250ZW50IGZvcm0gYSBjb250aW51b3VzIGNvbnRlbnQuCiAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIC8vIDwvc3Bhbj50ZXh0IC0+IG5lZWQgdG8gY2hl Y2sgd2hhdCdzIGJlZm9yZSB0aGUgPC9zcGFuPi4KLSAgICAgICAgLy8gdGV4dDwvc3Bhbj50ZXh0 IC0+IGNvbnRpbnVvdXMgY29udGVudAotICAgICAgICAvLyA8aW1nPjwvc3Bhbj50ZXh0IC0+IGNv bW1pdCBib3VuZGF5CisgICAgICAgIH0KICAgICAgICAgaWYgKGxhc3RVbmNvbWl0dGVkQ29udGVu dC0+aXNDb250YWluZXJFbmQoKSkgewotICAgICAgICAgICAgYXV0byYgcnVucyA9IGNvbnRlbnQu cnVucygpOwotICAgICAgICAgICAgLy8gdGV4dDwvc3Bhbj48c3Bhbj48L3NwYW4+PC9zcGFuPnRl eHQgLT4gY2hlY2sgYWxsIHRoZSB3YXkgYmFjayB1bnRpbCB3ZSBoaXQgZWl0aGVyIGEgYm94IG9y IHNvbWUgdGV4dAotICAgICAgICAgICAgZm9yIChhdXRvIGkgPSBjb250ZW50LnNpemUoKTsgaS0t OykgeworICAgICAgICAgICAgLy8gW2NvbnRhaW5lciBlbmRdW3RleHRdICg8L3NwYW4+dGV4dCkK KyAgICAgICAgICAgIC8vIE5lZWQgdG8gY2hlY2sgd2hhdCdzIGJlZm9yZSB0aGUgPC9zcGFuPiB0 byBiZSBhYmxlIHRvIGRlY2lkZSB3aGV0aGVyIGl0J3MgYSBjb250aW51b3VzIGNvbnRlbnQuCisg ICAgICAgICAgICAvLyBlLmcuCisgICAgICAgICAgICAvLyBbdGV4dF1bY29udGFpbmVyIGVuZF1b dGV4dF0gKHRleHQ8L3NwYW4+dGV4dCkgOiB0aGVyZSdzIG5vIHNvZnQgd3JhcCBvcHBvcnR1bml0 eSBoZXJlLgorICAgICAgICAgICAgLy8gW2lubGluZSBib3hdW2NvbnRhaW5lciBlbmRdW3RleHRd ICg8aW1nPjwvc3Bhbj50ZXh0KSA6IGFmdGVyIFtjb250YWluZXIgZW5kXSBwb3NpdGlvbiBpcyBh IHNvZnQgd3JhcCBvcHBvcnR1bml0eS4KKyAgICAgICAgICAgIGF1dG8mIHJ1bnMgPSBwcmlvckNv bnRlbnQucnVucygpOworICAgICAgICAgICAgYXV0byBkaWRGaW5kQ29udGVudCA9IGZhbHNlOwor ICAgICAgICAgICAgZm9yIChhdXRvIGkgPSBwcmlvckNvbnRlbnQuc2l6ZSgpOyBpLS07KSB7CiAg ICAgICAgICAgICAgICAgYXV0byYgcHJldmlvdXNJbmxpbmVJdGVtID0gcnVuc1tpXS5pbmxpbmVJ dGVtOwogICAgICAgICAgICAgICAgIGlmIChwcmV2aW91c0lubGluZUl0ZW0uaXNDb250YWluZXJT dGFydCgpIHx8IHByZXZpb3VzSW5saW5lSXRlbS5pc0NvbnRhaW5lckVuZCgpKQogICAgICAgICAg ICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAgICBBU1NFUlQocHJldmlvdXNJbmxp bmVJdGVtLmlzVGV4dCgpIHx8IHByZXZpb3VzSW5saW5lSXRlbS5pc0JveCgpKTsKLSAgICAgICAg ICAgICAgICBsYXN0VW5jb21pdHRlZENvbnRlbnQgPSAmcHJldmlvdXNJbmxpbmVJdGVtOwotICAg ICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgIGlmIChwcmV2aW91c0lubGluZUl0 ZW0uaXNUZXh0KCkgfHwgcHJldmlvdXNJbmxpbmVJdGVtLmlzQm94KCkpIHsKKyAgICAgICAgICAg ICAgICAgICAgbGFzdFVuY29taXR0ZWRDb250ZW50ID0gJnByZXZpb3VzSW5saW5lSXRlbTsKKyAg ICAgICAgICAgICAgICAgICAgZGlkRmluZENvbnRlbnQgPSB0cnVlOworICAgICAgICAgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAvLyBEaWQgbm90IGZpbmQg YW55IGNvbnRlbnQgKGUuZy4gPHNwYW4+PC9zcGFuPnRleHQpCi0gICAgICAgICAgICBpZiAobGFz dFVuY29taXR0ZWRDb250ZW50LT5pc0NvbnRhaW5lckVuZCgpKQorICAgICAgICAgICAgLy8gRGlk IG5vdCBmaW5kIGFueSBjb250ZW50IGF0IGFsbCAoZS5nLiBbY29udGFpbmVyIHN0YXJ0XVtjb250 YWluZXIgZW5kXVt0ZXh0XSAoPHNwYW4+PC9zcGFuPnRleHQpKS4KKyAgICAgICAgICAgIGlmICgh ZGlkRmluZENvbnRlbnQpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9 Ci0gICAgICAgIC8vIHRleHR0ZXh0IC0+IGNvbnRpbnVvdXMgY29udGVudC4KLSAgICAgICAgLy8g dGV4dC10ZXh0IC0+IGNvbW1pdCBib3VuZGFyeS4KLSAgICAgICAgLy8gJyAndGV4dCAtPiBjb21t aXQgYm91bmRhcnkuCiAgICAgICAgIGlmIChsYXN0VW5jb21pdHRlZENvbnRlbnQtPmlzVGV4dCgp KSB7Ci0gICAgICAgICAgICBhdXRvJiBwcmV2aW91c0lubGluZVRleHRJdGVtID0gZG93bmNhc3Q8 SW5saW5lVGV4dEl0ZW0+KCpsYXN0VW5jb21pdHRlZENvbnRlbnQpOwotICAgICAgICAgICAgaWYg KHByZXZpb3VzSW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkpCisgICAgICAgICAgICAvLyBb dGV4dF1bdGV4dF0gOiBpcyBhIGNvbnRpbnVvdXMgY29udGVudC4KKyAgICAgICAgICAgIC8vIFt0 ZXh0LV1bdGV4dF0gOiBhZnRlciBbaHlwaGVuXSBwb3NpdGlvbiBpcyBhIHNvZnQgd3JhcCBvcHBv cnR1bml0eS4KKyAgICAgICAgICAgIC8vIFsgXVt0ZXh0XSA6IGFmdGVyIFt3aGl0ZXNwYWNlXSBw b3NpdGlvbiBpcyBhIHNvZnQgd3JhcCBvcHBvcnR1bml0eS4KKyAgICAgICAgICAgIGF1dG8mIGxh c3RJbmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJdGVtPigqbGFzdFVuY29taXR0 ZWRDb250ZW50KTsKKyAgICAgICAgICAgIGlmIChsYXN0SW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNw YWNlKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgICAgICByZXR1cm4g ZW5kc1dpdGhCcmVha2luZ09wcG9ydHVuaXR5KHByZXZpb3VzSW5saW5lVGV4dEl0ZW0sIGRvd25j YXN0PElubGluZVRleHRJdGVtPihpbmxpbmVJdGVtKSk7CisgICAgICAgICAgICByZXR1cm4gZW5k c1dpdGhTb2Z0V3JhcE9wcG9ydHVuaXR5KGxhc3RJbmxpbmVUZXh0SXRlbSwgZG93bmNhc3Q8SW5s aW5lVGV4dEl0ZW0+KGlubGluZUl0ZW0pKTsKICAgICAgICAgfQotICAgICAgICAvLyA8aW1nPnRl eHQgLT4gdGhlIGlubGluZSBib3ggaXMgb24gYSBjb21taXQgYm91bmRhcnkuCi0gICAgICAgIGlm IChsYXN0VW5jb21pdHRlZENvbnRlbnQtPmlzQm94KCkpCisgICAgICAgIGlmIChsYXN0VW5jb21p dHRlZENvbnRlbnQtPmlzQm94KCkpIHsKKyAgICAgICAgICAgIC8vIFtpbmxpbmUgYm94XVt0ZXh0 XSAoPGltZz50ZXh0KSA6IGFmdGVyIFtpbmxpbmUgYm94XSBwb3NpdGlvbiBpcyBhIHNvZnQgd3Jh cCBvcHBvcnR1bml0eS4KICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CiAgICAg ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KLQogICAgIGlmIChpbmxpbmVJdGVtLmlz Qm94KCkpIHsKLSAgICAgICAgLy8gPHNwYW4+PGltZz4gLT4gdGhlIGlubGluZSBjb250YWluZXIg c3RhcnQgYW5kIHRoZSBjb250ZW50IGZvcm0gYW4gdW5icmVha2FibGUgY29udGludW91cyBjb250 ZW50LgotICAgICAgICBpZiAobGFzdFVuY29taXR0ZWRDb250ZW50LT5pc0NvbnRhaW5lclN0YXJ0 KCkpCisgICAgICAgIGlmIChsYXN0VW5jb21pdHRlZENvbnRlbnQtPmlzQ29udGFpbmVyU3RhcnQo KSkgeworICAgICAgICAgICAgLy8gW2NvbnRhaW5lciBzdGFydF1baW5saW5lIGJveF0gKDxzcGFt PjxpbWc+KSA6IHRoZSBbY29udGFpbmVyIHN0YXJ0XSBhbmQgdGhlIFtpbmxpbmUgYm94XSBmb3Jt IGEgY29udGludW91cyBjb250ZW50LgogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAg ICAvLyA8L3NwYW4+PGltZz4gLT4gb2sgdG8gY29tbWl0IHRoZSA8L3NwYW4+LgotICAgICAgICBp ZiAobGFzdFVuY29taXR0ZWRDb250ZW50LT5pc0NvbnRhaW5lckVuZCgpKQorICAgICAgICB9Cisg ICAgICAgIGlmIChsYXN0VW5jb21pdHRlZENvbnRlbnQtPmlzQ29udGFpbmVyRW5kKCkpIHsKKyAg ICAgICAgICAgIC8vIFtjb250YWluZXIgZW5kXVtpbmxpbmUgYm94XSAoPC9zcGFuPjxpbWc+KSA6 IGFmdGVyIFtjb250YWluZXIgZW5kXSBwb3NpdGlvbiBpcyBhIHNvZnQgd3JhcCBvcHBvcnR1bml0 eS4KICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICAvLyA8aW1nPnRleHQgYW5kIDxp bWc+PGltZz4gLT4gdGhlc2UgY29tYmluYXRpb25zIGFyZSBvayB0byBjb21taXQuCi0gICAgICAg IGlmIChsYXN0VW5jb21pdHRlZENvbnRlbnQtPmlzVGV4dCgpIHx8IGxhc3RVbmNvbWl0dGVkQ29u dGVudC0+aXNCb3goKSkKKyAgICAgICAgfQorICAgICAgICBpZiAobGFzdFVuY29taXR0ZWRDb250 ZW50LT5pc1RleHQoKSB8fCBsYXN0VW5jb21pdHRlZENvbnRlbnQtPmlzQm94KCkpIHsKKyAgICAg ICAgICAgIC8vIFtpbmxpbmUgYm94XVt0ZXh0XSAoPGltZz50ZXh0KSBhbmQgW2lubGluZSBib3hd W2lubGluZSBib3hdICg8aW1nPjxpbWc+KSA6IGFmdGVyIGZpcnN0IFtpbmxpbmUgYm94XSBwb3Np dGlvbiBpcyBhIHNvZnQgd3JhcCBvcHBvcnR1bml0eS4KICAgICAgICAgICAgIHJldHVybiB0cnVl OworICAgICAgICB9CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KIAogICAg IGlmIChpbmxpbmVJdGVtLmlzQ29udGFpbmVyU3RhcnQoKSB8fCBpbmxpbmVJdGVtLmlzQ29udGFp bmVyRW5kKCkpIHsKLSAgICAgICAgLy8gPHNwYW4+PHNwYW4+IG9yIDwvc3Bhbj48c3Bhbj4gLT4g Y2FuJ3QgY29tbWl0IHRoZSBwcmV2aW91cyBjb250ZW50IHlldC4KLSAgICAgICAgaWYgKGxhc3RV bmNvbWl0dGVkQ29udGVudC0+aXNDb250YWluZXJTdGFydCgpIHx8IGxhc3RVbmNvbWl0dGVkQ29u dGVudC0+aXNDb250YWluZXJFbmQoKSkKKyAgICAgICAgaWYgKGxhc3RVbmNvbWl0dGVkQ29udGVu dC0+aXNDb250YWluZXJTdGFydCgpIHx8IGxhc3RVbmNvbWl0dGVkQ29udGVudC0+aXNDb250YWlu ZXJFbmQoKSkgeworICAgICAgICAgICAgLy8gW2NvbnRhaW5lciBzdGFydF1bY29udGFpbmVyIGVu ZF0gKDxzcGFuPjxzcGFuPikgb3IKKyAgICAgICAgICAgIC8vIFtjb250YWluZXIgZW5kXVtjb250 YWluZXIgc3RhcnRdICg8L3NwYW4+PHNwYW4+KSA6IG5lZWQgbW9yZSBjb250ZW50IHRvIGRlY2lk ZS4KICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgLy8gJyAnPHNwYW4+IC0+IGxl dCdzIGNvbW1pdCB0aGUgd2hpdGVzcGFjZQotICAgICAgICAvLyB0ZXh0PHNwYW4+IC0+IGJ1dCBu b3QgeWV0IHRoZSBub24td2hpdGVzcGFjZTsgd2UgbmVlZCB0byBrbm93IHdoYXQgY29tZXMgbmV4 dCAoZS5nLiB0ZXh0PHNwYW4+dGV4dCBvciB0ZXh0PHNwYW4+PGltZz4pLgotICAgICAgICBpZiAo bGFzdFVuY29taXR0ZWRDb250ZW50LT5pc1RleHQoKSkKKyAgICAgICAgfQorICAgICAgICBpZiAo bGFzdFVuY29taXR0ZWRDb250ZW50LT5pc1RleHQoKSkgeworICAgICAgICAgICAgLy8gWyBdW2Nv bnRhaW5lciBzdGFydF0gKCA8c3Bhbj4pIDogYWZ0ZXIgW3doaXRlc3BhY2VdIHBvc2l0aW9uIGlz IGEgc29mdCB3cmFwIG9wcG9ydHVuaXR5LgorICAgICAgICAgICAgLy8gW3RleHRdW2NvbnRhaW5l ciBzdGFydF0gKHRleHQ8c3Bhbj4pIDogTmVlZCBtb3JlIGNvbnRlbnQgdG8gZGVjaWRlIChlLmcu IHRleHQ8c3Bhbj50ZXh0IHZzLiB0ZXh0PHNwYW4+PGltZz4pLgogICAgICAgICAgICAgcmV0dXJu IGRvd25jYXN0PElubGluZVRleHRJdGVtPigqbGFzdFVuY29taXR0ZWRDb250ZW50KS5pc1doaXRl c3BhY2UoKTsKLSAgICAgICAgLy8gPGltZz48c3Bhbj4gLT4gaXQncyBvayB0byBjb21taXQgdGhl IGlubGluZSBib3ggY29udGVudC4KLSAgICAgICAgLy8gPGltZz48L3NwYW4+IC0+IHRoZSBpbmxp bmUgYm94IGFuZCB0aGUgY2xvc2luZyBpbmxpbmUgY29udGFpbmVyIGZvcm0gYW4gdW5icmVha2Fi bGUgY29udGludW91cyBjb250ZW50LgotICAgICAgICBpZiAobGFzdFVuY29taXR0ZWRDb250ZW50 LT5pc0JveCgpKQorICAgICAgICB9CisgICAgICAgIGlmIChsYXN0VW5jb21pdHRlZENvbnRlbnQt PmlzQm94KCkpIHsKKyAgICAgICAgICAgIC8vIFtpbmxpbmUgYm94XVtjb250YWluZXIgc3RhcnRd ICg8aW1nPjxzcGFuPikgOiBhZnRlciBbaW5saW5lIGJveF0gcG9zaXRpb24gaXMgYSBzb2Z0IHdy YXAgb3Bwb3J0dW5pdHkuCisgICAgICAgICAgICAvLyBbaW5saW5lIGJveF1bY29udGFpbmVyIGVu ZF0gKDxpbWc+PC9zcGFuPikgOiB0aGUgW2lubGluZSBib3hdIGFuZCB0aGUgW2NvbnRhaW5lciBl bmRdIGZvcm0gYSBjb250aW51b3VzIGNvbnRlbnQuCiAgICAgICAgICAgICByZXR1cm4gaW5saW5l SXRlbS5pc0NvbnRhaW5lclN0YXJ0KCk7CisgICAgICAgIH0KICAgICAgICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7CiAgICAgfQotCiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgcmV0dXJu IHRydWU7CiB9CkBAIC0zNDAsNyArMzUzLDcgQEAgYm9vbCBMaW5lQnJlYWtlcjo6Q29udGVudDo6 aXNBdENvbnRlbnRCb3VuZGFyeShjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBjb24KIHZv aWQgTGluZUJyZWFrZXI6OkNvbnRlbnQ6OmFwcGVuZChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJ dGVtLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCkKIHsKICAgICBBU1NFUlQoIWlubGlu ZUl0ZW0uaXNGbG9hdCgpKTsKLSAgICBBU1NFUlQoaW5saW5lSXRlbS5pc0xpbmVCcmVhaygpIHx8 ICFpc0F0Q29udGVudEJvdW5kYXJ5KGlubGluZUl0ZW0sICp0aGlzKSk7CisgICAgQVNTRVJUKGlu bGluZUl0ZW0uaXNMaW5lQnJlYWsoKSB8fCAhaXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkoaW5saW5l SXRlbSwgKnRoaXMpKTsKICAgICBtX2NvbnRpbm91c1J1bnMuYXBwZW5kKHsgaW5saW5lSXRlbSwg bG9naWNhbFdpZHRoIH0pOwogICAgIG1fd2lkdGggKz0gbG9naWNhbFdpZHRoOwogICAgIC8vIEZp Z3VyZSBvdXQgdGhlIHRyYWlsaW5nIHRyaW1tYWJsZSBzdGF0ZS4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5o CmluZGV4IDFkYzg5YWQyMjZhNWRiMzgzMTZmMWNhN2JiZDNlOGM4Yjc3NDg5YjEuLjQxYzA4YWU3 MjdiOGIxNDA1ZmIzMWU3MDkxZWMyNmZkMjU4ZmE4NWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuaApA QCAtNjcsNyArNjcsNyBAQCBwdWJsaWM6CiAgICAgICAgIHZvaWQgcmVzZXQoKTsKICAgICAgICAg dm9pZCB0cmltKHVuc2lnbmVkIG5ld1NpemUpOwogCi0gICAgICAgIHN0YXRpYyBib29sIGlzQXRD b250ZW50Qm91bmRhcnkoY29uc3QgSW5saW5lSXRlbSYsIGNvbnN0IENvbnRlbnQmKTsKKyAgICAg ICAgc3RhdGljIGJvb2wgaXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkoY29uc3QgSW5saW5lSXRlbSYs IGNvbnN0IENvbnRlbnQmIHByaW9yQ29udGVudCk7CiAKICAgICAgICAgc3RydWN0IFJ1biB7CiAg ICAgICAgICAgICBjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRleHQuY3Bw IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRl eHQuY3BwCmluZGV4IGZjNDZlZjY0NjUyNGIxM2E2MWUwOGUxNDQzMzhmYzBiNjM5NmM2ZmUuLmVl NjZjODE1ZWRlMTUxMTcyNjc2MDVkNGJkOGZmMTA1YTgzNTc0ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29u dGV4dC5jcHAKQEAgLTE4Niw3ICsxODYsNyBAQCBMaW5lTGF5b3V0Q29udGV4dDo6SXNFbmRPZkxp bmUgTGluZUxheW91dENvbnRleHQ6OnBsYWNlSW5saW5lSXRlbShMaW5lQnVpbGRlciYgbAogICAg IH0KICAgICBhdXRvIGlzRW5kT2ZMaW5lID0gSXNFbmRPZkxpbmU6Ok5vOwogICAgIC8vIENhbiB3 ZSBjb21taXQgdGhlIHBlbmRpbmcgY29udGVudCBhbHJlYWR5PwotICAgIGlmIChMaW5lQnJlYWtl cjo6Q29udGVudDo6aXNBdENvbnRlbnRCb3VuZGFyeShpbmxpbmVJdGVtLCBtX3VuY29tbWl0dGVk Q29udGVudCkpCisgICAgaWYgKExpbmVCcmVha2VyOjpDb250ZW50Ojppc0F0U29mdFdyYXBPcHBv cnR1bml0eShpbmxpbmVJdGVtLCBtX3VuY29tbWl0dGVkQ29udGVudCkpCiAgICAgICAgIGlzRW5k T2ZMaW5lID0gcHJvY2Vzc1VuY29tbWl0dGVkQ29udGVudChsaW5lKTsKICAgICAvLyBUaGUgY3Vy cmVudCBpdGVtIG1pZ2h0IGZpdCBhcyB3ZWxsLgogICAgIGlmIChpc0VuZE9mTGluZSA9PSBJc0Vu ZE9mTGluZTo6Tm8pCg==