232742 2021-11-04 19:44:43 -0700 [LFC][IFC] Make each control character easy to map back to the associated InlineItem 2021-11-06 06:24:47 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED INVALID P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser zalan oldest_to_newest 1812046 0 zalan 2021-11-04 19:44:43 -0700 It helps when we try to resolve the bidi ranges and set bidi levels on the individual inline items. 1812047 1 443369 zalan 2021-11-04 19:49:27 -0700 Created attachment 443369 Patch 1812384 2 zalan 2021-11-06 06:24:47 -0700 addressed it with bug 232772 443369 2021-11-04 19:49:27 -0700 2021-11-05 06:36:42 -0700 Patch bug-232742-20211104194926.patch text/plain 11256 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MzI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTAxZjYyN2QwZThkYjZj ZTRjZTk0MjhmMGNhOGZhMzNhZDdjY2NhZi4uZDQ1YjIxNjg5YTI5ZWMyYjFhOTNmYjVhMDBhMGZi MDMwM2ZlNGM5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTExLTA0ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIE1ha2UgZWFj aCBjb250cm9sIGNoYXJhY3RlciBlYXN5IHRvIG1hcCBiYWNrIHRvIHRoZSBhc3NvY2lhdGVkIElu bGluZUl0ZW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIzMjc0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoaXMgcGF0Y2ggaXMgaW4gcHJlcGFyYXRpb24gZm9yIHVzaW5nIHRoaXMgY29udHJvbCBjaGFy YWN0ZXIgbWFwIHdoZW4gbWFwcGluZyBiaWRpCisgICAgICAgIHBvc2l0aW9ucyBiYWNrIHRvIElu bGluZUl0ZW1zLiBUaGlzIGlzIHJlcXVpcmVkIHRvIGJlIGFibGUgdG8gZGlmZmVyZW50aWF0ZSB0 aGUKKyAgICAgICAgaW5saW5lIGJveCBzdGFydCBhbmQgZW5kIHBvc2l0aW9uICh0aGV5IGJvdGgg dHJpZ2dlciBjb250cm9sIGNoYXJhY3RlcnMpLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6SW5saW5lSXRlbXNCdWlsZGVyOjpoYW5kbGVJbmxpbmVCb3hTdGFydCk6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUl0ZW1zQnVpbGRlcjo6aGFuZGxlSW5saW5l Qm94RW5kKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lSXRlbXNCdWlsZGVyOjpo YW5kbGVJbmxpbmVMZXZlbEJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUl0 ZW1zQnVpbGRlcjo6ZW50ZXJCaWRpQ29udGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OklubGluZUl0ZW1zQnVpbGRlcjo6ZXhpdEJpZGlDb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6SW5saW5lSXRlbXNCdWlsZGVyOjpidWlsZFByZXZpb3VzVGV4dENvbnRlbnQpOgor ICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVp bGRlci5oOgorCiAyMDIxLTExLTA0ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBbTEZDXVtJRkNdIFVzZSBvYmplY3RSZXBsYWNlbWVudENoYXJhY3RlciB0byBtYXJr IGF0b21pYyBpbmxpbmUgYm94IHBvc2l0aW9uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0 ZW1zQnVpbGRlci5jcHAKaW5kZXggYTc5MDAwY2VmZGE5Y2JjOTdhNmE5YmEyZWQ3NmVjY2E2MmY4 NTNlMy4uMDU4NDRhMzIyMTZlYzlkNjI5YzhjNjdiNmY0ZDNhMTMwZWIxN2RlMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l SXRlbXNCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCkBAIC0zMzMsMzMgKzMzMywzOSBA QCB2b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6aGFuZGxlVGV4dENvbnRlbnQoY29uc3QgSW5saW5l VGV4dEJveCYgaW5saW5lVGV4dEJveCwgSQogCiB2b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6aGFu ZGxlSW5saW5lQm94U3RhcnQoY29uc3QgQm94JiBpbmxpbmVCb3gsIElubGluZUl0ZW1zJiBpbmxp bmVJdGVtcykKIHsKLSAgICBpbmxpbmVJdGVtcy5hcHBlbmQoeyBpbmxpbmVCb3gsIElubGluZUl0 ZW06OlR5cGU6OklubGluZUJveFN0YXJ0IH0pOwogICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dn Lm9yZy9jc3Mtd3JpdGluZy1tb2Rlcy8jdW5pY29kZS1iaWRpCiAgICAgYXV0byYgc3R5bGUgPSBp bmxpbmVCb3guc3R5bGUoKTsKLSAgICBpZiAoc3R5bGUucnRsT3JkZXJpbmcoKSA9PSBPcmRlcjo6 VmlzdWFsKQotICAgICAgICByZXR1cm47CisgICAgYXV0byBuZWVkc0JpZGkgPSBzdHlsZS5ydGxP cmRlcmluZygpID09IE9yZGVyOjpMb2dpY2FsICYmIHN0eWxlLnVuaWNvZGVCaWRpKCkgIT0gRVVu aWNvZGVCaWRpOjpVQk5vcm1hbDsKKyAgICBpZiAoIW5lZWRzQmlkaSkKKyAgICAgICAgcmV0dXJu IGlubGluZUl0ZW1zLmFwcGVuZCh7IGlubGluZUJveCwgSW5saW5lSXRlbTo6VHlwZTo6SW5saW5l Qm94U3RhcnQgfSk7CisKKyAgICBpZiAoIWhhc1NlZW5CaWRpQ29udGVudCgpKQorICAgICAgICBi dWlsZFByZXZpb3VzVGV4dENvbnRlbnQoaW5saW5lSXRlbXMpOwogCisgICAgaW5saW5lSXRlbXMu YXBwZW5kKHsgaW5saW5lQm94LCBJbmxpbmVJdGVtOjpUeXBlOjpJbmxpbmVCb3hTdGFydCB9KTsK KyAgICBhdXRvJiBpbmxpbmVCb3hTdGFydEl0ZW0gPSBpbmxpbmVJdGVtcy5sYXN0KCk7CiAgICAg YXV0byBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uID0gc3R5bGUuaXNMZWZ0VG9SaWdodERpcmVjdGlv bigpOwogICAgIHN3aXRjaCAoc3R5bGUudW5pY29kZUJpZGkoKSkgewogICAgIGNhc2UgRVVuaWNv ZGVCaWRpOjpVQk5vcm1hbDoKICAgICAgICAgLy8gVGhlIGJveCBkb2VzIG5vdCBvcGVuIGFuIGFk ZGl0aW9uYWwgbGV2ZWwgb2YgZW1iZWRkaW5nIHdpdGggcmVzcGVjdCB0byB0aGUgYmlkaXJlY3Rp b25hbCBhbGdvcml0aG0uCiAgICAgICAgIC8vIEZvciBpbmxpbmUgYm94ZXMsIGltcGxpY2l0IHJl b3JkZXJpbmcgd29ya3MgYWNyb3NzIGJveCBib3VuZGFyaWVzLgorICAgICAgICBBU1NFUlRfTk9U X1JFQUNIRUQoKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBFVW5pY29kZUJpZGk6OkVtYmVk OgotICAgICAgICBlbnRlckJpZGlDb250ZXh0KGlubGluZUJveCwgaXNMZWZ0VG9SaWdodERpcmVj dGlvbiA/IGxlZnRUb1JpZ2h0RW1iZWQgOiByaWdodFRvTGVmdEVtYmVkLCBpbmxpbmVJdGVtcyk7 CisgICAgICAgIGVudGVyQmlkaUNvbnRleHQoaW5saW5lQm94U3RhcnRJdGVtLCBpc0xlZnRUb1Jp Z2h0RGlyZWN0aW9uID8gbGVmdFRvUmlnaHRFbWJlZCA6IHJpZ2h0VG9MZWZ0RW1iZWQpOwogICAg ICAgICBicmVhazsKICAgICBjYXNlIEVVbmljb2RlQmlkaTo6T3ZlcnJpZGU6Ci0gICAgICAgIGVu dGVyQmlkaUNvbnRleHQoaW5saW5lQm94LCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uID8gbGVmdFRv UmlnaHRPdmVycmlkZSA6IHJpZ2h0VG9MZWZ0T3ZlcnJpZGUsIGlubGluZUl0ZW1zKTsKKyAgICAg ICAgZW50ZXJCaWRpQ29udGV4dChpbmxpbmVCb3hTdGFydEl0ZW0sIGlzTGVmdFRvUmlnaHREaXJl Y3Rpb24gPyBsZWZ0VG9SaWdodE92ZXJyaWRlIDogcmlnaHRUb0xlZnRPdmVycmlkZSk7CiAgICAg ICAgIGJyZWFrOwogICAgIGNhc2UgRVVuaWNvZGVCaWRpOjpJc29sYXRlOgotICAgICAgICBlbnRl ckJpZGlDb250ZXh0KGlubGluZUJveCwgaXNMZWZ0VG9SaWdodERpcmVjdGlvbiA/IGxlZnRUb1Jp Z2h0SXNvbGF0ZSA6IHJpZ2h0VG9MZWZ0SXNvbGF0ZSwgaW5saW5lSXRlbXMpOworICAgICAgICBl bnRlckJpZGlDb250ZXh0KGlubGluZUJveFN0YXJ0SXRlbSwgaXNMZWZ0VG9SaWdodERpcmVjdGlv biA/IGxlZnRUb1JpZ2h0SXNvbGF0ZSA6IHJpZ2h0VG9MZWZ0SXNvbGF0ZSk7CiAgICAgICAgIGJy ZWFrOwogICAgIGNhc2UgRVVuaWNvZGVCaWRpOjpQbGFpbnRleHQ6Ci0gICAgICAgIGVudGVyQmlk aUNvbnRleHQoaW5saW5lQm94LCBmaXJzdFN0cm9uZ0lzb2xhdGUsIGlubGluZUl0ZW1zKTsKKyAg ICAgICAgZW50ZXJCaWRpQ29udGV4dChpbmxpbmVCb3hTdGFydEl0ZW0sIGZpcnN0U3Ryb25nSXNv bGF0ZSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgRVVuaWNvZGVCaWRpOjpJc29sYXRlT3Zl cnJpZGU6Ci0gICAgICAgIGVudGVyQmlkaUNvbnRleHQoaW5saW5lQm94LCBmaXJzdFN0cm9uZ0lz b2xhdGUsIGlubGluZUl0ZW1zKTsKLSAgICAgICAgZW50ZXJCaWRpQ29udGV4dChpbmxpbmVCb3gs IGlzTGVmdFRvUmlnaHREaXJlY3Rpb24gPyBsZWZ0VG9SaWdodE92ZXJyaWRlIDogcmlnaHRUb0xl ZnRPdmVycmlkZSwgaW5saW5lSXRlbXMpOworICAgICAgICBlbnRlckJpZGlDb250ZXh0KGlubGlu ZUJveFN0YXJ0SXRlbSwgZmlyc3RTdHJvbmdJc29sYXRlKTsKKyAgICAgICAgZW50ZXJCaWRpQ29u dGV4dChpbmxpbmVCb3hTdGFydEl0ZW0sIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24gPyBsZWZ0VG9S aWdodE92ZXJyaWRlIDogcmlnaHRUb0xlZnRPdmVycmlkZSk7CiAgICAgICAgIGJyZWFrOwogICAg IGRlZmF1bHQ6CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwpAQCAtMzY4LDMyICszNzQs MzcgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRsZUlubGluZUJveFN0YXJ0KGNvbnN0 IEJveCYgaW5saW5lQm94LCBJbmxpbmVJdGVtcyYKIAogdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6 OmhhbmRsZUlubGluZUJveEVuZChjb25zdCBCb3gmIGlubGluZUJveCwgSW5saW5lSXRlbXMmIGlu bGluZUl0ZW1zKQogewotICAgIGlubGluZUl0ZW1zLmFwcGVuZCh7IGlubGluZUJveCwgSW5saW5l SXRlbTo6VHlwZTo6SW5saW5lQm94RW5kIH0pOwogICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dn Lm9yZy9jc3Mtd3JpdGluZy1tb2Rlcy8jdW5pY29kZS1iaWRpCisgICAgaW5saW5lSXRlbXMuYXBw ZW5kKHsgaW5saW5lQm94LCBJbmxpbmVJdGVtOjpUeXBlOjpJbmxpbmVCb3hFbmQgfSk7CisKICAg ICBhdXRvJiBzdHlsZSA9IGlubGluZUJveC5zdHlsZSgpOwotICAgIGlmIChzdHlsZS5ydGxPcmRl cmluZygpID09IE9yZGVyOjpWaXN1YWwpCisgICAgYXV0byBuZWVkc0JpZGkgPSBzdHlsZS5ydGxP cmRlcmluZygpID09IE9yZGVyOjpMb2dpY2FsICYmIHN0eWxlLnVuaWNvZGVCaWRpKCkgIT0gRVVu aWNvZGVCaWRpOjpVQk5vcm1hbDsKKyAgICBpZiAoIW5lZWRzQmlkaSkKICAgICAgICAgcmV0dXJu OwogCisgICAgQVNTRVJUKGhhc1NlZW5CaWRpQ29udGVudCgpKTsKKyAgICBhdXRvJiBpbmxpbmVC b3hFbmRJdGVtID0gaW5saW5lSXRlbXMubGFzdCgpOwogICAgIHN3aXRjaCAoc3R5bGUudW5pY29k ZUJpZGkoKSkgewogICAgIGNhc2UgRVVuaWNvZGVCaWRpOjpVQk5vcm1hbDoKICAgICAgICAgLy8g VGhlIGJveCBkb2VzIG5vdCBvcGVuIGFuIGFkZGl0aW9uYWwgbGV2ZWwgb2YgZW1iZWRkaW5nIHdp dGggcmVzcGVjdCB0byB0aGUgYmlkaXJlY3Rpb25hbCBhbGdvcml0aG0uCiAgICAgICAgIC8vIEZv ciBpbmxpbmUgYm94ZXMsIGltcGxpY2l0IHJlb3JkZXJpbmcgd29ya3MgYWNyb3NzIGJveCBib3Vu ZGFyaWVzLgorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgYnJlYWs7CiAg ICAgY2FzZSBFVW5pY29kZUJpZGk6OkVtYmVkOgotICAgICAgICBleGl0QmlkaUNvbnRleHQoaW5s aW5lQm94LCBwb3BEaXJlY3Rpb25hbEZvcm1hdHRpbmcpOworICAgICAgICBleGl0QmlkaUNvbnRl eHQoaW5saW5lQm94RW5kSXRlbSwgcG9wRGlyZWN0aW9uYWxGb3JtYXR0aW5nKTsKICAgICAgICAg YnJlYWs7CiAgICAgY2FzZSBFVW5pY29kZUJpZGk6Ok92ZXJyaWRlOgotICAgICAgICBleGl0Qmlk aUNvbnRleHQoaW5saW5lQm94LCBwb3BEaXJlY3Rpb25hbEZvcm1hdHRpbmcpOworICAgICAgICBl eGl0QmlkaUNvbnRleHQoaW5saW5lQm94RW5kSXRlbSwgcG9wRGlyZWN0aW9uYWxGb3JtYXR0aW5n KTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBFVW5pY29kZUJpZGk6Oklzb2xhdGU6Ci0gICAg ICAgIGV4aXRCaWRpQ29udGV4dChpbmxpbmVCb3gsIHBvcERpcmVjdGlvbmFsSXNvbGF0ZSk7Cisg ICAgICAgIGV4aXRCaWRpQ29udGV4dChpbmxpbmVCb3hFbmRJdGVtLCBwb3BEaXJlY3Rpb25hbElz b2xhdGUpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIEVVbmljb2RlQmlkaTo6UGxhaW50ZXh0 OgotICAgICAgICBleGl0QmlkaUNvbnRleHQoaW5saW5lQm94LCBwb3BEaXJlY3Rpb25hbElzb2xh dGUpOworICAgICAgICBleGl0QmlkaUNvbnRleHQoaW5saW5lQm94RW5kSXRlbSwgcG9wRGlyZWN0 aW9uYWxJc29sYXRlKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBFVW5pY29kZUJpZGk6Oklz b2xhdGVPdmVycmlkZToKLSAgICAgICAgZXhpdEJpZGlDb250ZXh0KGlubGluZUJveCwgcG9wRGly ZWN0aW9uYWxGb3JtYXR0aW5nKTsKLSAgICAgICAgZXhpdEJpZGlDb250ZXh0KGlubGluZUJveCwg cG9wRGlyZWN0aW9uYWxJc29sYXRlKTsKKyAgICAgICAgZXhpdEJpZGlDb250ZXh0KGlubGluZUJv eEVuZEl0ZW0sIHBvcERpcmVjdGlvbmFsRm9ybWF0dGluZyk7CisgICAgICAgIGV4aXRCaWRpQ29u dGV4dChpbmxpbmVCb3hFbmRJdGVtLCBwb3BEaXJlY3Rpb25hbElzb2xhdGUpOwogICAgICAgICBi cmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKQEAgLTQw NCw4ICs0MTUsMTAgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRsZUlubGluZUxldmVs Qm94KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBJbmxpbmVJdGVtcyYKIHsKICAgICBpZiAobGF5b3V0 Qm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSkgewogICAgICAgICBpbmxpbmVJdGVtcy5hcHBl bmQoeyBsYXlvdXRCb3gsIElubGluZUl0ZW06OlR5cGU6OkJveCB9KTsKLSAgICAgICAgaWYgKGhh c1NlZW5CaWRpQ29udGVudCgpKQorICAgICAgICBpZiAoaGFzU2VlbkJpZGlDb250ZW50KCkpIHsK KyAgICAgICAgICAgIG1fY29udGVudE9mZnNldE1hcC5zZXQoJmxheW91dEJveCwgbV9wYXJhZ3Jh cGhDb250ZW50QnVpbGRlci5sZW5ndGgoKSk7CiAgICAgICAgICAgICBtX3BhcmFncmFwaENvbnRl bnRCdWlsZGVyLmFwcGVuZChvYmplY3RSZXBsYWNlbWVudENoYXJhY3Rlcik7CisgICAgICAgIH0K ICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNDE3LDE4ICs0MzAsMTcgQEAgdm9pZCBJbmxp bmVJdGVtc0J1aWxkZXI6OmhhbmRsZUlubGluZUxldmVsQm94KGNvbnN0IEJveCYgbGF5b3V0Qm94 LCBJbmxpbmVJdGVtcyYKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAotdm9pZCBJbmxp bmVJdGVtc0J1aWxkZXI6OmVudGVyQmlkaUNvbnRleHQoY29uc3QgQm94JiBib3gsIFVDaGFyIGNv bnRyb2xDaGFyYWN0ZXIsIGNvbnN0IElubGluZUl0ZW1zJiBpbmxpbmVJdGVtcykKK3ZvaWQgSW5s aW5lSXRlbXNCdWlsZGVyOjplbnRlckJpZGlDb250ZXh0KGNvbnN0IElubGluZUl0ZW0mIGlubGlu ZUl0ZW0sIFVDaGFyIGNvbnRyb2xDaGFyYWN0ZXIpCiB7Ci0gICAgaWYgKCFoYXNTZWVuQmlkaUNv bnRlbnQoKSkKLSAgICAgICAgYnVpbGRQcmV2aW91c1RleHRDb250ZW50KGlubGluZUl0ZW1zKTsK LSAgICAvLyBMZXQgdGhlIGZpcnN0IGNvbnRyb2wgY2hhcmFjdGVyIHJlcHJlc2VudCB0aGUgIGJv eC4KLSAgICBtX2NvbnRlbnRPZmZzZXRNYXAuYWRkKCZib3gsIG1fcGFyYWdyYXBoQ29udGVudEJ1 aWxkZXIubGVuZ3RoKCkpOworICAgIC8vIEZJWE1FOiBBZGQgc3VwcG9ydCBmb3IgY2FzZXMgd2hl biBvbmUgYm94IGluaXRpYXRlcyBtdWx0aXBsZSBjb250cm9sIGNoYXJhY3RlcnMuCisgICAgbV9j b250cm9sQ2hhcmFjdGVyT2Zmc2V0TWFwLnNldCgmaW5saW5lSXRlbSwgbV9wYXJhZ3JhcGhDb250 ZW50QnVpbGRlci5sZW5ndGgoKSk7CiAgICAgbV9wYXJhZ3JhcGhDb250ZW50QnVpbGRlci5hcHBl bmQoY29udHJvbENoYXJhY3Rlcik7CiB9CiAKLXZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpleGl0 QmlkaUNvbnRleHQoY29uc3QgQm94JiwgVUNoYXIgY29udHJvbENoYXJhY3RlcikKK3ZvaWQgSW5s aW5lSXRlbXNCdWlsZGVyOjpleGl0QmlkaUNvbnRleHQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5l SXRlbSwgVUNoYXIgY29udHJvbENoYXJhY3RlcikKIHsKICAgICBBU1NFUlQoaGFzU2VlbkJpZGlD b250ZW50KCkpOworICAgIG1fY29udHJvbENoYXJhY3Rlck9mZnNldE1hcC5zZXQoJmlubGluZUl0 ZW0sIG1fcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIubGVuZ3RoKCkpOwogICAgIG1fcGFyYWdyYXBo Q29udGVudEJ1aWxkZXIuYXBwZW5kKGNvbnRyb2xDaGFyYWN0ZXIpOwogfQogCkBAIC00MzYsMTkg KzQ0OCwyNCBAQCB2b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6YnVpbGRQcmV2aW91c1RleHRDb250 ZW50KGNvbnN0IElubGluZUl0ZW1zJiBpbmxpbmVJdGVtcwogewogICAgIEFTU0VSVCghaGFzU2Vl bkJpZGlDb250ZW50KCkpOwogICAgIEFTU0VSVChtX2NvbnRlbnRPZmZzZXRNYXAuaXNFbXB0eSgp KTsKKyAgICBBU1NFUlQobV9jb250cm9sQ2hhcmFjdGVyT2Zmc2V0TWFwLmlzRW1wdHkoKSk7CiAK ICAgICBjb25zdCBCb3gqIGxhc3RJbmxpbmVUZXh0Qm94ID0gbnVsbHB0cjsKICAgICBmb3IgKGF1 dG8mIGlubGluZUl0ZW0gOiBpbmxpbmVJdGVtcykgeworICAgICAgICBhdXRvJiBsYXlvdXRCb3gg PSBpbmxpbmVJdGVtLmxheW91dEJveCgpOwogICAgICAgICBpZiAoaW5saW5lSXRlbS5pc1RleHQo KSkgewotICAgICAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gaW5saW5lSXRlbS5sYXlvdXRCb3go KTsKICAgICAgICAgICAgIGlmIChsYXN0SW5saW5lVGV4dEJveCAhPSAmbGF5b3V0Qm94KSB7CiAg ICAgICAgICAgICAgICAgbV9jb250ZW50T2Zmc2V0TWFwLnNldCgmbGF5b3V0Qm94LCBtX3BhcmFn cmFwaENvbnRlbnRCdWlsZGVyLmxlbmd0aCgpKTsKICAgICAgICAgICAgICAgICBtX3BhcmFncmFw aENvbnRlbnRCdWlsZGVyLmFwcGVuZChkb3duY2FzdDxJbmxpbmVUZXh0Qm94PihsYXlvdXRCb3gp LmNvbnRlbnQoKSk7CiAgICAgICAgICAgICAgICAgbGFzdElubGluZVRleHRCb3ggPSAmbGF5b3V0 Qm94OwogICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2UgaWYgKGlubGluZUl0ZW0uaXNCb3go KSkKKyAgICAgICAgfSBlbHNlIGlmIChpbmxpbmVJdGVtLmlzQm94KCkpIHsKKyAgICAgICAgICAg IG1fY29udGVudE9mZnNldE1hcC5zZXQoJmxheW91dEJveCwgbV9wYXJhZ3JhcGhDb250ZW50QnVp bGRlci5sZW5ndGgoKSk7CiAgICAgICAgICAgICBtX3BhcmFncmFwaENvbnRlbnRCdWlsZGVyLmFw cGVuZChvYmplY3RSZXBsYWNlbWVudENoYXJhY3Rlcik7Ci0gICAgICAgIGVsc2UKKyAgICAgICAg fSBlbHNlIGlmIChpbmxpbmVJdGVtLmlzSW5saW5lQm94U3RhcnQoKSB8fCBpbmxpbmVJdGVtLmlz SW5saW5lQm94RW5kKCkpIHsKKyAgICAgICAgICAgIC8vIEFueSBwcmlvciBjb250cm9sIGNoYXJh Y3RlcnMgc2hvdWxkIGhhdmUgaW5pdGlhdGVkIGNvbnRlbnQgYnVpbGRpbmcuCisgICAgICAgICAg ICBBU1NFUlQoaW5saW5lSXRlbS5zdHlsZSgpLnJ0bE9yZGVyaW5nKCkgPT0gT3JkZXI6OlZpc3Vh bCB8fCBpbmxpbmVJdGVtLnN0eWxlKCkudW5pY29kZUJpZGkoKSA9PSBFVW5pY29kZUJpZGk6OlVC Tm9ybWFsKTsKKyAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICBBU1NFUlRfTk9UX0lNUExFTUVO VEVEX1lFVCgpOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5oIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVy LmgKaW5kZXggYTY0NGExNjJkYjIzMTQ2YTMyNTUyYzBjZGVkYWU3MWRlYzgxNDkyMi4uNDJlYmIz YjFiOGU2YjMzNzVhZThhMjhhNjVjMzY5NTcyNTNkZGJkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lSXRlbXNCdWlsZGVyLmgKQEAgLTQ5LDggKzQ5LDggQEAgcHJpdmF0ZToKICAgICB2b2lk IGhhbmRsZUlubGluZUJveEVuZChjb25zdCBCb3gmLCBJbmxpbmVJdGVtcyYpOwogICAgIHZvaWQg aGFuZGxlSW5saW5lTGV2ZWxCb3goY29uc3QgQm94JiwgSW5saW5lSXRlbXMmKTsKICAgICAKLSAg ICB2b2lkIGVudGVyQmlkaUNvbnRleHQoY29uc3QgQm94JiwgVUNoYXIsIGNvbnN0IElubGluZUl0 ZW1zJik7Ci0gICAgdm9pZCBleGl0QmlkaUNvbnRleHQoY29uc3QgQm94JiwgVUNoYXIpOworICAg IHZvaWQgZW50ZXJCaWRpQ29udGV4dChjb25zdCBJbmxpbmVJdGVtJiwgVUNoYXIgY29udHJvbENo YXJhY3Rlcik7CisgICAgdm9pZCBleGl0QmlkaUNvbnRleHQoY29uc3QgSW5saW5lSXRlbSYsIFVD aGFyIGNvbnRyb2xDaGFyYWN0ZXIpOwogCiAgICAgdm9pZCBidWlsZFByZXZpb3VzVGV4dENvbnRl bnQoY29uc3QgSW5saW5lSXRlbXMmKTsKIApAQCAtNjMsOCArNjMsMTEgQEAgcHJpdmF0ZToKICAg ICBJbmxpbmVGb3JtYXR0aW5nU3RhdGUmIG1fZm9ybWF0dGluZ1N0YXRlOwogCiAgICAgU3RyaW5n QnVpbGRlciBtX3BhcmFncmFwaENvbnRlbnRCdWlsZGVyOwotICAgIC8vIEtlZXAgdHJhY2sgb2Yg d2hlcmUgZWFjaCBsYXlvdXQgYm94IHN0YXJ0cyBpbiB0aGUgcGFyYWdyYXBoIGNvbnRlbnQuCisg ICAgLy8gS2VlcCB0cmFjayBvZiB3aGVyZSBlYWNoIGxheW91dCBib3ggd2l0aCBjb250ZW50IHN0 YXJ0cyBpbiB0aGUgcGFyYWdyYXBoIGNvbnRlbnQuCiAgICAgSGFzaE1hcDxjb25zdCBCb3gqLCBz aXplX3Q+IG1fY29udGVudE9mZnNldE1hcDsKKyAgICAvLyBLZWVwIHRyYWNrIG9mIHdoZXJlIGVh Y2ggaW5saW5lIGl0ZW0gd2l0aCBjb250cm9sIGNoYXJhY3RlciBzdGFydHMgaW4gdGhlIHBhcmFn cmFwaCBjb250ZW50LgorICAgIC8vIE5vdGUgdGhhdCBtdWx0aXBsZSBpbmxpbmUgaXRlbXMgY2Fu IHJlZmVyIGJhY2sgdG8gdGhlIHNhbWUgbGF5b3V0IGJveCAoZS5nLiBpbmxpbmUgYm94IHN0YXJ0 L2VuZCkKKyAgICBIYXNoTWFwPGNvbnN0IElubGluZUl0ZW0qLCBzaXplX3Q+IG1fY29udHJvbENo YXJhY3Rlck9mZnNldE1hcDsKIH07CiAKIH0K