249549 2022-12-17 19:43:41 -0800 [IFC][hanging punctuation] Line::HangingTrailingContent should be able to take leading content too 2022-12-18 06:50:16 -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 1920310 0 zalan 2022-12-17 19:43:41 -0800 ssia 1920311 1 464092 zalan 2022-12-17 19:50:27 -0800 Created attachment 464092 [fast-cq]Patch 1920351 2 ews-feeder 2022-12-18 06:49:07 -0800 Committed 258065@main (c9f62c21dc06): <https://commits.webkit.org/258065@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 464092. 1920352 3 webkit-bug-importer 2022-12-18 06:50:16 -0800 <rdar://problem/103494931> 464092 2022-12-17 19:50:27 -0800 2022-12-18 06:49:08 -0800 [fast-cq]Patch bug-249549-20221217195026.patch text/plain 13737 zalan RnJvbSAxZTllZWFkNzE4Y2U5YTJhZDk4YzBlNWE5N2ZiMzgwZTVlZThlM2EyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgMTcgRGVjIDIwMjIgMTk6NDg6MDkgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVto YW5naW5nIHB1bmN0dWF0aW9uXSBMaW5lOjpIYW5naW5nVHJhaWxpbmdDb250ZW50CiBzaG91bGQg YmUgYWJsZSB0byB0YWtlIGxlYWRpbmcgY29udGVudCB0b28KIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yNDk1NDkKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoK VGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3Igc3VwcG9ydGluZyAiaGFuZ2luZy1wdW5jdHVhdGlv biIgcHJvcGVydHkuCjEuIFJlbmFtZSBMaW5lOjpIYW5naW5nVHJhaWxpbmdDb250ZW50IHRvIEhh bmdpbmdDb250ZW50LiBUaGlzIHN0cnVjdHVyZSB3aWxsIGhvbGQgYm90aApsZWFkaW5nIChwdW5j dHVhdGlvbikgYW5kIHRyYWlsaW5nIChwdW5jdHVhdGlvbiwgd2hpdGVzcGFjZSkgaGFuZ2luZyBj b250ZW50LgpObyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eSB5ZXQuCgoqIFNvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuY3BwOgooV2ViQ29y ZTo6TGF5b3V0OjpMaW5lOjpyZXNldFRyYWlsaW5nQ29udGVudCk6CihXZWJDb3JlOjpMYXlvdXQ6 OkxpbmU6OmFwcGx5UnVuRXhwYW5zaW9uKToKKFdlYkNvcmU6OkxheW91dDo6TGluZTo6cmVtb3Zl SGFuZ2luZ0dseXBocyk6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFwcGVuZFRleHRDb250ZW50 KToKKFdlYkNvcmU6OkxheW91dDo6TGluZTo6SGFuZ2luZ0NvbnRlbnQ6OmFkZExlYWRpbmdHbHlw aHMpOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpIYW5naW5nQ29udGVudDo6YWRkVHJhaWxpbmdH bHlwaHMpOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpIYW5naW5nVHJhaWxpbmdDb250ZW50Ojph ZGQpOiBEZWxldGVkLgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmUuaDoKKFdlYkNvcmU6OkxheW91dDo6TGluZTo6aGFuZ2luZ1RyYWls aW5nQ29udGVudFdpZHRoIGNvbnN0KToKKFdlYkNvcmU6OkxheW91dDo6TGluZTo6aGFuZ2luZ0xl YWRpbmdDb250ZW50V2lkdGggY29uc3QpOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpIYW5naW5n Q29udGVudDo6bGVhZGluZ0xlbmd0aCBjb25zdCk6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6Okhh bmdpbmdDb250ZW50Ojp0cmFpbGluZ0xlbmd0aCBjb25zdCk6CihXZWJDb3JlOjpMYXlvdXQ6Okxp bmU6OkhhbmdpbmdDb250ZW50OjpsZW5ndGggY29uc3QpOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5l OjpIYW5naW5nQ29udGVudDo6bGVhZGluZ1dpZHRoIGNvbnN0KToKKFdlYkNvcmU6OkxheW91dDo6 TGluZTo6SGFuZ2luZ0NvbnRlbnQ6OnRyYWlsaW5nV2lkdGggY29uc3QpOgooV2ViQ29yZTo6TGF5 b3V0OjpMaW5lOjpIYW5naW5nQ29udGVudDo6d2lkdGggY29uc3QpOgooV2ViQ29yZTo6TGF5b3V0 OjpMaW5lOjpIYW5naW5nQ29udGVudDo6cmVzZXQpOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpI YW5naW5nQ29udGVudDo6cmVzZXRUcmFpbGluZ0dseXBocyk6CihXZWJDb3JlOjpMYXlvdXQ6Okxp bmU6OkhhbmdpbmdUcmFpbGluZ0NvbnRlbnQ6Omxlbmd0aCBjb25zdCk6IERlbGV0ZWQuCihXZWJD b3JlOjpMYXlvdXQ6OkxpbmU6OkhhbmdpbmdUcmFpbGluZ0NvbnRlbnQ6OndpZHRoIGNvbnN0KTog RGVsZXRlZC4KKFdlYkNvcmU6OkxheW91dDo6TGluZTo6SGFuZ2luZ1RyYWlsaW5nQ29udGVudDo6 cmVzZXQpOiBEZWxldGVkLgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1 aWxkZXI6OmxheW91dElubGluZUNvbnRlbnQpOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRl cjo6aGFuZGxlSW5saW5lQ29udGVudCk6Ci0tLQogLi4uL2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lTGluZS5jcHAgIHwgMzYgKysrKysrKysrKy0tLS0tLS0KIC4uLi9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaCAgICB8IDQwICsrKysrKysrKysrKysrLS0tLS0K IC4uLi9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwICAgICAgICAgICAgICB8IDEyICsrKysr LQogMyBmaWxlcyBjaGFuZ2VkLCA2MCBpbnNlcnRpb25zKCspLCAyOCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVMaW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmUuY3BwCmluZGV4IGQ2MWQ1ZTZjNDU4NC4uMzg2MTVkMTFhMDQ3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVMaW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmNwcApAQCAtODQsNyArODQsNyBAQCB2b2lkIExp bmU6OmluaXRpYWxpemUoY29uc3QgVmVjdG9yPElubGluZUl0ZW0+JiBsaW5lU3Bhbm5pbmdJbmxp bmVCb3hlcykKIHZvaWQgTGluZTo6cmVzZXRUcmFpbGluZ0NvbnRlbnQoKQogewogICAgIG1fdHJp bW1hYmxlVHJhaWxpbmdDb250ZW50LnJlc2V0KCk7Ci0gICAgbV9oYW5naW5nVHJhaWxpbmdDb250 ZW50LnJlc2V0KCk7CisgICAgbV9oYW5naW5nQ29udGVudC5yZXNldFRyYWlsaW5nR2x5cGhzKCk7 CiAgICAgbV90cmFpbGluZ1NvZnRIeXBoZW5XaWR0aCA9IHsgfTsKIH0KIApAQCAtOTksNyArOTks NyBAQCB2b2lkIExpbmU6OmFwcGx5UnVuRXhwYW5zaW9uKElubGluZUxheW91dFVuaXQgaG9yaXpv bnRhbEF2YWlsYWJsZVNwYWNlKQogICAgIC8vIEEgaGFuZ2luZyBnbHlwaCBpcyBzdGlsbCBlbmNs b3NlZCBpbnNpZGUgaXRzIHBhcmVudCBpbmxpbmUgYm94IGFuZCBzdGlsbCBwYXJ0aWNpcGF0ZXMg aW4gdGV4dCBqdXN0aWZpY2F0aW9uOgogICAgIC8vIGl0cyBjaGFyYWN0ZXIgYWR2YW5jZSBpcyBq dXN0IG5vdCBtZWFzdXJlZCB3aGVuIGRldGVybWluaW5nIGhvdyBtdWNoIGNvbnRlbnQgZml0cyBv biB0aGUgbGluZSwgaG93IG11Y2ggdGhlIGxpbmXigJlzIGNvbnRlbnRzCiAgICAgLy8gbmVlZCB0 byBiZSBleHBhbmRlZCBvciBjb21wcmVzc2VkIGZvciBqdXN0aWZpY2F0aW9uLCBvciBob3cgdG8g cG9zaXRpb24gdGhlIGNvbnRlbnQgd2l0aGluIHRoZSBsaW5lIGJveCBmb3IgdGV4dCBhbGlnbm1l bnQuCi0gICAgYXV0byBzcGFjZVRvRGlzdHJpYnV0ZSA9IGhvcml6b250YWxBdmFpbGFibGVTcGFj ZSAtIGNvbnRlbnRMb2dpY2FsV2lkdGgoKSArIG1faGFuZ2luZ1RyYWlsaW5nQ29udGVudC53aWR0 aCgpOworICAgIGF1dG8gc3BhY2VUb0Rpc3RyaWJ1dGUgPSBob3Jpem9udGFsQXZhaWxhYmxlU3Bh Y2UgLSBjb250ZW50TG9naWNhbFdpZHRoKCkgKyBtX2hhbmdpbmdDb250ZW50LndpZHRoKCk7CiAg ICAgaWYgKHNwYWNlVG9EaXN0cmlidXRlIDw9IDApCiAgICAgICAgIHJldHVybjsKICAgICAvLyBD b2xsZWN0IGFuZCBkaXN0cmlidXRlIHRoZSBleHBhbnNpb24gb3Bwb3J0dW5pdGllcy4KQEAgLTEx MCwxNCArMTEwLDE0IEBAIHZvaWQgTGluZTo6YXBwbHlSdW5FeHBhbnNpb24oSW5saW5lTGF5b3V0 VW5pdCBob3Jpem9udGFsQXZhaWxhYmxlU3BhY2UpCiAKICAgICAvLyBMaW5lIHN0YXJ0IGJlaGF2 ZXMgYXMgaWYgd2UgaGFkIGFuIGV4cGFuc2lvbiBoZXJlIChpLmUuIGZpc3QgcnVucyBzaG91bGQg bm90IHN0YXJ0IHdpdGggYWxsb3dpbmcgbGVmdCBleHBhbnNpb24pLgogICAgIGF1dG8gcnVuSXNB ZnRlckV4cGFuc2lvbiA9IHRydWU7Ci0gICAgYXV0byBoYW5naW5nVHJhaWxpbmdDb250ZW50TGVu Z3RoID0gbV9oYW5naW5nVHJhaWxpbmdDb250ZW50Lmxlbmd0aCgpOworICAgIGF1dG8gaGFuZ2lu Z0NvbnRlbnRMZW5ndGggPSBtX2hhbmdpbmdDb250ZW50Lmxlbmd0aCgpOwogICAgIGZvciAoc2l6 ZV90IHJ1bkluZGV4ID0gMDsgcnVuSW5kZXggPCBtX3J1bnMuc2l6ZSgpOyArK3J1bkluZGV4KSB7 CiAgICAgICAgIGF1dG8mIHJ1biA9IG1fcnVuc1tydW5JbmRleF07CiAgICAgICAgIGF1dG8gZXhw YW5zaW9uQmVoYXZpb3IgPSBFeHBhbnNpb25CZWhhdmlvcjo6ZGVmYXVsdEJlaGF2aW9yKCk7CiAg ICAgICAgIHNpemVfdCBleHBhbnNpb25PcHBvcnR1bml0aWVzSW5SdW4gPSAwOwogCiAgICAgICAg IC8vIEZJWE1FOiBDaGVjayB3aHkgd2UgZG9uJ3QgYXBwbHkgZXhwYW5zaW9uIHdoZW4gd2hpdGVz cGFjZSBpcyBwcmVzZXJ2ZWQuCi0gICAgICAgIGlmIChydW4uaXNUZXh0KCkgJiYgKCFUZXh0VXRp bDo6c2hvdWxkUHJlc2VydmVTcGFjZXNBbmRUYWJzKHJ1bi5sYXlvdXRCb3goKSkgfHwgaGFuZ2lu Z1RyYWlsaW5nQ29udGVudExlbmd0aCkpIHsKKyAgICAgICAgaWYgKHJ1bi5pc1RleHQoKSAmJiAo IVRleHRVdGlsOjpzaG91bGRQcmVzZXJ2ZVNwYWNlc0FuZFRhYnMocnVuLmxheW91dEJveCgpKSB8 fCBoYW5naW5nQ29udGVudExlbmd0aCkpIHsKICAgICAgICAgICAgIGlmIChydW4uaGFzVGV4dENv bWJpbmUoKSkKICAgICAgICAgICAgICAgICBleHBhbnNpb25CZWhhdmlvciA9IEV4cGFuc2lvbkJl aGF2aW9yOjpmb3JiaWRBbGwoKTsKICAgICAgICAgICAgIGVsc2UgewpAQCAtMTI1LDkgKzEyNSw5 IEBAIHZvaWQgTGluZTo6YXBwbHlSdW5FeHBhbnNpb24oSW5saW5lTGF5b3V0VW5pdCBob3Jpem9u dGFsQXZhaWxhYmxlU3BhY2UpCiAgICAgICAgICAgICAgICAgZXhwYW5zaW9uQmVoYXZpb3Iucmln aHQgPSBFeHBhbnNpb25CZWhhdmlvcjo6QmVoYXZpb3I6OkFsbG93OwogICAgICAgICAgICAgICAg IGF1dG8mIHRleHRDb250ZW50ID0gKnJ1bi50ZXh0Q29udGVudCgpOwogICAgICAgICAgICAgICAg IC8vIFRyYWlsaW5nIGhhbmdpbmcgd2hpdGVzcGFjZSBzZXF1ZW5jZSBpcyBpZ25vcmVkIHdoZW4g Y29tcHV0aW5nIHRoZSBleHBhbnNpb24gb3Bwb3J0dW5pdGllcy4KLSAgICAgICAgICAgICAgICBh dXRvIGhhbmdpbmdUcmFpbGluZ0NvbnRlbnRJbkN1cnJlbnRSdW4gPSBzdGQ6Om1pbih0ZXh0Q29u dGVudC5sZW5ndGgsIGhhbmdpbmdUcmFpbGluZ0NvbnRlbnRMZW5ndGgpOwotICAgICAgICAgICAg ICAgIGF1dG8gbGVuZ3RoID0gdGV4dENvbnRlbnQubGVuZ3RoIC0gaGFuZ2luZ1RyYWlsaW5nQ29u dGVudEluQ3VycmVudFJ1bjsKLSAgICAgICAgICAgICAgICBoYW5naW5nVHJhaWxpbmdDb250ZW50 TGVuZ3RoIC09IGhhbmdpbmdUcmFpbGluZ0NvbnRlbnRJbkN1cnJlbnRSdW47CisgICAgICAgICAg ICAgICAgYXV0byBoYW5naW5nQ29udGVudEluQ3VycmVudFJ1biA9IHN0ZDo6bWluKHRleHRDb250 ZW50Lmxlbmd0aCwgaGFuZ2luZ0NvbnRlbnRMZW5ndGgpOworICAgICAgICAgICAgICAgIGF1dG8g bGVuZ3RoID0gdGV4dENvbnRlbnQubGVuZ3RoIC0gaGFuZ2luZ0NvbnRlbnRJbkN1cnJlbnRSdW47 CisgICAgICAgICAgICAgICAgaGFuZ2luZ0NvbnRlbnRMZW5ndGggLT0gaGFuZ2luZ0NvbnRlbnRJ bkN1cnJlbnRSdW47CiAgICAgICAgICAgICAgICAgc3RkOjp0aWUoZXhwYW5zaW9uT3Bwb3J0dW5p dGllc0luUnVuLCBydW5Jc0FmdGVyRXhwYW5zaW9uKSA9IEZvbnRDYXNjYWRlOjpleHBhbnNpb25P cHBvcnR1bml0eUNvdW50KFN0cmluZ1ZpZXcoZG93bmNhc3Q8SW5saW5lVGV4dEJveD4ocnVuLmxh eW91dEJveCgpKS5jb250ZW50KCkpLnN1YnN0cmluZyh0ZXh0Q29udGVudC5zdGFydCwgbGVuZ3Ro KSwgcnVuLmlubGluZURpcmVjdGlvbigpLCBleHBhbnNpb25CZWhhdmlvcik7CiAgICAgICAgICAg ICB9CiAgICAgICAgIH0gZWxzZSBpZiAocnVuLmlzQm94KCkpCkBAIC0yNTUsOCArMjU1LDggQEAg dm9pZCBMaW5lOjpoYW5kbGVPdmVyZmxvd2luZ05vbkJyZWFraW5nU3BhY2UoVHJhaWxpbmdDb250 ZW50QWN0aW9uIHRyYWlsaW5nQ29udGUKIHZvaWQgTGluZTo6cmVtb3ZlSGFuZ2luZ0dseXBocygp CiB7CiAgICAgQVNTRVJUKG1fdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50LmlzRW1wdHkoKSk7Ci0g ICAgbV9jb250ZW50TG9naWNhbFdpZHRoIC09IG1faGFuZ2luZ1RyYWlsaW5nQ29udGVudC53aWR0 aCgpOwotICAgIG1faGFuZ2luZ1RyYWlsaW5nQ29udGVudC5yZXNldCgpOworICAgIG1fY29udGVu dExvZ2ljYWxXaWR0aCAtPSBtX2hhbmdpbmdDb250ZW50LndpZHRoKCk7CisgICAgbV9oYW5naW5n Q29udGVudC5yZXNldCgpOwogfQogCiB2b2lkIExpbmU6OnJlc2V0QmlkaUxldmVsRm9yVHJhaWxp bmdXaGl0ZXNwYWNlKFVCaURpTGV2ZWwgcm9vdEJpZGlMZXZlbCkKQEAgLTQ2OCwxMCArNDY4LDEw IEBAIHZvaWQgTGluZTo6YXBwZW5kVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlu bGluZVRleHRJdGVtLCBjb25zdCBSZW5kZXJTCiAKICAgICBhdXRvIHVwZGF0ZUhhbmdpbmdTdGF0 dXMgPSBbJl0gewogICAgICAgICBpZiAoaXNUcmltbWFibGUgfHwgIWlubGluZVRleHRJdGVtLmlz V2hpdGVzcGFjZSgpIHx8ICFtX3J1bnNbbGFzdFJ1bkluZGV4XS5zaG91bGRUcmFpbGluZ1doaXRl c3BhY2VIYW5nKCkpIHsKLSAgICAgICAgICAgIG1faGFuZ2luZ1RyYWlsaW5nQ29udGVudC5yZXNl dCgpOworICAgICAgICAgICAgbV9oYW5naW5nQ29udGVudC5yZXNldFRyYWlsaW5nR2x5cGhzKCk7 CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KLSAgICAgICAgbV9oYW5naW5nVHJhaWxp bmdDb250ZW50LmFkZChpbmxpbmVUZXh0SXRlbSwgbG9naWNhbFdpZHRoKTsKKyAgICAgICAgbV9o YW5naW5nQ29udGVudC5hZGRUcmFpbGluZ0dseXBocyhpbmxpbmVUZXh0SXRlbS5sZW5ndGgoKSwg bG9naWNhbFdpZHRoKTsKICAgICB9OwogICAgIHVwZGF0ZUhhbmdpbmdTdGF0dXMoKTsKIApAQCAt NjQwLDE0ICs2NDAsMjAgQEAgSW5saW5lTGF5b3V0VW5pdCBMaW5lOjpUcmltbWFibGVUcmFpbGlu Z0NvbnRlbnQ6OnJlbW92ZVBhcnRpYWxseVRyaW1tYWJsZUNvbnRlbnQKICAgICByZXR1cm4gcmVt b3ZlKCk7CiB9CiAKLXZvaWQgTGluZTo6SGFuZ2luZ1RyYWlsaW5nQ29udGVudDo6YWRkKGNvbnN0 IElubGluZVRleHRJdGVtJiB0cmFpbGluZ1doaXRlc3BhY2UsIElubGluZUxheW91dFVuaXQgbG9n aWNhbFdpZHRoKQordm9pZCBMaW5lOjpIYW5naW5nQ29udGVudDo6YWRkTGVhZGluZ0dseXBocyhz aXplX3QgbGVuZ3RoLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCkKK3sKKyAgICAvLyBI YW5naW5nIHB1bmN0dWF0aW9uLgorICAgIG1fbGVhZGluZ0xlbmd0aCArPSBsZW5ndGg7CisgICAg bV9sZWFkaW5nV2lkdGggKz0gbG9naWNhbFdpZHRoOworfQorCit2b2lkIExpbmU6OkhhbmdpbmdD b250ZW50OjphZGRUcmFpbGluZ0dseXBocyhzaXplX3QgbGVuZ3RoLCBJbmxpbmVMYXlvdXRVbml0 IGxvZ2ljYWxXaWR0aCkKIHsKICAgICAvLyBXaGVuIGEgZ2x5cGggYXQgdGhlIHN0YXJ0IG9yIGVu ZCBlZGdlIG9mIGEgbGluZSBoYW5ncywgaXQgaXMgbm90IGNvbnNpZGVyZWQgd2hlbiBtZWFzdXJp bmcgdGhlIGxpbmXigJlzIGNvbnRlbnRzIGZvciBmaXQsIGFsaWdubWVudCwgb3IganVzdGlmaWNh dGlvbi4KICAgICAvLyBEZXBlbmRpbmcgb24gdGhlIGxpbmXigJlzIGFsaWdubWVudC9qdXN0aWZp Y2F0aW9uLCB0aGlzIGNhbiByZXN1bHQgaW4gdGhlIG1hcmsgYmVpbmcgcGxhY2VkIG91dHNpZGUg dGhlIGxpbmUgYm94LgogICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtdGV4dC0z LyNoYW5naW5nCi0gICAgQVNTRVJUKHRyYWlsaW5nV2hpdGVzcGFjZS5pc1doaXRlc3BhY2UoKSk7 Ci0gICAgbV93aWR0aCArPSBsb2dpY2FsV2lkdGg7Ci0gICAgbV9sZW5ndGggKz0gdHJhaWxpbmdX aGl0ZXNwYWNlLmxlbmd0aCgpOworICAgIG1fdHJhaWxpbmdMZW5ndGggKz0gbGVuZ3RoOworICAg IG1fdHJhaWxpbmdXaWR0aCArPSBsb2dpY2FsV2lkdGg7CiB9CiAKIGlubGluZSBzdGF0aWMgTGlu ZTo6UnVuOjpUeXBlIHRvTGluZVJ1blR5cGUoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0lubGluZUxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmUuaAppbmRleCBmMzI4ZDcwMmU0N2QuLjZkOGJmOTE1NzI2NyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lTGluZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUxpbmUuaApAQCAtNTcsNyArNTcsOCBAQCBwdWJsaWM6CiAgICAg SW5saW5lTGF5b3V0VW5pdCB0cmltbWFibGVUcmFpbGluZ1dpZHRoKCkgY29uc3QgeyByZXR1cm4g bV90cmltbWFibGVUcmFpbGluZ0NvbnRlbnQud2lkdGgoKTsgfQogICAgIGJvb2wgaXNUcmFpbGlu Z1J1bkZ1bGx5VHJpbW1hYmxlKCkgY29uc3QgeyByZXR1cm4gbV90cmltbWFibGVUcmFpbGluZ0Nv bnRlbnQuaXNUcmFpbGluZ1J1bkZ1bGx5VHJpbW1hYmxlKCk7IH0KIAotICAgIElubGluZUxheW91 dFVuaXQgaGFuZ2luZ1RyYWlsaW5nQ29udGVudFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9oYW5n aW5nVHJhaWxpbmdDb250ZW50LndpZHRoKCk7IH0KKyAgICBJbmxpbmVMYXlvdXRVbml0IGhhbmdp bmdUcmFpbGluZ0NvbnRlbnRXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1faGFuZ2luZ0NvbnRlbnQu dHJhaWxpbmdXaWR0aCgpOyB9CisgICAgSW5saW5lTGF5b3V0VW5pdCBoYW5naW5nTGVhZGluZ0Nv bnRlbnRXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1faGFuZ2luZ0NvbnRlbnQubGVhZGluZ1dpZHRo KCk7IH0KIAogICAgIHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gdHJhaWxpbmdTb2Z0 SHlwaGVuV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX3RyYWlsaW5nU29mdEh5cGhlbldpZHRoOyB9 CiAgICAgdm9pZCBhZGRUcmFpbGluZ0h5cGhlbihJbmxpbmVMYXlvdXRVbml0IGh5cGhlbkxvZ2lj YWxXaWR0aCk7CkBAIC0yMzIsMjIgKzIzMywzMiBAQCBwcml2YXRlOgogICAgICAgICBJbmxpbmVM YXlvdXRVbml0IG1fcGFydGlhbGx5VHJpbW1hYmxlV2lkdGggeyAwIH07CiAgICAgfTsKIAotICAg IHN0cnVjdCBIYW5naW5nVHJhaWxpbmdDb250ZW50IHsKLSAgICAgICAgdm9pZCBhZGQoY29uc3Qg SW5saW5lVGV4dEl0ZW0mIHRyYWlsaW5nV2hpdGVzcGFjZSwgSW5saW5lTGF5b3V0VW5pdCBsb2dp Y2FsV2lkdGgpOworICAgIHN0cnVjdCBIYW5naW5nQ29udGVudCB7CisgICAgICAgIHZvaWQgYWRk TGVhZGluZ0dseXBocyhzaXplX3QgbGVuZ3RoLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0 aCk7CisgICAgICAgIHZvaWQgYWRkVHJhaWxpbmdHbHlwaHMoc2l6ZV90IGxlbmd0aCwgSW5saW5l TGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOworCiAgICAgICAgIHZvaWQgcmVzZXQoKTsKKyAgICAg ICAgdm9pZCByZXNldFRyYWlsaW5nR2x5cGhzKCk7CisKKyAgICAgICAgc2l6ZV90IGxlYWRpbmdM ZW5ndGgoKSBjb25zdCB7IHJldHVybiBtX2xlYWRpbmdMZW5ndGg7IH0KKyAgICAgICAgc2l6ZV90 IHRyYWlsaW5nTGVuZ3RoKCkgY29uc3QgeyByZXR1cm4gbV90cmFpbGluZ0xlbmd0aDsgfQorICAg ICAgICBzaXplX3QgbGVuZ3RoKCkgY29uc3QgeyByZXR1cm4gbGVhZGluZ0xlbmd0aCgpICsgdHJh aWxpbmdMZW5ndGgoKTsgfQogCi0gICAgICAgIHNpemVfdCBsZW5ndGgoKSBjb25zdCB7IHJldHVy biBtX2xlbmd0aDsgfQotICAgICAgICBJbmxpbmVMYXlvdXRVbml0IHdpZHRoKCkgY29uc3QgeyBy ZXR1cm4gbV93aWR0aDsgfQorICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxlYWRpbmdXaWR0aCgp IGNvbnN0IHsgcmV0dXJuIG1fdHJhaWxpbmdXaWR0aDsgfQorICAgICAgICBJbmxpbmVMYXlvdXRV bml0IHRyYWlsaW5nV2lkdGgoKSBjb25zdCB7IHJldHVybiBtX2xlYWRpbmdXaWR0aDsgfQorICAg ICAgICBJbmxpbmVMYXlvdXRVbml0IHdpZHRoKCkgY29uc3QgeyByZXR1cm4gbGVhZGluZ1dpZHRo KCkgKyB0cmFpbGluZ1dpZHRoKCk7IH0KIAogICAgIHByaXZhdGU6Ci0gICAgICAgIHNpemVfdCBt X2xlbmd0aCB7IDAgfTsKLSAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBtX3dpZHRoIHsgMCB9Owor ICAgICAgICBzaXplX3QgbV9sZWFkaW5nTGVuZ3RoIHsgMCB9OworICAgICAgICBzaXplX3QgbV90 cmFpbGluZ0xlbmd0aCB7IDAgfTsKKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2xlYWRpbmdX aWR0aCB7IDAgfTsKKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBtX3RyYWlsaW5nV2lkdGggeyAw IH07CiAgICAgfTsKIAogICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBtX2lubGlu ZUZvcm1hdHRpbmdDb250ZXh0OwogICAgIFJ1bkxpc3QgbV9ydW5zOwogICAgIFRyaW1tYWJsZVRy YWlsaW5nQ29udGVudCBtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudDsKLSAgICBIYW5naW5nVHJh aWxpbmdDb250ZW50IG1faGFuZ2luZ1RyYWlsaW5nQ29udGVudDsKKyAgICBIYW5naW5nQ29udGVu dCBtX2hhbmdpbmdDb250ZW50OwogICAgIElubGluZUxheW91dFVuaXQgbV9jb250ZW50TG9naWNh bFdpZHRoIHsgMCB9OwogICAgIHNpemVfdCBtX25vblNwYW5uaW5nSW5saW5lTGV2ZWxCb3hDb3Vu dCB7IDAgfTsKICAgICBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IG1fdHJhaWxpbmdT b2Z0SHlwaGVuV2lkdGggeyAwIH07CkBAIC0yNzUsMTAgKzI4NiwxNyBAQCBpbmxpbmUgdm9pZCBM aW5lOjpUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQ6OnJlc2V0KCkKICAgICBtX3RyaW1tYWJsZUNv bnRlbnRPZmZzZXQgPSB7IH07CiB9CiAKLWlubGluZSB2b2lkIExpbmU6OkhhbmdpbmdUcmFpbGlu Z0NvbnRlbnQ6OnJlc2V0KCkKK2lubGluZSB2b2lkIExpbmU6OkhhbmdpbmdDb250ZW50OjpyZXNl dCgpCit7CisgICAgbV9sZWFkaW5nTGVuZ3RoID0geyB9OworICAgIG1fbGVhZGluZ1dpZHRoID0g eyB9OworICAgIHJlc2V0VHJhaWxpbmdHbHlwaHMoKTsKK30KKworaW5saW5lIHZvaWQgTGluZTo6 SGFuZ2luZ0NvbnRlbnQ6OnJlc2V0VHJhaWxpbmdHbHlwaHMoKQogewotICAgIG1fd2lkdGggPSB7 IH07Ci0gICAgbV9sZW5ndGggPSB7IH07CisgICAgbV90cmFpbGluZ0xlbmd0aCA9IHsgfTsKKyAg ICBtX3RyYWlsaW5nV2lkdGggPSB7IH07CiB9CiAKIGlubGluZSB2b2lkIExpbmU6OlJ1bjo6c2V0 TmVlZHNIeXBoZW4oSW5saW5lTGF5b3V0VW5pdCBoeXBoZW5Mb2dpY2FsV2lkdGgpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5kZXggNTc0NmUyMWRhMDk3Li40NWRh ZWRmOTVkMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAg LTM2NCw3ICszNjQsNyBAQCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQgTGluZUJ1aWxkZXI6Omxh eW91dElubGluZUNvbnRlbnQoY29uc3QgTGluZUlucHV0JiBsaW5lSQogICAgICAgICAsIG1fbGlu ZUxvZ2ljYWxSZWN0LndpZHRoKCkKICAgICAgICAgLCBtX2xpbmUuY29udGVudExvZ2ljYWxXaWR0 aCgpCiAgICAgICAgICwgbV9saW5lLmNvbnRlbnRMb2dpY2FsUmlnaHQoKQotICAgICAgICAsIG1f bGluZS5oYW5naW5nVHJhaWxpbmdDb250ZW50V2lkdGgoKQorICAgICAgICAsIG1fbGluZS5oYW5n aW5nTGVhZGluZ0NvbnRlbnRXaWR0aCgpICsgbV9saW5lLmhhbmdpbmdUcmFpbGluZ0NvbnRlbnRX aWR0aCgpCiAgICAgICAgICwgaXNGaXJzdExpbmUoKSA/IExpbmVDb250ZW50OjpGaXJzdEZvcm1h dHRlZExpbmU6OldpdGhpbklGQyA6IExpbmVDb250ZW50OjpGaXJzdEZvcm1hdHRlZExpbmU6Ok5v CiAgICAgICAgICwgaXNMYXN0TGluZQogICAgICAgICAsIG1fbGluZS5ub25TcGFubmluZ0lubGlu ZUxldmVsQm94Q291bnQoKQpAQCAtMTAxOCw3ICsxMDE4LDE1IEBAIExpbmVCdWlsZGVyOjpSZXN1 bHQgTGluZUJ1aWxkZXI6OmhhbmRsZUlubGluZUNvbnRlbnQoSW5saW5lQ29udGVudEJyZWFrZXIm IGlubGluCiAgICAgYXV0byBbYWRqdXN0ZWRMaW5lRm9yQ2FuZGlkYXRlQ29udGVudCwgY2FuZGlk YXRlQ29udGVudElzQ29uc3RyYWluZWRCeUZsb2F0XSA9IGxpbmVCb3hGb3JDYW5kaWRhdGVJbmxp bmVDb250ZW50KGxpbmVDYW5kaWRhdGUpOwogICAgIGF1dG8gYXZhaWxhYmxlV2lkdGhGb3JDYW5k aWRhdGVDb250ZW50ID0gYXZhaWxhYmxlV2lkdGgoaW5saW5lQ29udGVudCwgbV9saW5lLCBhZGp1 c3RlZExpbmVGb3JDYW5kaWRhdGVDb250ZW50LndpZHRoKCkpOwogICAgIGF1dG8gbGluZUlzQ29u c2lkZXJlZENvbnRlbnRmdWwgPSBtX2xpbmUuaGFzQ29udGVudCgpIHx8IG1fbGluZUlzQ29uc3Ry YWluZWRCeUZsb2F0IHx8IGNhbmRpZGF0ZUNvbnRlbnRJc0NvbnN0cmFpbmVkQnlGbG9hdDsKLSAg ICBhdXRvIGxpbmVTdGF0dXMgPSBJbmxpbmVDb250ZW50QnJlYWtlcjo6TGluZVN0YXR1cyB7IG1f bGluZS5jb250ZW50TG9naWNhbFJpZ2h0KCksIGF2YWlsYWJsZVdpZHRoRm9yQ2FuZGlkYXRlQ29u dGVudCwgdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50V2lkdGgobV9saW5lKSwgbV9saW5lLnRyYWls aW5nU29mdEh5cGhlbldpZHRoKCksIG1fbGluZS5pc1RyYWlsaW5nUnVuRnVsbHlUcmltbWFibGUo KSwgbGluZUlzQ29uc2lkZXJlZENvbnRlbnRmdWwsICFtX3dyYXBPcHBvcnR1bml0eUxpc3QuaXNF bXB0eSgpIH07CisgICAgYXV0byBsaW5lU3RhdHVzID0gSW5saW5lQ29udGVudEJyZWFrZXI6Okxp bmVTdGF0dXMgeworICAgICAgICBtX2xpbmUuY29udGVudExvZ2ljYWxSaWdodCgpLAorICAgICAg ICBhdmFpbGFibGVXaWR0aEZvckNhbmRpZGF0ZUNvbnRlbnQsCisgICAgICAgIG1fbGluZS5oYW5n aW5nTGVhZGluZ0NvbnRlbnRXaWR0aCgpICsgdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50V2lkdGgo bV9saW5lKSwKKyAgICAgICAgbV9saW5lLnRyYWlsaW5nU29mdEh5cGhlbldpZHRoKCksCisgICAg ICAgIG1fbGluZS5pc1RyYWlsaW5nUnVuRnVsbHlUcmltbWFibGUoKSwKKyAgICAgICAgbGluZUlz Q29uc2lkZXJlZENvbnRlbnRmdWwsCisgICAgICAgICFtX3dyYXBPcHBvcnR1bml0eUxpc3QuaXNF bXB0eSgpCisgICAgfTsKICAgICBhdXRvIHRvTGluZUJ1aWxkZXJSZXN1bHQgPSBbJl0oYXV0byYg bGluZUJyZWFraW5nUmVzdWx0KSAtPiBMaW5lQnVpbGRlcjo6UmVzdWx0IHsKICAgICAgICAgYXV0 byYgY2FuZGlkYXRlUnVucyA9IGNvbnRpbnVvdXNJbmxpbmVDb250ZW50LnJ1bnMoKTsKICAgICAK