204966 2019-12-06 16:11:27 -0800 [LFC][IFC] Rename ContentBreak to ContentWrappingRule and ContentBreak::wrap to ContentWrappingRule::push 2019-12-06 20:36:08 -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 sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1596419 0 zalan 2019-12-06 16:11:27 -0800 to be less confusing. 1596421 1 webkit-bug-importer 2019-12-06 16:11:50 -0800 <rdar://problem/57717049> 1596423 2 385053 zalan 2019-12-06 16:22:42 -0800 Created attachment 385053 Patch 1596494 3 385053 commit-queue 2019-12-06 20:36:06 -0800 Comment on attachment 385053 Patch Clearing flags on attachment: 385053 Committed r253238: <https://trac.webkit.org/changeset/253238> 1596495 4 commit-queue 2019-12-06 20:36:08 -0800 All reviewed patches have been landed. Closing bug. 385053 2019-12-06 16:22:42 -0800 2019-12-06 20:36:06 -0800 Patch bug-204966-20191206162239.patch text/plain 9257 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzMjI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjkzZmY1NTM3ODYxYTg5 ODJiMjRkODljZDE1NDMyOWIyYTY4ZTIwMC4uNmZjNDg0MGZmMmVlOWM2YzQ2NTZmMGMzMzY4ZWVl OTY1NzAxYWU3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTEyLTA2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBSZW5hbWUg Q29udGVudEJyZWFrIHRvIENvbnRlbnRXcmFwcGluZ1J1bGUgYW5kIENvbnRlbnRCcmVhazo6d3Jh cCB0byBDb250ZW50V3JhcHBpbmdSdWxlOjpwdXNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQ5NjYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU3 NzE3MDQ5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFVzZSB0aGUgdGVybSAicHVzaCIgaW5zdGVhZCBvZiAid3JhcCIgdG8gbW92ZSBhIHJ1biB0byB0 aGUgbmV4dCBsaW5lIHdpdGhvdXQgYnJlYWtpbmcgaXQuCisgICAgICAgIFRoaXMgaXMgbWFpbmx5 IHRvIGF2b2lkIHNwZWMgdGVybSBjb25mdXNpb24uCisgICAgICAgIENvbnRlbnRXcmFwcGluZ1J1 bGU6OktlZXAgLT4ga2VlcCB0aGUgcnVuIChvciBjb250aW51b3VzIHJ1bnMpIG9uIHRoZSBjdXJy ZW50IGxpbmUuCisgICAgICAgIENvbnRlbnRXcmFwcGluZ1J1bGU6OlNwbGl0IC0+IGtlZXAgdGhl IHJ1biAob3IgY29udGludW91cyBydW5zKSBwYXJ0aWFsbHkgb24gdGhlIGN1cnJlbnQgbGluZSAo c2VlIEJyZWFraW5nQ29udGV4dDo6UGFydGlhbFRyYWlsaW5nQ29udGVudCkuCisgICAgICAgIENv bnRlbnRXcmFwcGluZ1J1bGU6OlB1c2ggLT4gbW92ZSB0aGUgcnVuIChvciBjb250aW51b3VzIHJ1 bnMpIGNvbXBsZXRlbHkgdG8gdGhlIG5leHQgbGluZS4KKworICAgICAgICAqIGxheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6TGluZUJyZWFrZXI6OmJyZWFraW5nQ29udGV4dEZvcklubGluZUNvbnRlbnQpOgorICAg ICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmg6CisgICAg ICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRleHQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lTGF5b3V0Q29udGV4dDo6cHJvY2Vzc1VuY29tbWl0 dGVkQ29udGVudCk6CisKIDIwMTktMTItMDYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNv bT4KIAogICAgICAgICBbTEZDXVtJRkNdIFVzZSBleHBsaWNpdCAwX2x1IHZhbHVlIGluc3RlYWQg b2YgTGF5b3V0VW5pdCB7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmNwcAppbmRleCA0YTMyNzI3OTNi MDQ3MWZlMTUxNWVhODU5MWUyZmMwZTAzYTI3NWM2Li42MDhlODczYTk1ZWI2NjU2ZjFjZjZjMjE5 MDZhOWYxYzMwMTA4OTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwCkBAIC01Myw0MSArNTMs NDAgQEAgTGluZUJyZWFrZXI6OkJyZWFraW5nQ29udGV4dCBMaW5lQnJlYWtlcjo6YnJlYWtpbmdD b250ZXh0Rm9ySW5saW5lQ29udGVudChjb25zdAogewogICAgIEFTU0VSVCghY2FuZGlkYXRlUnVu cy5pc0VtcHR5KCkpOwogICAgIGlmIChjYW5kaWRhdGVSdW5zLndpZHRoKCkgPD0gbGluZVN0YXR1 cy5hdmFpbGFibGVXaWR0aCkKLSAgICAgICAgcmV0dXJuIHsgQnJlYWtpbmdDb250ZXh0OjpDb250 ZW50QnJlYWs6OktlZXAsIHsgfSB9OworICAgICAgICByZXR1cm4geyBCcmVha2luZ0NvbnRleHQ6 OkNvbnRlbnRXcmFwcGluZ1J1bGU6OktlZXAsIHsgfSB9OwogICAgIGlmIChjYW5kaWRhdGVSdW5z Lmhhc1RyYWlsaW5nVHJpbW1hYmxlQ29udGVudCgpKSB7CiAgICAgICAgIC8vIEZpcnN0IGNoZWNr IGlmIHRoZSBjb250ZW50IGZpdHMgd2l0aG91dCB0aGUgdHJhaWxpbmcgdHJpbW1hYmxlIHBhcnQu CiAgICAgICAgIGlmIChjYW5kaWRhdGVSdW5zLm5vblRyaW1tYWJsZVdpZHRoKCkgPD0gbGluZVN0 YXR1cy5hdmFpbGFibGVXaWR0aCkKLSAgICAgICAgICAgIHJldHVybiB7IEJyZWFraW5nQ29udGV4 dDo6Q29udGVudEJyZWFrOjpLZWVwLCB7IH0gfTsKKyAgICAgICAgICAgIHJldHVybiB7IEJyZWFr aW5nQ29udGV4dDo6Q29udGVudFdyYXBwaW5nUnVsZTo6S2VlcCwgeyB9IH07CiAgICAgICAgIC8v IE5vdyBjaGVjayBpZiB3ZSBjYW4gdHJpbSB0aGUgbGluZSB0b28uCiAgICAgICAgIGlmIChsaW5l U3RhdHVzLmxpbmVIYXNGdWxseVRyaW1tYWJsZVRyYWlsaW5nUnVuICYmIGNhbmRpZGF0ZVJ1bnMu aXNUcmFpbGluZ0NvbnRlbnRGdWxseVRyaW1tYWJsZSgpKSB7CiAgICAgICAgICAgICAvLyBJZiB0 aGlzIG5ldyBjb250ZW50IGlzIGZ1bGx5IHRyaW1tYWJsZSwgaXQgc2hvdWQgc3VyZWx5IGZpdC4K LSAgICAgICAgICAgIHJldHVybiB7IEJyZWFraW5nQ29udGV4dDo6Q29udGVudEJyZWFrOjpLZWVw LCB7IH0gfTsKKyAgICAgICAgICAgIHJldHVybiB7IEJyZWFraW5nQ29udGV4dDo6Q29udGVudFdy YXBwaW5nUnVsZTo6S2VlcCwgeyB9IH07CiAgICAgICAgIH0KICAgICB9IGVsc2UgaWYgKGxpbmVT dGF0dXMudHJpbW1hYmxlV2lkdGggJiYgY2FuZGlkYXRlUnVucy5oYXNOb25Db250ZW50UnVuc09u bHkoKSkgewogICAgICAgICAvLyBMZXQncyBzZWUgaWYgdGhlIG5vbi1jb250ZW50IHJ1bnMgZml0 IHdoZW4gdGhlIGxpbmUgaGFzIHRyYWlsaW5nIHRyaW1tYWJsZSBjb250ZW50CiAgICAgICAgIC8v ICJ0ZXh0IGNvbnRlbnQgPHNwYW4gc3R5bGU9InBhZGRpbmc6IDFweCI+PC9zcGFuPiIgPC0gdGhl IDxzcGFuPjwvc3Bhbj4gcnVucyBjb3VsZCBmaXQgYWZ0ZXIgdHJpbW1pbmcgdGhlIHRyYWlsaW5n IHdoaXRlc3BhY2UuCiAgICAgICAgIGlmIChjYW5kaWRhdGVSdW5zLndpZHRoKCkgPD0gbGluZVN0 YXR1cy5hdmFpbGFibGVXaWR0aCArIGxpbmVTdGF0dXMudHJpbW1hYmxlV2lkdGgpCi0gICAgICAg ICAgICByZXR1cm4geyBCcmVha2luZ0NvbnRleHQ6OkNvbnRlbnRCcmVhazo6S2VlcCwgeyB9IH07 CisgICAgICAgICAgICByZXR1cm4geyBCcmVha2luZ0NvbnRleHQ6OkNvbnRlbnRXcmFwcGluZ1J1 bGU6OktlZXAsIHsgfSB9OwogICAgIH0KIAogICAgIGlmIChjYW5kaWRhdGVSdW5zLmhhc1RleHRD b250ZW50T25seSgpKSB7CiAgICAgICAgIGF1dG8mIHJ1bnMgPSBjYW5kaWRhdGVSdW5zLnJ1bnMo KTsKICAgICAgICAgaWYgKGF1dG8gcGFydGlhbFRyYWlsaW5nQ29udGVudCA9IHdvcmRCcmVha2lu Z0JlaGF2aW9yKHJ1bnMsIGxpbmVTdGF0dXMuYXZhaWxhYmxlV2lkdGgpKQotICAgICAgICAgICAg cmV0dXJuIHsgQnJlYWtpbmdDb250ZXh0OjpDb250ZW50QnJlYWs6OlNwbGl0LCBwYXJ0aWFsVHJh aWxpbmdDb250ZW50IH07CisgICAgICAgICAgICByZXR1cm4geyBCcmVha2luZ0NvbnRleHQ6OkNv bnRlbnRXcmFwcGluZ1J1bGU6OlNwbGl0LCBwYXJ0aWFsVHJhaWxpbmdDb250ZW50IH07CiAgICAg ICAgIC8vIElmIHdlIGRpZCBub3QgbWFuYWdlIHRvIGJyZWFrIHRoaXMgY29udGVudCwgd2Ugc3Rp bGwgbmVlZCB0byBkZWNpZGUgd2hldGhlciBrZWVwIGl0IG9yIHdyYXAgaXQgdG8gdGhlIG5leHQg bGluZS4KICAgICAgICAgLy8gRklYTUU6IEtlZXAgdHJhY2tpbmcgdGhlIGxhc3QgYnJlYWtpbmcg b3Bwb3J0dW5pdHkgd2hlcmUgd2UgY2FuIHdyYXAgdGhlIGNvbnRlbnQ6CiAgICAgICAgIC8vIDxz cGFuIHN0eWxlPSJ3aGl0ZS1zcGFjZTogcHJlOyI+dGhpcyBmaXRzPC9zcGFuPiA8c3BhbiBzdHls ZT0id2hpdGUtc3BhY2U6IHByZTsiPnRoaXMgZG9lcyBub3QgZml0IGJ1dCBkb2VzIG5vdCB3cmFw IGVpdGhlcjwvc3Bhbj4KICAgICAgICAgLy8gXl4gY291bGQgd3JhcCBhdCB0aGUgd2hpdGVzcGFj ZSBwb3NpdGlvbiBiZXR3ZWVuIHRoZSAyIGlubGluZSBjb250YWluZXJzLgotICAgICAgICBhdXRv IGNvbnRlbnRTaG91bGRXcmFwID0gIWxpbmVTdGF0dXMubGluZUlzRW1wdHkgJiYgaXNDb250ZW50 V3JhcHBpbmdBbGxvd2VkKHJ1bnNbMF0uaW5saW5lSXRlbS5zdHlsZSgpKTsKKyAgICAgICAgYXV0 byBjb250ZW50U2hvdWxkT3ZlcmZsb3cgPSBsaW5lU3RhdHVzLmxpbmVJc0VtcHR5IHx8ICFpc0Nv bnRlbnRXcmFwcGluZ0FsbG93ZWQocnVuc1swXS5pbmxpbmVJdGVtLnN0eWxlKCkpOwogICAgICAg ICAvLyBGSVhNRTogd2hpdGUtc3BhY2U6IHByZS13cmFwIG5lZWRzIGNsYXJpZmljYXRpb24uIEFj Y29yZGluZyB0byBDU1MgVGV4dCBNb2R1bGUgTGV2ZWwgMywgY29udGVudCB3cmFwcGluZyBpcyBh cyAnbm9ybWFsJyBidXQgYXBwYXJlbnRseQogICAgICAgICAvLyB3ZSBuZWVkIHRvIGtlZXAgdGhl IG92ZXJsYXBwaW5nIHdoaXRlc3BhY2Ugb24gdGhlIGxpbmUgKGFuZCBoYW5nIGl0IEknZCBhc3N1 bWUpLgogICAgICAgICBpZiAoaXNUcmFpbGluZ1doaXRlc3BhY2VXaXRoUHJlV3JhcChydW5zLmxh c3QoKS5pbmxpbmVJdGVtKSkKLSAgICAgICAgICAgIGNvbnRlbnRTaG91bGRXcmFwID0gZmFsc2U7 Ci0gICAgICAgIHJldHVybiB7IGNvbnRlbnRTaG91bGRXcmFwID8gQnJlYWtpbmdDb250ZXh0OjpD b250ZW50QnJlYWs6OldyYXAgOiBCcmVha2luZ0NvbnRleHQ6OkNvbnRlbnRCcmVhazo6S2VlcCwg eyB9IH07CisgICAgICAgICAgICBjb250ZW50U2hvdWxkT3ZlcmZsb3cgPSB0cnVlOworICAgICAg ICByZXR1cm4geyBjb250ZW50U2hvdWxkT3ZlcmZsb3cgPyBCcmVha2luZ0NvbnRleHQ6OkNvbnRl bnRXcmFwcGluZ1J1bGU6OktlZXAgOiBCcmVha2luZ0NvbnRleHQ6OkNvbnRlbnRXcmFwcGluZ1J1 bGU6OlB1c2gsIHsgfSB9OwogICAgIH0KLQogICAgIC8vIEZpcnN0IG5vbi10ZXh0IGlubGluZSBj b250ZW50IGFsd2F5cyBzdGF5cyBvbiBsaW5lLgotICAgIHJldHVybiB7IGxpbmVTdGF0dXMubGlu ZUlzRW1wdHkgPyBCcmVha2luZ0NvbnRleHQ6OkNvbnRlbnRCcmVhazo6S2VlcCA6IEJyZWFraW5n Q29udGV4dDo6Q29udGVudEJyZWFrOjpXcmFwLCB7IH0gfTsKKyAgICByZXR1cm4geyBsaW5lU3Rh dHVzLmxpbmVJc0VtcHR5ID8gQnJlYWtpbmdDb250ZXh0OjpDb250ZW50V3JhcHBpbmdSdWxlOjpL ZWVwIDogQnJlYWtpbmdDb250ZXh0OjpDb250ZW50V3JhcHBpbmdSdWxlOjpQdXNoLCB7IH0gfTsK IH0KIAogYm9vbCBMaW5lQnJlYWtlcjo6c2hvdWxkV3JhcEZsb2F0Qm94KExheW91dFVuaXQgZmxv YXRMb2dpY2FsV2lkdGgsIExheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgsIGJvb2wgbGluZUlzRW1w dHkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lQnJlYWtlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZUJyZWFrZXIuaAppbmRleCAwZDUyM2FlNmZmMGZjMzgyNGJkMWRhNWE2ZmU4 ZTg4YjcxOTk1YjllLi45ZjI4NjQzODllNDAxYzI5YzYzZGU4ZTY4NzIzNDRhMGQwOWVmNGE4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQnJlYWtlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmVCcmVha2VyLmgKQEAgLTM4LDggKzM4LDEyIEBAIGNsYXNzIElubGluZVRleHRJ dGVtOwogY2xhc3MgTGluZUJyZWFrZXIgewogcHVibGljOgogICAgIHN0cnVjdCBCcmVha2luZ0Nv bnRleHQgewotICAgICAgICBlbnVtIGNsYXNzIENvbnRlbnRCcmVhayB7IEtlZXAsIFNwbGl0LCBX cmFwIH07Ci0gICAgICAgIENvbnRlbnRCcmVhayBjb250ZW50QnJlYWs7CisgICAgICAgIGVudW0g Y2xhc3MgQ29udGVudFdyYXBwaW5nUnVsZSB7CisgICAgICAgICAgICBLZWVwLCAvLyBLZWVwIGNv bnRlbnQgb24gdGhlIGN1cnJlbnQgbGluZS4KKyAgICAgICAgICAgIFNwbGl0LCAvLyBQYXJ0aWFs IGNvbnRlbnQgaXMgb24gdGhlIGN1cnJlbnQgbGluZS4KKyAgICAgICAgICAgIFB1c2ggLy8gQ29u dGVudCBpcyBwdXNoZWQgdG8gdGhlIG5leHQgbGluZS4KKyAgICAgICAgfTsKKyAgICAgICAgQ29u dGVudFdyYXBwaW5nUnVsZSBjb250ZW50V3JhcHBpbmdSdWxlOwogICAgICAgICBzdHJ1Y3QgUGFy dGlhbFRyYWlsaW5nQ29udGVudCB7CiAgICAgICAgICAgICB1bnNpZ25lZCBydW5JbmRleCB7IDAg fTsKICAgICAgICAgICAgIHVuc2lnbmVkIGxlbmd0aCB7IDAgfTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0 LmNwcAppbmRleCA5MzFmNWYzMzA3YTA3ZjNlYjQ4NWJjOTM2NTAxMTg5ZGJmZjcxNzc3Li4zNjhl YmU0ZmM5YTE0ODczYzgwYTc4N2RlZWYyM2U5ZWEwN2YyNDY1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRl eHQuY3BwCkBAIC0yMTIsOSArMjEyLDkgQEAgTGluZUxheW91dENvbnRleHQ6OklzRW5kT2ZMaW5l IExpbmVMYXlvdXRDb250ZXh0Ojpwcm9jZXNzVW5jb21taXR0ZWRDb250ZW50KExpbmUKICAgICBh dXRvIGxpbmVTdGF0dXMgPSBMaW5lQnJlYWtlcjo6TGluZVN0YXR1cyB7IGxpbmUuYXZhaWxhYmxl V2lkdGgoKSwgbGluZS50cmFpbGluZ1RyaW1tYWJsZVdpZHRoKCksIGxpbmUuaXNUcmFpbGluZ1J1 bkZ1bGx5VHJpbW1hYmxlKCksIGxpbmVJc0NvbnNpZGVyZWRFbXB0eSB9OwogICAgIGF1dG8gYnJl YWtpbmdDb250ZXh0ID0gbGluZUJyZWFrZXIuYnJlYWtpbmdDb250ZXh0Rm9ySW5saW5lQ29udGVu dChtX3VuY29tbWl0dGVkQ29udGVudCwgbGluZVN0YXR1cyk7CiAgICAgLy8gVGhlIHVuY29tbWl0 dGVkIGNvbnRlbnQgY2FuIGZ1bGx5LCBwYXJ0aWFsbHkgZml0IHRoZSBjdXJyZW50IGxpbmUgKGNv bW1pdC9wYXJ0aWFsIGNvbW1pdCkgb3Igbm90IGF0IGFsbCAocmVzZXQpLgotICAgIGlmIChicmVh a2luZ0NvbnRleHQuY29udGVudEJyZWFrID09IExpbmVCcmVha2VyOjpCcmVha2luZ0NvbnRleHQ6 OkNvbnRlbnRCcmVhazo6S2VlcCkKKyAgICBpZiAoYnJlYWtpbmdDb250ZXh0LmNvbnRlbnRXcmFw cGluZ1J1bGUgPT0gTGluZUJyZWFrZXI6OkJyZWFraW5nQ29udGV4dDo6Q29udGVudFdyYXBwaW5n UnVsZTo6S2VlcCkKICAgICAgICAgY29tbWl0UGVuZGluZ0NvbnRlbnQobGluZSk7Ci0gICAgZWxz ZSBpZiAoYnJlYWtpbmdDb250ZXh0LmNvbnRlbnRCcmVhayA9PSBMaW5lQnJlYWtlcjo6QnJlYWtp bmdDb250ZXh0OjpDb250ZW50QnJlYWs6OlNwbGl0KSB7CisgICAgZWxzZSBpZiAoYnJlYWtpbmdD b250ZXh0LmNvbnRlbnRXcmFwcGluZ1J1bGUgPT0gTGluZUJyZWFrZXI6OkJyZWFraW5nQ29udGV4 dDo6Q29udGVudFdyYXBwaW5nUnVsZTo6U3BsaXQpIHsKICAgICAgICAgQVNTRVJUKGJyZWFraW5n Q29udGV4dC5wYXJ0aWFsVHJhaWxpbmdDb250ZW50KTsKICAgICAgICAgQVNTRVJUKG1fdW5jb21t aXR0ZWRDb250ZW50LnJ1bnMoKVticmVha2luZ0NvbnRleHQucGFydGlhbFRyYWlsaW5nQ29udGVu dC0+cnVuSW5kZXhdLmlubGluZUl0ZW0uaXNUZXh0KCkpOwogICAgICAgICAvLyBUdXJuIHRoZSB1 bmNvbW1pdHRlZCB0cmFpbGluZyBydW4gaW50byBhIHBhcnRpYWwgdHJhaWxpbmcgcnVuLgpAQCAt MjMwLDEzICsyMzAsMTMgQEAgTGluZUxheW91dENvbnRleHQ6OklzRW5kT2ZMaW5lIExpbmVMYXlv dXRDb250ZXh0Ojpwcm9jZXNzVW5jb21taXR0ZWRDb250ZW50KExpbmUKICAgICAgICAgbV91bmNv bW1pdHRlZENvbnRlbnQudHJpbShvdmVyZmxvd0lubGluZVRleHRJdGVtSW5kZXgpOwogICAgICAg ICBtX3VuY29tbWl0dGVkQ29udGVudC5hcHBlbmQoKm1fcGFydGlhbFRyYWlsaW5nVGV4dEl0ZW0s IGJyZWFraW5nQ29udGV4dC5wYXJ0aWFsVHJhaWxpbmdDb250ZW50LT5sb2dpY2FsV2lkdGgpOwog ICAgICAgICBjb21taXRQZW5kaW5nQ29udGVudChsaW5lKTsKLSAgICB9IGVsc2UgaWYgKGJyZWFr aW5nQ29udGV4dC5jb250ZW50QnJlYWsgPT0gTGluZUJyZWFrZXI6OkJyZWFraW5nQ29udGV4dDo6 Q29udGVudEJyZWFrOjpXcmFwKQorICAgIH0gZWxzZSBpZiAoYnJlYWtpbmdDb250ZXh0LmNvbnRl bnRXcmFwcGluZ1J1bGUgPT0gTGluZUJyZWFrZXI6OkJyZWFraW5nQ29udGV4dDo6Q29udGVudFdy YXBwaW5nUnVsZTo6UHVzaCkKICAgICAgICAgbV91bmNvbW1pdHRlZENvbnRlbnQucmVzZXQoKTsK ICAgICBlbHNlCiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIC8vIEFkanVzdCBo eXBoZW5hdGVkIGxpbmUgY291bnQKICAgICBtX3N1Y2Nlc3NpdmVIeXBoZW5hdGVkTGluZUNvdW50 ID0gYnJlYWtpbmdDb250ZXh0LnBhcnRpYWxUcmFpbGluZ0NvbnRlbnQgJiYgYnJlYWtpbmdDb250 ZXh0LnBhcnRpYWxUcmFpbGluZ0NvbnRlbnQtPm5lZWRzSHlwaGVuID8gbV9zdWNjZXNzaXZlSHlw aGVuYXRlZExpbmVDb3VudCArIDEgOiAwOwotICAgIHJldHVybiBicmVha2luZ0NvbnRleHQuY29u dGVudEJyZWFrID09IExpbmVCcmVha2VyOjpCcmVha2luZ0NvbnRleHQ6OkNvbnRlbnRCcmVhazo6 S2VlcCA/IElzRW5kT2ZMaW5lOjpObyA6SXNFbmRPZkxpbmU6OlllczsKKyAgICByZXR1cm4gYnJl YWtpbmdDb250ZXh0LmNvbnRlbnRXcmFwcGluZ1J1bGUgPT0gTGluZUJyZWFrZXI6OkJyZWFraW5n Q29udGV4dDo6Q29udGVudFdyYXBwaW5nUnVsZTo6S2VlcCA/IElzRW5kT2ZMaW5lOjpObyA6SXNF bmRPZkxpbmU6OlllczsKIH0KIAogfQo=