269152 2024-02-10 19:02:03 -0800 [IFC] Do don't consider natural breaking opportunities as soft-wrap boundaries when style does not allow wrapping (part2) 2024-02-11 06:44:20 -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 2012534 0 zalan 2024-02-10 19:02:03 -0800 not just text only anymore. 2012537 1 469815 zalan 2024-02-10 20:02:59 -0800 Created attachment 469815 Patch 2012549 2 469816 zalan 2024-02-10 21:01:38 -0800 Created attachment 469816 Patch 2012595 3 469817 zalan 2024-02-11 06:02:10 -0800 Created attachment 469817 [fast-cq]Patch 2012604 4 ews-feeder 2024-02-11 06:43:44 -0800 Committed 274444@main (7cd082919192): <https://commits.webkit.org/274444@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 469817. 2012605 5 webkit-bug-importer 2024-02-11 06:44:20 -0800 <rdar://problem/122746462> 469815 2024-02-10 20:02:59 -0800 2024-02-10 21:01:36 -0800 Patch bug-269152-20240210200258.patch text/plain 2320 zalan RnJvbSA1ZGY3MDg3Njc2NWRmMzRhZWZiMzkwZTk3YzI2ZWZkMjUxNTU1OGU3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMTAgRmViIDIwMjQgMTk6MDI6MzEgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBE byBkb24ndCBjb25zaWRlciBuYXR1cmFsIGJyZWFraW5nIG9wcG9ydHVuaXRpZXMgYXMKIHNvZnQt d3JhcCBib3VuZGFyaWVzIHdoZW4gc3R5bGUgZG9lcyBub3QgYWxsb3cgd3JhcHBpbmcgKHBhcnQy KQogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2OTE1MgoKUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpFeHBhbmQgdGhlIHNhbWUgcGFyZW50IG5vLXdyYXAgcnVs ZSB0byBhbGwgdHlwZXMgb2YgY29udGVudC4KCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1V0aWxzLmNwcDoKKFdlYkNvcmU6 OkxheW91dDo6aXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkpOgotLS0KIC4uLi9pbmxpbmUvSW5saW5l Rm9ybWF0dGluZ1V0aWxzLmNwcCAgICAgICAgICAgICAgICAgICB8IDEwICsrKysrLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l Rm9ybWF0dGluZ1V0aWxzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdVdGlscy5jcHAKaW5kZXggNzMwMjExNzI4OTM1 Li43NGE0N2ZhZTY5ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdVdGlscy5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGlu Z1V0aWxzLmNwcApAQCAtMzgxLDE0ICszODEsMTQgQEAgc3RhdGljIGlubGluZSBib29sIGlzQXRT b2Z0V3JhcE9wcG9ydHVuaXR5KGNvbnN0IElubGluZUl0ZW0mIHByZXZpb3VzLCBjb25zdCBJbmwK ICAgICAvLyBidXQgYW4gaW5jb21pbmcgdGV4dCBjb250ZW50IHdvdWxkIG5vdCBuZWNlc3Nhcmls eS4KICAgICBBU1NFUlQocHJldmlvdXMuaXNUZXh0KCkgfHwgcHJldmlvdXMuaXNCb3goKSB8fCBw cmV2aW91cy5sYXlvdXRCb3goKS5pc1J1YnlJbmxpbmVCb3goKSk7CiAgICAgQVNTRVJUKG5leHQu aXNUZXh0KCkgfHwgbmV4dC5pc0JveCgpIHx8IG5leHQubGF5b3V0Qm94KCkuaXNSdWJ5SW5saW5l Qm94KCkpOworICAgIGF1dG8gbWF5V3JhcFByZXZpb3VzID0gVGV4dFV0aWw6OmlzV3JhcHBpbmdB bGxvd2VkKHByZXZpb3VzLnN0eWxlKCkpOworICAgIGF1dG8gbWF5V3JhcE5leHQgPSBUZXh0VXRp bDo6aXNXcmFwcGluZ0FsbG93ZWQobmV4dC5zdHlsZSgpKTsKKyAgICBpZiAoJnByZXZpb3VzLmxh eW91dEJveCgpLnBhcmVudCgpID09ICZuZXh0LmxheW91dEJveCgpLnBhcmVudCgpICYmICFtYXlX cmFwUHJldmlvdXMgJiYgIW1heVdyYXBOZXh0KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAg ICBpZiAocHJldmlvdXMuaXNUZXh0KCkgJiYgbmV4dC5pc1RleHQoKSkgewogICAgICAgICBhdXRv JiBwcmV2aW91c0lubGluZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KHByZXZp b3VzKTsKICAgICAgICAgYXV0byYgbmV4dElubGluZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5l VGV4dEl0ZW0+KG5leHQpOwotCi0gICAgICAgIGF1dG8gbWF5V3JhcFByZXZpb3VzID0gVGV4dFV0 aWw6OmlzV3JhcHBpbmdBbGxvd2VkKHByZXZpb3VzSW5saW5lVGV4dEl0ZW0uc3R5bGUoKSk7Ci0g ICAgICAgIGF1dG8gbWF5V3JhcE5leHQgPSBUZXh0VXRpbDo6aXNXcmFwcGluZ0FsbG93ZWQobmV4 dElubGluZVRleHRJdGVtLnN0eWxlKCkpOwotICAgICAgICBpZiAoJnByZXZpb3VzSW5saW5lVGV4 dEl0ZW0ubGF5b3V0Qm94KCkucGFyZW50KCkgPT0gJm5leHRJbmxpbmVUZXh0SXRlbS5sYXlvdXRC b3goKS5wYXJlbnQoKSAmJiAhbWF5V3JhcFByZXZpb3VzICYmICFtYXlXcmFwTmV4dCkKLSAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgaWYgKHByZXZpb3VzSW5saW5lVGV4dEl0ZW0u aXNXaGl0ZXNwYWNlKCkpIHsKICAgICAgICAgICAgIC8vICI8bm93cmFwPiA8L25vd3JhcD5hZnRl ciIKICAgICAgICAgICAgIHJldHVybiBtYXlXcmFwUHJldmlvdXM7Cg== 469816 2024-02-10 21:01:38 -0800 2024-02-11 06:02:08 -0800 Patch bug-269152-20240210210137.patch text/plain 3081 zalan RnJvbSAxZGUzMDg4NmZiODUzZjU0MjYyMDQ1M2IwMmRmMzkxZDExYmRkNzZlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMTAgRmViIDIwMjQgMTk6MDI6MzEgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBE byBkb24ndCBjb25zaWRlciBuYXR1cmFsIGJyZWFraW5nIG9wcG9ydHVuaXRpZXMgYXMKIHNvZnQt d3JhcCBib3VuZGFyaWVzIHdoZW4gc3R5bGUgZG9lcyBub3QgYWxsb3cgd3JhcHBpbmcgKHBhcnQy KQogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2OTE1MgoKUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpFeHBhbmQgdGhlIHNhbWUgcGFyZW50IG5vLXdyYXAgcnVs ZSB0byBhbGwgdHlwZXMgb2YgY29udGVudC4KKFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIHRh a2luZyBjYXJlIG9mIEZJWE1FIGF0IGlzQXRTb2Z0V3JhcE9wcG9ydHVuaXR5KQoKKiBTb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5n VXRpbHMuY3BwOgooV2ViQ29yZTo6TGF5b3V0Ojppc0F0U29mdFdyYXBPcHBvcnR1bml0eSk6Ci0t LQogLi4uL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nVXRpbHMuY3BwICAgICAgICAgICAgIHwgMTYg KysrKysrKysrLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgNyBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nVXRpbHMuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1V0aWxzLmNw cAppbmRleCA3MzAyMTE3Mjg5MzUuLjllNmMwN2EzNzYxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1V0 aWxzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVGb3JtYXR0aW5nVXRpbHMuY3BwCkBAIC0zODEsMTQgKzM4MSwxOCBAQCBzdGF0 aWMgaW5saW5lIGJvb2wgaXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkoY29uc3QgSW5saW5lSXRlbSYg cHJldmlvdXMsIGNvbnN0IElubAogICAgIC8vIGJ1dCBhbiBpbmNvbWluZyB0ZXh0IGNvbnRlbnQg d291bGQgbm90IG5lY2Vzc2FyaWx5LgogICAgIEFTU0VSVChwcmV2aW91cy5pc1RleHQoKSB8fCBw cmV2aW91cy5pc0JveCgpIHx8IHByZXZpb3VzLmxheW91dEJveCgpLmlzUnVieUlubGluZUJveCgp KTsKICAgICBBU1NFUlQobmV4dC5pc1RleHQoKSB8fCBuZXh0LmlzQm94KCkgfHwgbmV4dC5sYXlv dXRCb3goKS5pc1J1YnlJbmxpbmVCb3goKSk7CisKKyAgICBpZiAocHJldmlvdXMubGF5b3V0Qm94 KCkuaXNSdWJ5SW5saW5lQm94KCkgfHwgbmV4dC5sYXlvdXRCb3goKS5pc1J1YnlJbmxpbmVCb3go KSkKKyAgICAgICAgcmV0dXJuIFJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6aXNBdFNvZnRXcmFwT3Bw b3J0dW5pdHkocHJldmlvdXMsIG5leHQpOworCisgICAgYXV0byBtYXlXcmFwUHJldmlvdXMgPSBU ZXh0VXRpbDo6aXNXcmFwcGluZ0FsbG93ZWQocHJldmlvdXMubGF5b3V0Qm94KCkucGFyZW50KCku c3R5bGUoKSk7CisgICAgYXV0byBtYXlXcmFwTmV4dCA9IFRleHRVdGlsOjppc1dyYXBwaW5nQWxs b3dlZChuZXh0LmxheW91dEJveCgpLnBhcmVudCgpLnN0eWxlKCkpOworICAgIGlmICgmcHJldmlv dXMubGF5b3V0Qm94KCkucGFyZW50KCkgPT0gJm5leHQubGF5b3V0Qm94KCkucGFyZW50KCkgJiYg IW1heVdyYXBQcmV2aW91cyAmJiAhbWF5V3JhcE5leHQpCisgICAgICAgIHJldHVybiBmYWxzZTsK KwogICAgIGlmIChwcmV2aW91cy5pc1RleHQoKSAmJiBuZXh0LmlzVGV4dCgpKSB7CiAgICAgICAg IGF1dG8mIHByZXZpb3VzSW5saW5lVGV4dEl0ZW0gPSBkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4o cHJldmlvdXMpOwogICAgICAgICBhdXRvJiBuZXh0SW5saW5lVGV4dEl0ZW0gPSBkb3duY2FzdDxJ bmxpbmVUZXh0SXRlbT4obmV4dCk7Ci0KLSAgICAgICAgYXV0byBtYXlXcmFwUHJldmlvdXMgPSBU ZXh0VXRpbDo6aXNXcmFwcGluZ0FsbG93ZWQocHJldmlvdXNJbmxpbmVUZXh0SXRlbS5zdHlsZSgp KTsKLSAgICAgICAgYXV0byBtYXlXcmFwTmV4dCA9IFRleHRVdGlsOjppc1dyYXBwaW5nQWxsb3dl ZChuZXh0SW5saW5lVGV4dEl0ZW0uc3R5bGUoKSk7Ci0gICAgICAgIGlmICgmcHJldmlvdXNJbmxp bmVUZXh0SXRlbS5sYXlvdXRCb3goKS5wYXJlbnQoKSA9PSAmbmV4dElubGluZVRleHRJdGVtLmxh eW91dEJveCgpLnBhcmVudCgpICYmICFtYXlXcmFwUHJldmlvdXMgJiYgIW1heVdyYXBOZXh0KQot ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICBpZiAocHJldmlvdXNJbmxpbmVUZXh0 SXRlbS5pc1doaXRlc3BhY2UoKSkgewogICAgICAgICAgICAgLy8gIjxub3dyYXA+IDwvbm93cmFw PmFmdGVyIgogICAgICAgICAgICAgcmV0dXJuIG1heVdyYXBQcmV2aW91czsKQEAgLTQyMyw4ICs0 MjcsNiBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkoY29uc3Qg SW5saW5lSXRlbSYgcHJldmlvdXMsIGNvbnN0IElubAogICAgICAgICAvLyBUaGUgbGluZSBicmVh a2luZyBiZWhhdmlvciBvZiBhIHJlcGxhY2VkIGVsZW1lbnQgb3Igb3RoZXIgYXRvbWljIGlubGlu ZSBpcyBlcXVpdmFsZW50IHRvIGFuIGlkZW9ncmFwaGljIGNoYXJhY3Rlci4KICAgICAgICAgcmV0 dXJuIHRydWU7CiAgICAgfQotICAgIGlmIChwcmV2aW91cy5sYXlvdXRCb3goKS5pc1J1YnlJbmxp bmVCb3goKSB8fCBuZXh0LmxheW91dEJveCgpLmlzUnVieUlubGluZUJveCgpKQotICAgICAgICBy ZXR1cm4gUnVieUZvcm1hdHRpbmdDb250ZXh0Ojppc0F0U29mdFdyYXBPcHBvcnR1bml0eShwcmV2 aW91cywgbmV4dCk7CiAKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICByZXR1cm4gdHJ1 ZTsK 469817 2024-02-11 06:02:10 -0800 2024-02-11 06:43:45 -0800 [fast-cq]Patch bug-269152-20240211060210.patch text/plain 3081 zalan RnJvbSAzODYzMzZiNTU1NWYzNzk2ZjBmMDhjMmY2ZDE0YjhjMjZkMzJkYTBlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMTAgRmViIDIwMjQgMTk6MDI6MzEgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXSBE byBkb24ndCBjb25zaWRlciBuYXR1cmFsIGJyZWFraW5nIG9wcG9ydHVuaXRpZXMgYXMKIHNvZnQt d3JhcCBib3VuZGFyaWVzIHdoZW4gc3R5bGUgZG9lcyBub3QgYWxsb3cgd3JhcHBpbmcgKHBhcnQy KQogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2OTE1MgoKUmV2aWV3 ZWQgYnkgQW50dGkgS29pdmlzdG8uCgpFeHBhbmQgdGhlIHNhbWUgcGFyZW50IG5vLXdyYXAgcnVs ZSB0byBhbGwgdHlwZXMgb2YgY29udGVudC4KKFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIHRh a2luZyBjYXJlIG9mIEZJWE1FIGF0IGlzQXRTb2Z0V3JhcE9wcG9ydHVuaXR5KQoKKiBTb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5n VXRpbHMuY3BwOgooV2ViQ29yZTo6TGF5b3V0Ojppc0F0U29mdFdyYXBPcHBvcnR1bml0eSk6Ci0t LQogLi4uL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nVXRpbHMuY3BwICAgICAgICAgICAgIHwgMTYg KysrKysrKysrLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgNyBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVGb3JtYXR0aW5nVXRpbHMuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1V0aWxzLmNw cAppbmRleCA3MzAyMTE3Mjg5MzUuLjllNmMwN2EzNzYxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1V0 aWxzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVGb3JtYXR0aW5nVXRpbHMuY3BwCkBAIC0zODEsMTQgKzM4MSwxOCBAQCBzdGF0 aWMgaW5saW5lIGJvb2wgaXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkoY29uc3QgSW5saW5lSXRlbSYg cHJldmlvdXMsIGNvbnN0IElubAogICAgIC8vIGJ1dCBhbiBpbmNvbWluZyB0ZXh0IGNvbnRlbnQg d291bGQgbm90IG5lY2Vzc2FyaWx5LgogICAgIEFTU0VSVChwcmV2aW91cy5pc1RleHQoKSB8fCBw cmV2aW91cy5pc0JveCgpIHx8IHByZXZpb3VzLmxheW91dEJveCgpLmlzUnVieUlubGluZUJveCgp KTsKICAgICBBU1NFUlQobmV4dC5pc1RleHQoKSB8fCBuZXh0LmlzQm94KCkgfHwgbmV4dC5sYXlv dXRCb3goKS5pc1J1YnlJbmxpbmVCb3goKSk7CisKKyAgICBpZiAocHJldmlvdXMubGF5b3V0Qm94 KCkuaXNSdWJ5SW5saW5lQm94KCkgfHwgbmV4dC5sYXlvdXRCb3goKS5pc1J1YnlJbmxpbmVCb3go KSkKKyAgICAgICAgcmV0dXJuIFJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6aXNBdFNvZnRXcmFwT3Bw b3J0dW5pdHkocHJldmlvdXMsIG5leHQpOworCisgICAgYXV0byBtYXlXcmFwUHJldmlvdXMgPSBU ZXh0VXRpbDo6aXNXcmFwcGluZ0FsbG93ZWQocHJldmlvdXMubGF5b3V0Qm94KCkucGFyZW50KCku c3R5bGUoKSk7CisgICAgYXV0byBtYXlXcmFwTmV4dCA9IFRleHRVdGlsOjppc1dyYXBwaW5nQWxs b3dlZChuZXh0LmxheW91dEJveCgpLnBhcmVudCgpLnN0eWxlKCkpOworICAgIGlmICgmcHJldmlv dXMubGF5b3V0Qm94KCkucGFyZW50KCkgPT0gJm5leHQubGF5b3V0Qm94KCkucGFyZW50KCkgJiYg IW1heVdyYXBQcmV2aW91cyAmJiAhbWF5V3JhcE5leHQpCisgICAgICAgIHJldHVybiBmYWxzZTsK KwogICAgIGlmIChwcmV2aW91cy5pc1RleHQoKSAmJiBuZXh0LmlzVGV4dCgpKSB7CiAgICAgICAg IGF1dG8mIHByZXZpb3VzSW5saW5lVGV4dEl0ZW0gPSBkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4o cHJldmlvdXMpOwogICAgICAgICBhdXRvJiBuZXh0SW5saW5lVGV4dEl0ZW0gPSBkb3duY2FzdDxJ bmxpbmVUZXh0SXRlbT4obmV4dCk7Ci0KLSAgICAgICAgYXV0byBtYXlXcmFwUHJldmlvdXMgPSBU ZXh0VXRpbDo6aXNXcmFwcGluZ0FsbG93ZWQocHJldmlvdXNJbmxpbmVUZXh0SXRlbS5zdHlsZSgp KTsKLSAgICAgICAgYXV0byBtYXlXcmFwTmV4dCA9IFRleHRVdGlsOjppc1dyYXBwaW5nQWxsb3dl ZChuZXh0SW5saW5lVGV4dEl0ZW0uc3R5bGUoKSk7Ci0gICAgICAgIGlmICgmcHJldmlvdXNJbmxp bmVUZXh0SXRlbS5sYXlvdXRCb3goKS5wYXJlbnQoKSA9PSAmbmV4dElubGluZVRleHRJdGVtLmxh eW91dEJveCgpLnBhcmVudCgpICYmICFtYXlXcmFwUHJldmlvdXMgJiYgIW1heVdyYXBOZXh0KQot ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICBpZiAocHJldmlvdXNJbmxpbmVUZXh0 SXRlbS5pc1doaXRlc3BhY2UoKSkgewogICAgICAgICAgICAgLy8gIjxub3dyYXA+IDwvbm93cmFw PmFmdGVyIgogICAgICAgICAgICAgcmV0dXJuIG1heVdyYXBQcmV2aW91czsKQEAgLTQyMyw4ICs0 MjcsNiBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkoY29uc3Qg SW5saW5lSXRlbSYgcHJldmlvdXMsIGNvbnN0IElubAogICAgICAgICAvLyBUaGUgbGluZSBicmVh a2luZyBiZWhhdmlvciBvZiBhIHJlcGxhY2VkIGVsZW1lbnQgb3Igb3RoZXIgYXRvbWljIGlubGlu ZSBpcyBlcXVpdmFsZW50IHRvIGFuIGlkZW9ncmFwaGljIGNoYXJhY3Rlci4KICAgICAgICAgcmV0 dXJuIHRydWU7CiAgICAgfQotICAgIGlmIChwcmV2aW91cy5sYXlvdXRCb3goKS5pc1J1YnlJbmxp bmVCb3goKSB8fCBuZXh0LmxheW91dEJveCgpLmlzUnVieUlubGluZUJveCgpKQotICAgICAgICBy ZXR1cm4gUnVieUZvcm1hdHRpbmdDb250ZXh0Ojppc0F0U29mdFdyYXBPcHBvcnR1bml0eShwcmV2 aW91cywgbmV4dCk7CiAKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICByZXR1cm4gdHJ1 ZTsK