232743 2021-11-04 20:08:04 -0700 [LFC][IFC] Add support for opaque inline items in bidi ranges. 2021-11-06 06:24:10 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED INVALID P2 Normal --- 1 zalan zalan bfulgham simon.fraser zalan oldest_to_newest 1812048 0 zalan 2021-11-04 20:08:04 -0700 opaque inline items do not get injected to the paragraph content. 1812051 1 443370 zalan 2021-11-04 20:19:32 -0700 Created attachment 443370 Patch 1812383 2 zalan 2021-11-06 06:24:10 -0700 address it with bug 232772 443370 2021-11-04 20:19:32 -0700 2021-11-04 20:37:32 -0700 Patch bug-232743-20211104201931.patch text/plain 10041 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MzI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDQ1YjIxNjg5YTI5ZWMy YjFhOTNmYjVhMDBhMGZiMDMwM2ZlNGM5NC4uOGYyOGZhMjJjMTU0YmZlNDNhNmI3NTEyMDc1NDkx ZjVkNDA4Y2EyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTExLTA0ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCBzdXBw b3J0IGZvciBvcGFxdWUgaW5saW5lIGl0ZW1zIGluIGJpZGkgcmFuZ2VzLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyNzQzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhZGQgc3VwcG9y dCBmb3Igc2V0dGluZyB0aGUgYmlkaSBsZXZlbCBvbiBpbmxpbmUgYm94ZXMgdGhhdCBkb24ndCBp bml0aWF0ZSBjb250cm9sIGNoYXJhY3RlcnMgKGUuZyA8c3Bhbj4gd2l0aCBpbml0aWFsIHVuaWNv ZGUtYmlkaSkuCisgICAgICAgIFRoZXNlIGlubGluZSBpdGVtcyBkbyBub3Qgc2hvdyB1cCBpbiB0 aGUgb2Zmc2V0IG1hcHMgYXMgdGhleSBhcmUgbm90IHBhcnQgb2YgdGhlIHBhcmFncmFwaCBjb250 ZW50LgorICAgICAgICBXZSB1c2UgdGhlIG5leHQgaW5saW5lIGl0ZW0gdG8gc2V0IHRoZWlyIGJp ZGkgbGV2ZWxzIGFzIHRoZSBmaW5hbCBzdGVwIG9mIGJyZWFrLWFuZC1jb21wdXRlLWJpZGktbGV2 ZWxzLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l SXRlbXNCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lSXRlbXNC dWlsZGVyOjpicmVha0FuZENvbXB1dGVCaWRpTGV2ZWxzKToKKyAgICAgICAgICAxLiBrZWVwIGxv b3BpbmcgdGhyb3VnaCB0aGUgdGV4dC9ib3gvaW5saW5lIGJveGVzICh3aXRoIGNvbnRyb2wgY2hh cmFjdGVyKSBpdGVtcyB1bnRpbCB3ZSBoaXQgdGhlIGJpZGkgZW5kIHVzaW5nIHRoZSBvZmZzZXQg bWFwCisgICAgICAgICAgMi4gc3BsaXQgdGhlIHRleHQgaW5saW5lIGl0ZW0gYXMgcmVxdWlyZWQg KHdoZW4gdGhleSBhcmUgb24gYmlkaSBib3VuZGFyeSkKKyAgICAgICAgICAzLiBjb2xsZWN0IHRo ZSBvcGFxdWUgaW5saW5lIGJveCBpdGVtcworICAgICAgICAgIDQuIGFzc2lnbiB0aGUgZmluYWwg YmlkaSB2YWx1ZXMgdG8gdGhvc2Ugb3BhcXVlIGlubGluZSBib3ggaXRlbXMuCisKIDIwMjEtMTEt MDQgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10g TWFrZSBlYWNoIGNvbnRyb2wgY2hhcmFjdGVyIGVhc3kgdG8gbWFwIGJhY2sgdG8gdGhlIGFzc29j aWF0ZWQgSW5saW5lSXRlbQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5j cHAKaW5kZXggMDU4NDRhMzIyMTZlYzlkNjI5YzhjNjdiNmY0ZDNhMTMwZWIxN2RlMC4uM2Q1Mzgz M2U5NWI0YWM1NDZkNDE2N2FmNDdiMGE2MmQxYzFhZWNiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCkBAIC0xNTMsNjAgKzE1MywxMTMgQEAgdm9pZCBJbmxp bmVJdGVtc0J1aWxkZXI6OmJyZWFrQW5kQ29tcHV0ZUJpZGlMZXZlbHMoSW5saW5lSXRlbXMmIGlu bGluZUl0ZW1zKQogICAgICAgICB1YmlkaV9jbG9zZSh1YmlkaSk7CiAgICAgfSk7CiAKLSAgICBV QmlEaUxldmVsIGJpZGlMZXZlbCA9IFVCSURJX0RFRkFVTFRfTFRSOworICAgIGF1dG8gcm9vdEJp ZGlMZXZlbCA9IFVCSURJX0RFRkFVTFRfTFRSOwogICAgIGJvb2wgdXNlSGV1cmlzdGljQmFzZURp cmVjdGlvbiA9IHJvb3QoKS5zdHlsZSgpLnVuaWNvZGVCaWRpKCkgPT0gRVVuaWNvZGVCaWRpOjpQ bGFpbnRleHQ7CiAgICAgaWYgKCF1c2VIZXVyaXN0aWNCYXNlRGlyZWN0aW9uKQotICAgICAgICBi aWRpTGV2ZWwgPSByb290KCkuc3R5bGUoKS5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkgPyBVQklE SV9MVFIgOiBVQklESV9SVEw7CisgICAgICAgIHJvb3RCaWRpTGV2ZWwgPSByb290KCkuc3R5bGUo KS5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkgPyBVQklESV9MVFIgOiBVQklESV9SVEw7CiAKICAg ICBVRXJyb3JDb2RlIGVycm9yID0gVV9aRVJPX0VSUk9SOwotICAgIHViaWRpX3NldFBhcmEodWJp ZGksIG1fcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIuY2hhcmFjdGVyczE2KCksIG1fcGFyYWdyYXBo Q29udGVudEJ1aWxkZXIubGVuZ3RoKCksIGJpZGlMZXZlbCwgbnVsbHB0ciwgJmVycm9yKTsKKyAg ICB1YmlkaV9zZXRQYXJhKHViaWRpLCBtX3BhcmFncmFwaENvbnRlbnRCdWlsZGVyLmNoYXJhY3Rl cnMxNigpLCBtX3BhcmFncmFwaENvbnRlbnRCdWlsZGVyLmxlbmd0aCgpLCByb290QmlkaUxldmVs LCBudWxscHRyLCAmZXJyb3IpOwogICAgIGlmIChVX0ZBSUxVUkUoZXJyb3IpKSB7CiAgICAgICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgc2l6 ZV90IGN1cnJlbnRJbmxpbmVJdGVtSW5kZXggPSAwOworICAgIHNpemVfdCBmaXJzdElubGluZUl0 ZW1JblJhbmdlID0gMDsKKyAgICBWZWN0b3I8c2l6ZV90PiBvcGFxdWVJbmxpbmVJdGVtSW5kZXhM aXN0OwogICAgIGZvciAoc2l6ZV90IGN1cnJlbnRQb3NpdGlvbiA9IDA7IGN1cnJlbnRQb3NpdGlv biA8IG1fcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIubGVuZ3RoKCk7KSB7CiAgICAgICAgIFVCaURp TGV2ZWwgbGV2ZWw7CiAgICAgICAgIGludDMyX3QgZW5kUG9zaXRpb24gPSBjdXJyZW50UG9zaXRp b247CiAgICAgICAgIHViaWRpX2dldExvZ2ljYWxSdW4odWJpZGksIGN1cnJlbnRQb3NpdGlvbiwg JmVuZFBvc2l0aW9uLCAmbGV2ZWwpOwogCi0gICAgICAgIGF1dG8gc2V0QmlkaUxldmVsT25SYW5n ZSA9IFsmXSB7CisgICAgICAgIGF1dG8gc2V0QmlkaUxldmVsT25SYW5nZSA9IFsmXShzaXplX3Qg YmlkaUVuZCkgeworICAgICAgICAgICAgQVNTRVJUKGJpZGlFbmQpOwogICAgICAgICAgICAgLy8g V2Ugc2hvdWxkIGFsd2F5cyBoYXZlIGlubGluZSBpdGVtKHMpIGFzc29jaWF0ZWQgd2l0aCBhIGJp ZGkgcmFuZ2UuCi0gICAgICAgICAgICBBU1NFUlQoY3VycmVudElubGluZUl0ZW1JbmRleCA8IGlu bGluZUl0ZW1zLnNpemUoKSk7Ci0KLSAgICAgICAgICAgIHdoaWxlIChjdXJyZW50SW5saW5lSXRl bUluZGV4IDwgaW5saW5lSXRlbXMuc2l6ZSgpKSB7Ci0gICAgICAgICAgICAgICAgYXV0byYgaW5s aW5lSXRlbSA9IGlubGluZUl0ZW1zW2N1cnJlbnRJbmxpbmVJdGVtSW5kZXhdOwotICAgICAgICAg ICAgICAgIGlmICghaW5saW5lSXRlbS5pc1RleHQoKSkgewotICAgICAgICAgICAgICAgICAgICAv LyBGSVhNRTogVGhpcyBmYWlscyB3aXRoIG11bHRpcGxlIGlubGluZSBib3hlcyBhcyB0aGV5IGRv bid0IGFkdmFuY2UgcG9zaXRpb24uCi0gICAgICAgICAgICAgICAgICAgIGlubGluZUl0ZW0uc2V0 QmlkaUxldmVsKGxldmVsKTsKLSAgICAgICAgICAgICAgICAgICAgKytjdXJyZW50SW5saW5lSXRl bUluZGV4OworICAgICAgICAgICAgYXV0byBsYXN0SW5saW5lSXRlbUluUmFuZ2UgPSBmaXJzdElu bGluZUl0ZW1JblJhbmdlOworICAgICAgICAgICAgQVNTRVJUKGZpcnN0SW5saW5lSXRlbUluUmFu Z2UgPCBpbmxpbmVJdGVtcy5zaXplKCkpOworICAgICAgICAgICAgZm9yIChhdXRvIGlubGluZUl0 ZW1JbmRleCA9IGZpcnN0SW5saW5lSXRlbUluUmFuZ2U7IGlubGluZUl0ZW1JbmRleCA8IGlubGlu ZUl0ZW1zLnNpemUoKTsgKytpbmxpbmVJdGVtSW5kZXgpIHsKKyAgICAgICAgICAgICAgICBhdXRv JiBpbmxpbmVJdGVtID0gaW5saW5lSXRlbXNbaW5saW5lSXRlbUluZGV4XTsKKworICAgICAgICAg ICAgICAgIGlubGluZUl0ZW0uc2V0QmlkaUxldmVsKGxldmVsKTsKKyAgICAgICAgICAgICAgICBp ZiAoaW5saW5lSXRlbS5pc1RleHQoKSkgeworICAgICAgICAgICAgICAgICAgICAvLyBDaGVjayBp ZiB0aGUgdGV4dCBjb250ZW50IG5lZWRzIHNwbGl0IG9yIHdoZXRoZXIgaXQgaXMgZnVsbHkgY29u dGFpbmVkIGluIHRoaXMgYmlkaSByYW5nZS4KKyAgICAgICAgICAgICAgICAgICAgYXV0byYgaW5s aW5lVGV4dEl0ZW0gPSBkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oaW5saW5lSXRlbSk7CisgICAg ICAgICAgICAgICAgICAgIGF1dG8gY29udGVudE9mZnNldCA9IG1fY29udGVudE9mZnNldE1hcC5n ZXQoJmlubGluZVRleHRJdGVtLmxheW91dEJveCgpKTsKKyAgICAgICAgICAgICAgICAgICAgUkVM RUFTRV9BU1NFUlQoY29udGVudE9mZnNldCA8IGJpZGlFbmQpOworICAgICAgICAgICAgICAgICAg ICAvLyBGSVhNRTogV2UgbWF5IGJlIGFibGUgdG8gc3BlZWQgdGhpcyB1cCBieSBpbnRyb2R1Y2lu ZyBhbiBpbm5lciBsb29wIHdpdGhpbiB0aGlzIGlubGluZSB0ZXh0IGJveC4KKyAgICAgICAgICAg ICAgICAgICAgYXV0byBpbmxpbmVUZXh0SXRlbUVuZEluQmlkaSA9IGNvbnRlbnRPZmZzZXQgKyBp bmxpbmVUZXh0SXRlbS5lbmQoKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKGlubGluZVRleHRJ dGVtRW5kSW5CaWRpID09IGJpZGlFbmQpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIC8vIFRo aXMgdGV4dCBjb250ZW50IGlzIGZ1bGx5IGluY2x1ZGVkIGluIHRoZSBiaWRpIHJhbmdlLCBidXQg aXQgbG9va3MgdG8gYmUgdGhlIGxhc3Qgb25lLgorICAgICAgICAgICAgICAgICAgICAgICAgbGFz dElubGluZUl0ZW1JblJhbmdlID0gaW5saW5lSXRlbUluZGV4OworICAgICAgICAgICAgICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAg aWYgKGlubGluZVRleHRJdGVtRW5kSW5CaWRpID4gYmlkaUVuZCkgeworICAgICAgICAgICAgICAg ICAgICAgICAgLy8gV2UgYXJlIGF0IHRoZSBlbmQgb2YgdGhlIGJpZGkgcmFuZ2Ugd2l0aCB0aGlz IGlubGluZSB0ZXh0IGl0ZW0uCisgICAgICAgICAgICAgICAgICAgICAgICAvLyBMZXQncyBzcGxp dCB0aGlzIGlubGluZSB0ZXh0IGl0ZW0gYXQgdGhlIGJpZGkgYm91bmRhcnkgYW5kIHJldHVybi4K KyAgICAgICAgICAgICAgICAgICAgICAgIGF1dG8gYmlkaUVuZFJlbGF0aXZlVG9MYXlvdXRCb3gg PSBiaWRpRW5kIC0gY29udGVudE9mZnNldDsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChp bmxpbmVJdGVtSW5kZXggPT0gaW5saW5lSXRlbXMuc2l6ZSgpIC0gMSkKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICBpbmxpbmVJdGVtcy5hcHBlbmQoaW5saW5lVGV4dEl0ZW0uc3BsaXRBdChi aWRpRW5kUmVsYXRpdmVUb0xheW91dEJveCkpOworICAgICAgICAgICAgICAgICAgICAgICAgZWxz ZQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlubGluZUl0ZW1zLmluc2VydChpbmxpbmVJ dGVtSW5kZXggKyAxLCBpbmxpbmVUZXh0SXRlbS5zcGxpdEF0KGJpZGlFbmRSZWxhdGl2ZVRvTGF5 b3V0Qm94KSk7CisgICAgICAgICAgICAgICAgICAgICAgICAvLyBUaGlzIGJpZGkgcmFuZ2UgaG9s ZHMgbm8gbW9yZSBpbmxpbmUgaXRlbXMuCisgICAgICAgICAgICAgICAgICAgICAgICBsYXN0SW5s aW5lSXRlbUluUmFuZ2UgPSBpbmxpbmVJdGVtSW5kZXg7CisgICAgICAgICAgICAgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICAvLyBU aGlzIHRleHQgY29udGVudCBpcyBmdWxseSBpbmNsdWRlZCBpbiB0aGUgYmlkaSByYW5nZS4gU2tp cCB0byB0aGUgbmV4dCBvbmUuCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAg ICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAvLyBGSVhNRTogRmluZCBvdXQgaWYgdGhpcyBp cyB0aGUgbW9zdCBvcHRpbWFsIHBsYWNlIHRvIG1lYXN1cmUgYW5kIGNhY2hlIHRleHQgd2lkdGhz LiAKLSAgICAgICAgICAgICAgICBhdXRvJiBpbmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGlu ZVRleHRJdGVtPihpbmxpbmVJdGVtKTsKLSAgICAgICAgICAgICAgICBpbmxpbmVUZXh0SXRlbS5z ZXRCaWRpTGV2ZWwobGV2ZWwpOwotCi0gICAgICAgICAgICAgICAgYXV0byBpbmxpbmVUZXh0SXRl bUVuZCA9IGlubGluZVRleHRJdGVtLmVuZCgpOwotICAgICAgICAgICAgICAgIGF1dG8gYmlkaUVu ZCA9IGVuZFBvc2l0aW9uIC0gbV9jb250ZW50T2Zmc2V0TWFwLmdldCgmaW5saW5lVGV4dEl0ZW0u bGF5b3V0Qm94KCkpOwotICAgICAgICAgICAgICAgIGlmIChiaWRpRW5kID09IGlubGluZVRleHRJ dGVtRW5kKSB7Ci0gICAgICAgICAgICAgICAgICAgICsrY3VycmVudElubGluZUl0ZW1JbmRleDsK LSAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgaWYgKGlubGluZUl0 ZW0uaXNCb3goKSkgeworICAgICAgICAgICAgICAgICAgICBhdXRvIGNvbnRlbnRPZmZzZXQgPSBt X2NvbnRlbnRPZmZzZXRNYXAuZ2V0KCZpbmxpbmVJdGVtLmxheW91dEJveCgpKTsKKyAgICAgICAg ICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQoY29udGVudE9mZnNldCA8IGJpZGlFbmQpOworICAg ICAgICAgICAgICAgICAgICBpZiAoY29udGVudE9mZnNldCA9PSBiaWRpRW5kIC0gMSkgeworICAg ICAgICAgICAgICAgICAgICAgICAgbGFzdElubGluZUl0ZW1JblJhbmdlID0gaW5saW5lSXRlbUlu ZGV4OworICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICAgICAgfQotICAg ICAgICAgICAgICAgIGlmIChiaWRpRW5kIDwgaW5saW5lVGV4dEl0ZW1FbmQpIHsKLSAgICAgICAg ICAgICAgICAgICAgaWYgKGN1cnJlbnRJbmxpbmVJdGVtSW5kZXggPT0gaW5saW5lSXRlbXMuc2l6 ZSgpIC0gMSkKLSAgICAgICAgICAgICAgICAgICAgICAgIGlubGluZUl0ZW1zLmFwcGVuZChpbmxp bmVUZXh0SXRlbS5zcGxpdEF0KGJpZGlFbmQpKTsKLSAgICAgICAgICAgICAgICAgICAgZWxzZQot ICAgICAgICAgICAgICAgICAgICAgICAgaW5saW5lSXRlbXMuaW5zZXJ0KGN1cnJlbnRJbmxpbmVJ dGVtSW5kZXggKyAxLCBpbmxpbmVUZXh0SXRlbS5zcGxpdEF0KGJpZGlFbmQpKTsKLSAgICAgICAg ICAgICAgICAgICAgKytjdXJyZW50SW5saW5lSXRlbUluZGV4OwotICAgICAgICAgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgICAgICAgICBpZiAoaW5saW5lSXRlbS5pc0lubGluZUJveFN0YXJ0 KCkgfHwgaW5saW5lSXRlbS5pc0lubGluZUJveEVuZCgpKSB7CisgICAgICAgICAgICAgICAgICAg IGF1dG8gaXQgPSBtX2NvbnRyb2xDaGFyYWN0ZXJPZmZzZXRNYXAuZmluZCgmaW5saW5lSXRlbSk7 CisgICAgICAgICAgICAgICAgICAgIC8vIEEgc2ltcGxlIDxzcGFuPiAod2l0aCBpbml0aWFsIHVu aWNvZGUtYmlkaSB2YWx1ZSkgaXMgYW4gb3BhcXVlIGlubGluZSBpdGVtIGFzIGl0IGRvZXMgbm90 IHBhcnRpY2lwYXRlIGluIGJpZGkgcmVvcmRlcmluZyAoYW5kIHdlIGRvbid0IGFkZCBpdCB0byB0 aGUgcGFyYWdyYXBoKS4KKyAgICAgICAgICAgICAgICAgICAgYXV0byBpc09wYXF1ZUl0ZW0gPSBp dCA9PSBtX2NvbnRyb2xDaGFyYWN0ZXJPZmZzZXRNYXAuZW5kKCk7CisgICAgICAgICAgICAgICAg ICAgIGlmIChpc09wYXF1ZUl0ZW0pIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIC8vIFRoaXMg aW5saW5lIGJveCBzdGFydC9lbmQgaXMgbm90IGluIHRoZSBiaWRpIHBhcmFncmFwaC4gSXQncyBh biBvcGFxdWUgaXRlbSB0aGF0IHdlIG5lZWQgdG8gcG9zdC1wcm9jZXNzLgorICAgICAgICAgICAg ICAgICAgICAgICAgb3BhcXVlSW5saW5lSXRlbUluZGV4TGlzdC5hcHBlbmQoaW5saW5lSXRlbUlu ZGV4KTsKKyAgICAgICAgICAgICAgICAgICAgfSBlbHNlIGlmIChpdC0+dmFsdWUgPT0gYmlkaUVu ZCAtIDEpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGxhc3RJbmxpbmVJdGVtSW5SYW5nZSA9 IGlubGluZUl0ZW1JbmRleDsKKyAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAg ICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAg ICAgICAgIH0KLSAgICAgICAgICAgICAgICArK2N1cnJlbnRJbmxpbmVJdGVtSW5kZXg7CisgICAg ICAgICAgICAgICAgQVNTRVJUX05PVF9JTVBMRU1FTlRFRF9ZRVQoKTsKICAgICAgICAgICAgIH0K KyAgICAgICAgICAgIGZpcnN0SW5saW5lSXRlbUluUmFuZ2UgPSArK2xhc3RJbmxpbmVJdGVtSW5S YW5nZTsKICAgICAgICAgfTsKLSAgICAgICAgc2V0QmlkaUxldmVsT25SYW5nZSgpOworICAgICAg ICBzZXRCaWRpTGV2ZWxPblJhbmdlKGVuZFBvc2l0aW9uKTsKICAgICAgICAgY3VycmVudFBvc2l0 aW9uID0gZW5kUG9zaXRpb247CiAgICAgfQorICAgIC8vIEluY2x1ZGUgdHJhaWxpbmcgb3BhcXVl IGl0ZW1zIHRoYXQgYXJlIG5vdCBhZGRlZCB0byB0aGUgcGFyYWdyYXBoLgorICAgIGZvciAoYXV0 byBpbmRleCA9IGZpcnN0SW5saW5lSXRlbUluUmFuZ2U7IGluZGV4IDwgaW5saW5lSXRlbXMuc2l6 ZSgpOyArK2luZGV4KQorICAgICAgICBvcGFxdWVJbmxpbmVJdGVtSW5kZXhMaXN0LmFwcGVuZChp bmRleCk7CisKKyAgICBhdXRvIHNldEJpZGlMZXZlbEZvck9wYXF1ZUlubGluZUl0ZW1zID0gWyZd IHsKKyAgICAgICAgaWYgKG9wYXF1ZUlubGluZUl0ZW1JbmRleExpc3QuaXNFbXB0eSgpKQorICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICAvLyBVc2UgdGhlIG5leHQgaW5saW5lIGl0ZW0ncyBi aWRpIGZvciBvcGFxdWUgaW5saW5lIGl0ZW1zLgorICAgICAgICBhdXRvIHRhaWxJbmRleCA9IG9w YXF1ZUlubGluZUl0ZW1JbmRleExpc3Quc2l6ZSgpIC0gMTsKKyAgICAgICAgLy8gT3BhcXVlIGl0 ZW1zIGNvbWUgaW4gcGFpcnMuCisgICAgICAgIEFTU0VSVCh0YWlsSW5kZXgpOworICAgICAgICBp ZiAob3BhcXVlSW5saW5lSXRlbUluZGV4TGlzdFt0YWlsSW5kZXhdID09IGlubGluZUl0ZW1zLnNp emUoKSAtIDEpIHsKKyAgICAgICAgICAgIC8vIFRoaXMgaXMgdGhlIGxhc3QgaW5saW5lIGl0ZW0u IEl0IGdldHMgdGhlIGJpZGkgbGV2ZWwgZnJvbSB0aGUgcm9vdC4KKyAgICAgICAgICAgIGlubGlu ZUl0ZW1zLmxhc3QoKS5zZXRCaWRpTGV2ZWwocm9vdEJpZGlMZXZlbCk7CisgICAgICAgICAgICAt LXRhaWxJbmRleDsKKyAgICAgICAgfQorICAgICAgICBmb3IgKGF1dG8gaW5kZXggPSB0YWlsSW5k ZXg7IC0taW5kZXg7KSB7CisgICAgICAgICAgICAvLyBIYXZpbmcgYSB2YWxpZCBuZXh0IGlubGlu ZSBpdGVtIGJpZGkgbGV2ZWwgaXMgZ3VhcmFudGVlZCBhdCB0aGlzIHBvaW50LgorICAgICAgICAg ICAgYXV0byBvcGFxdWVJbmxpbmVJdGVtSW5kZXggPSBvcGFxdWVJbmxpbmVJdGVtSW5kZXhMaXN0 W2luZGV4XTsKKyAgICAgICAgICAgIGlubGluZUl0ZW1zW29wYXF1ZUlubGluZUl0ZW1JbmRleF0u c2V0QmlkaUxldmVsKGlubGluZUl0ZW1zW29wYXF1ZUlubGluZUl0ZW1JbmRleCArIDFdLmJpZGlM ZXZlbCgpKTsKKyAgICAgICAgfQorICAgIH07CisgICAgc2V0QmlkaUxldmVsRm9yT3BhcXVlSW5s aW5lSXRlbXMoKTsKIH0KIAogdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRsZVRleHRDb250 ZW50KGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleHRCb3gsIElubGluZUl0ZW1zJiBpbmxp bmVJdGVtcykK