266155 2023-12-09 15:01:53 -0800 [IFC][Ruby] Add InlineContentAligner::applyRubyAlignOnAnnotationBox 2023-12-10 13:24:14 -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 1998354 0 zalan 2023-12-09 15:01:53 -0800 ssia 1998355 1 468958 zalan 2023-12-09 15:03:39 -0800 Created attachment 468958 Patch 1998466 2 468965 zalan 2023-12-10 09:43:54 -0800 Created attachment 468965 [fast-cq]Patch 1998506 3 ews-feeder 2023-12-10 13:23:59 -0800 Committed 271851@main (110a1df9cdb9): <https://commits.webkit.org/271851@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 468965. 1998507 4 webkit-bug-importer 2023-12-10 13:24:14 -0800 <rdar://problem/119466680> 468958 2023-12-09 15:03:39 -0800 2023-12-10 09:43:52 -0800 Patch bug-266155-20231209150339.patch text/plain 6868 zalan RnJvbSBlZDdlMzIxNTg3N2I4ZGI3Y2I4NGIyN2E0M2JlZjQxNDYwZWE3ZDEyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgOSBEZWMgMjAyMyAxNTowMjowNCAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIFtJRkNdW1J1 YnldIEFkZAogSW5saW5lQ29udGVudEFsaWduZXI6OmFwcGx5UnVieUFsaWduU3BhY2VBcm91bmRP bkFubm90YXRpb25Cb3gKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y NjYxNTUKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKVGhpcyBlbnN1cmVzICJydWJ5LWFs aWduOiBzcGFjZS1hcm91bmQiIGFsaWdubWVudCBvbiBhbm5vdGF0aW9uIGJveGVzIHVudGlsIGFm dGVyIHdlCnN3aXRjaCBvdmVyIHRvIG5vbi1pbmxpbmUtYmxvY2sgdHlwZSBvZiBhbm5vdGF0aW9u cy4KCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lQ29udGVudEFsaWduZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVDb250ZW50QWxp Z25lcjo6YXBwbHlSdWJ5QWxpZ25TcGFjZUFyb3VuZE9uQW5ub3RhdGlvbkJveCk6CiogU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEFs aWduZXIuaDoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVMaW5lQnVpbGRlci5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpw bGFjZUlubGluZUFuZEZsb2F0Q29udGVudCk6Ci0tLQogLi4uL2lubGluZS9JbmxpbmVDb250ZW50 QWxpZ25lci5jcHAgICAgICAgICAgIHwgIDcgKysrKysKIC4uLi9pbmxpbmUvSW5saW5lQ29udGVu dEFsaWduZXIuaCAgICAgICAgICAgICB8ICAyICsrCiAuLi4vaW5saW5lL0lubGluZUxpbmVCdWls ZGVyLmNwcCAgICAgICAgICAgICAgfCAzMSArKysrKysrKysrLS0tLS0tLS0tCiAzIGZpbGVzIGNo YW5nZWQsIDI2IGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRl bnRBbGlnbmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUNvbnRlbnRBbGlnbmVyLmNwcAppbmRleCA2ZTNkY2YyNjU3ZmYuLmUyM2U0 OTA5NTlmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lQ29udGVudEFsaWduZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRBbGlnbmVyLmNw cApAQCAtMjY2LDYgKzI2NiwxMyBAQCBJbmxpbmVMYXlvdXRVbml0IElubGluZUNvbnRlbnRBbGln bmVyOjphcHBseVJ1YnlBbGlnblNwYWNlQXJvdW5kKExpbmU6OlJ1bkxpc3QmCiAgICAgcmV0dXJu IGV4dHJhRXhwYW5zaW9uT3Bwb3J0dW5pdHlTcGFjZSAvIDI7CiB9CiAKK3ZvaWQgSW5saW5lQ29u dGVudEFsaWduZXI6OmFwcGx5UnVieUFsaWduU3BhY2VBcm91bmRPbkFubm90YXRpb25Cb3goTGlu ZTo6UnVuTGlzdCYgcnVucywgSW5saW5lTGF5b3V0VW5pdCBzcGFjZVRvRGlzdHJpYnV0ZSkKK3sK KyAgICBhdXRvIGNvbnRlbnRPZmZzZXQgPSBhcHBseVJ1YnlBbGlnblNwYWNlQXJvdW5kKHJ1bnMs IHsgMCwgcnVucy5zaXplKCkgfSwgc3BhY2VUb0Rpc3RyaWJ1dGUpOworICAgIGZvciAoYXV0byYg cnVuIDogcnVucykKKyAgICAgICAgcnVuLm1vdmVIb3Jpem9udGFsbHkoY29udGVudE9mZnNldCk7 Cit9CisKIHZvaWQgSW5saW5lQ29udGVudEFsaWduZXI6OmFwcGx5UnVieUJhc2VBbGlnbm1lbnRP ZmZzZXQoSW5saW5lRGlzcGxheTo6Qm94ZXMmIGRpc3BsYXlCb3hlcywgY29uc3QgSGFzaE1hcDxj b25zdCBCb3gqLCBJbmxpbmVMYXlvdXRVbml0PiYgYWxpZ25tZW50T2Zmc2V0TGlzdCwgQWRqdXN0 Q29udGVudE9ubHlJbnNpZGVSdWJ5QmFzZSBhZGp1c3RDb250ZW50T25seUluc2lkZVJ1YnlCYXNl LCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgaW5saW5lRm9ybWF0dGluZ0NvbnRleHQpCiB7CiAg ICAgQVNTRVJUKCFhbGlnbm1lbnRPZmZzZXRMaXN0LmlzRW1wdHkoKSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250 ZW50QWxpZ25lci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lQ29udGVudEFsaWduZXIuaAppbmRleCBiNTAzNmMyNjQyYTguLjdlNDdkZTY4 NjkwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lQ29udGVudEFsaWduZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QWxpZ25lci5oCkBAIC0z Myw2ICszMyw4IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgSW5saW5lTGF5b3V0VW5pdCBhcHBseVRl eHRBbGlnbkp1c3RpZnkoTGluZTo6UnVuTGlzdCYsIElubGluZUxheW91dFVuaXQgc3BhY2VUb0Rp c3RyaWJ1dGUsIHNpemVfdCBoYW5naW5nVHJhaWxpbmdXaGl0ZXNwYWNlTGVuZ3RoKTsKIAogICAg IHN0YXRpYyBJbmxpbmVMYXlvdXRVbml0IGFwcGx5UnVieUFsaWduU3BhY2VBcm91bmQoTGluZTo6 UnVuTGlzdCYsIFdURjo6UmFuZ2U8c2l6ZV90PiwgSW5saW5lTGF5b3V0VW5pdCBzcGFjZVRvRGlz dHJpYnV0ZSk7CisgICAgLy8gRklYTUU6IFRoaXMgaXMgYSB3b3JrYXJvdW5kIHVudGlsIGFmdGVy IHdlIGdlbmVyYXRlIGlubGluZSBib3hlcyBmb3IgYW5ub3RhdGlvbiBjb250ZW50LgorICAgIHN0 YXRpYyB2b2lkIGFwcGx5UnVieUFsaWduU3BhY2VBcm91bmRPbkFubm90YXRpb25Cb3goTGluZTo6 UnVuTGlzdCYsIElubGluZUxheW91dFVuaXQgc3BhY2VUb0Rpc3RyaWJ1dGUpOwogCiAgICAgZW51 bSBjbGFzcyBBZGp1c3RDb250ZW50T25seUluc2lkZVJ1YnlCYXNlIDogYm9vbCB7IE5vLCBZZXMg fTsKICAgICBzdGF0aWMgdm9pZCBhcHBseVJ1YnlCYXNlQWxpZ25tZW50T2Zmc2V0KElubGluZURp c3BsYXk6OkJveGVzJiwgY29uc3QgSGFzaE1hcDxjb25zdCBCb3gqLCBJbmxpbmVMYXlvdXRVbml0 PiYgYWxpZ25tZW50T2Zmc2V0TGlzdCwgQWRqdXN0Q29udGVudE9ubHlJbnNpZGVSdWJ5QmFzZSwg SW5saW5lRm9ybWF0dGluZ0NvbnRleHQmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVC dWlsZGVyLmNwcAppbmRleCA0ODhmOWY3YTBiMzAuLjE4NjRkNGFhYmFlYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcApAQCAtNTAzLDI3ICs1MDMsMzAgQEAgTGlu ZUNvbnRlbnQgTGluZUJ1aWxkZXI6OnBsYWNlSW5saW5lQW5kRmxvYXRDb250ZW50KGNvbnN0IElu bGluZUl0ZW1SYW5nZSYgbmVlZHMKICAgICAgICAgbV9saW5lLnJlc2V0QmlkaUxldmVsRm9yVHJh aWxpbmdXaGl0ZXNwYWNlKHJvb3RTdHlsZS5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkgPyBVQklE SV9MVFIgOiBVQklESV9SVEwpOwogCiAgICAgICAgIGlmIChtX2xpbmUuaGFzQ29udGVudCgpKSB7 Ci0gICAgICAgICAgICBhdXRvIHJ1bnNFeHBhbmRIb3Jpem9udGFsbHkgPSBbJl0geworICAgICAg ICAgICAgYXV0byBhcHBseVJ1bkJhc2VkQWxpZ25tZW50SWZBcHBsaWNhYmxlID0gWyZdIHsKICAg ICAgICAgICAgICAgICBpZiAoaXNJbkludHJpbnNpY1dpZHRoTW9kZSgpKQotICAgICAgICAgICAg ICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICAgICAgaWYgKHJvb3QoKS5pc1J1YnlB bm5vdGF0aW9uQm94KCkgJiYgcm9vdFN0eWxlLnRleHRBbGlnbigpID09IFJlbmRlclN0eWxlOjpp bml0aWFsVGV4dEFsaWduKCkpIHsKLSAgICAgICAgICAgICAgICAgICAgLy8gRklYTUU6IFRoaXMg aXMgYSB3b3JrYXJvdW5kIHVudGlsIGFmdGVyIHdlIGdlbmVyYXRlIGlubGluZSBib3hlcyBmb3Ig YW5ub3RhdGlvbiBjb250ZW50LgotICAgICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAg ICAgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICAgICAgYXV0byBzcGFjZVRv RGlzdHJpYnV0ZSA9IGhvcml6b250YWxBdmFpbGFibGVTcGFjZSAtIG1fbGluZS5jb250ZW50TG9n aWNhbFdpZHRoKCkgKyAobV9saW5lLmlzSGFuZ2luZ1RyYWlsaW5nQ29udGVudFdoaXRlc3BhY2Uo KSA/IG1fbGluZS5oYW5naW5nVHJhaWxpbmdDb250ZW50V2lkdGgoKSA6IDAuZik7CisgICAgICAg ICAgICAgICAgaWYgKHJvb3QoKS5pc1J1YnlBbm5vdGF0aW9uQm94KCkpIHsKKyAgICAgICAgICAg ICAgICAgICAgSW5saW5lQ29udGVudEFsaWduZXI6OmFwcGx5UnVieUFsaWduU3BhY2VBcm91bmRP bkFubm90YXRpb25Cb3gobV9saW5lLnJ1bnMoKSwgc3BhY2VUb0Rpc3RyaWJ1dGUpOworICAgICAg ICAgICAgICAgICAgICBtX2xpbmUuaW5mbGF0ZUNvbnRlbnRMb2dpY2FsV2lkdGgoc3BhY2VUb0Rp c3RyaWJ1dGUpOworICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgIGlmIChtX2xp bmUuaGFzUnVieUNvbnRlbnQoKSB8fCByb290KCkuaXNSdWJ5QW5ub3RhdGlvbkJveCgpKSB7Cisg ICAgICAgICAgICAgICAgICAgIGxpbmVDb250ZW50LnJ1YnlBbGlnbm1lbnRPZmZzZXRMaXN0ID0g UnVieUZvcm1hdHRpbmdDb250ZXh0OjphcHBseVJ1YnlBbGlnbihtX2xpbmUsIGZvcm1hdHRpbmdD b250ZXh0KCkpOworICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgICAgIC8vIFRleHQgaXMganVzdGlmaWVkIGFjY29yZGluZyB0byB0aGUg bWV0aG9kIHNwZWNpZmllZCBieSB0aGUgdGV4dC1qdXN0aWZ5IHByb3BlcnR5LAogICAgICAgICAg ICAgICAgIC8vIGluIG9yZGVyIHRvIGV4YWN0bHkgZmlsbCB0aGUgbGluZSBib3guIFVubGVzcyBv dGhlcndpc2Ugc3BlY2lmaWVkIGJ5IHRleHQtYWxpZ24tbGFzdCwKICAgICAgICAgICAgICAgICAv LyB0aGUgbGFzdCBsaW5lIGJlZm9yZSBhIGZvcmNlZCBicmVhayBvciB0aGUgZW5kIG9mIHRoZSBi bG9jayBpcyBzdGFydC1hbGlnbmVkLgotICAgICAgICAgICAgICAgIGlmIChpc0xhc3RMaW5lIHx8 IG1fbGluZS5ydW5zKCkubGFzdCgpLmlzTGluZUJyZWFrKCkpCi0gICAgICAgICAgICAgICAgICAg IHJldHVybiByb290U3R5bGUudGV4dEFsaWduTGFzdCgpID09IFRleHRBbGlnbkxhc3Q6Okp1c3Rp Znk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHJvb3RTdHlsZS50ZXh0QWxpZ24oKSA9PSBUZXh0 QWxpZ25Nb2RlOjpKdXN0aWZ5OwotICAgICAgICAgICAgfTsKLSAgICAgICAgICAgIGlmIChydW5z RXhwYW5kSG9yaXpvbnRhbGx5KCkpIHsKLSAgICAgICAgICAgICAgICBhdXRvIHNwYWNlVG9EaXN0 cmlidXRlID0gaG9yaXpvbnRhbEF2YWlsYWJsZVNwYWNlIC0gbV9saW5lLmNvbnRlbnRMb2dpY2Fs V2lkdGgoKSArIChtX2xpbmUuaXNIYW5naW5nVHJhaWxpbmdDb250ZW50V2hpdGVzcGFjZSgpID8g bV9saW5lLmhhbmdpbmdUcmFpbGluZ0NvbnRlbnRXaWR0aCgpIDogMC5mKTsKKyAgICAgICAgICAg ICAgICBhdXRvIGhhc1RleHRBbGlnbkp1c3RpZnkgPSAoaXNMYXN0TGluZSB8fCBtX2xpbmUucnVu cygpLmxhc3QoKS5pc0xpbmVCcmVhaygpKSA/IHJvb3RTdHlsZS50ZXh0QWxpZ25MYXN0KCkgPT0g VGV4dEFsaWduTGFzdDo6SnVzdGlmeSA6IHJvb3RTdHlsZS50ZXh0QWxpZ24oKSA9PSBUZXh0QWxp Z25Nb2RlOjpKdXN0aWZ5OworICAgICAgICAgICAgICAgIGlmICghaGFzVGV4dEFsaWduSnVzdGlm eSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIGF1dG8gYWRk aXRpb25hbFNwYWNlRm9yQWxpZ25lZENvbnRlbnQgPSBJbmxpbmVDb250ZW50QWxpZ25lcjo6YXBw bHlUZXh0QWxpZ25KdXN0aWZ5KG1fbGluZS5ydW5zKCksIHNwYWNlVG9EaXN0cmlidXRlLCBtX2xp bmUuaGFuZ2luZ1RyYWlsaW5nV2hpdGVzcGFjZUxlbmd0aCgpKTsKICAgICAgICAgICAgICAgICBt X2xpbmUuaW5mbGF0ZUNvbnRlbnRMb2dpY2FsV2lkdGgoYWRkaXRpb25hbFNwYWNlRm9yQWxpZ25l ZENvbnRlbnQpOwotICAgICAgICAgICAgfSBlbHNlIGlmIChtX2xpbmUuaGFzUnVieUNvbnRlbnQo KSkKLSAgICAgICAgICAgICAgICBsaW5lQ29udGVudC5ydWJ5QWxpZ25tZW50T2Zmc2V0TGlzdCA9 IFJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6YXBwbHlSdWJ5QWxpZ24obV9saW5lLCBmb3JtYXR0aW5n Q29udGV4dCgpKTsKLQorICAgICAgICAgICAgfTsKKyAgICAgICAgICAgIGFwcGx5UnVuQmFzZWRB bGlnbm1lbnRJZkFwcGxpY2FibGUoKTsKICAgICAgICAgICAgIGF1dG8mIGxhc3RUZXh0Q29udGVu dCA9IG1fbGluZS5ydW5zKCkubGFzdCgpLnRleHRDb250ZW50KCk7CiAgICAgICAgICAgICBsaW5l Q29udGVudC5lbmRzV2l0aEh5cGhlbiA9IGxhc3RUZXh0Q29udGVudCAmJiBsYXN0VGV4dENvbnRl bnQtPm5lZWRzSHlwaGVuOwogICAgICAgICB9Cg== 468965 2023-12-10 09:43:54 -0800 2023-12-10 13:24:00 -0800 [fast-cq]Patch bug-266155-20231210094353.patch text/plain 6933 zalan RnJvbSBjZTJhZjcwYzNjNzQ4OTQ4OWNiZTQ5N2E0YjNjZGJlYWQ1Nzk4MGZjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFNhdCwgOSBEZWMgMjAyMyAxNTowMjowNCAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIFtJRkNdW1J1 YnldIEFkZAogSW5saW5lQ29udGVudEFsaWduZXI6OmFwcGx5UnVieUFsaWduT25Bbm5vdGF0aW9u Qm94CiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjY2MTU1CgpSZXZp ZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KClRoaXMgZW5zdXJlcyB0ZXh0LWFsaWduOiBqdXN0aWZp ZWQvY2VudGVyZCBhbGlnbm1lbnQgb24gYW5ub3RhdGlvbiBib3hlcyB1bnRpbCBhZnRlciB3ZQpz d2l0Y2ggb3ZlciB0byBub24taW5saW5lLWJsb2NrIHR5cGUgb2YgYW5ub3RhdGlvbnMuCgoqIFNv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRl bnRBbGlnbmVyLmNwcDoKKFdlYkNvcmU6OkxheW91dDo6SW5saW5lQ29udGVudEFsaWduZXI6OmFw cGx5UnVieUFsaWduU3BhY2VBcm91bmRPbkFubm90YXRpb25Cb3gpOgoqIFNvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRBbGlnbmVyLmg6 CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZUJ1aWxkZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6cGxhY2VJbmxp bmVBbmRGbG9hdENvbnRlbnQpOgotLS0KIC4uLi9pbmxpbmUvSW5saW5lQ29udGVudEFsaWduZXIu Y3BwICAgICAgICAgICB8IDEyICsrKysrKysrCiAuLi4vaW5saW5lL0lubGluZUNvbnRlbnRBbGln bmVyLmggICAgICAgICAgICAgfCAgMiArKwogLi4uL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5j cHAgICAgICAgICAgICAgIHwgMjkgKysrKysrKysrKy0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2Vk LCAzMCBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QWxp Z25lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVDb250ZW50QWxpZ25lci5jcHAKaW5kZXggNmUzZGNmMjY1N2ZmLi45YTM0M2RhNjFi M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUNvbnRlbnRBbGlnbmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVDb250ZW50QWxpZ25lci5jcHAKQEAg LTI2Niw2ICsyNjYsMTggQEAgSW5saW5lTGF5b3V0VW5pdCBJbmxpbmVDb250ZW50QWxpZ25lcjo6 YXBwbHlSdWJ5QWxpZ25TcGFjZUFyb3VuZChMaW5lOjpSdW5MaXN0JgogICAgIHJldHVybiBleHRy YUV4cGFuc2lvbk9wcG9ydHVuaXR5U3BhY2UgLyAyOwogfQogCitJbmxpbmVMYXlvdXRVbml0IElu bGluZUNvbnRlbnRBbGlnbmVyOjphcHBseVJ1YnlBbGlnbk9uQW5ub3RhdGlvbkJveChMaW5lOjpS dW5MaXN0JiBydW5zLCBJbmxpbmVMYXlvdXRVbml0IHNwYWNlVG9EaXN0cmlidXRlKQoreworICAg IGF1dG8gYWNjdW11bGF0ZWRFeHBhbnNpb24gPSBhcHBseVRleHRBbGlnbkp1c3RpZnkocnVucywg c3BhY2VUb0Rpc3RyaWJ1dGUsIHsgfSk7CisgICAgaWYgKGFjY3VtdWxhdGVkRXhwYW5zaW9uKQor ICAgICAgICByZXR1cm4gYWNjdW11bGF0ZWRFeHBhbnNpb247CisKKyAgICBhdXRvIGNlbnRlck9m ZnNldCA9IHNwYWNlVG9EaXN0cmlidXRlIC8gMjsKKyAgICBmb3IgKGF1dG8mIHJ1biA6IHJ1bnMp CisgICAgICAgIHJ1bi5tb3ZlSG9yaXpvbnRhbGx5KGNlbnRlck9mZnNldCk7CisgICAgcmV0dXJu IHNwYWNlVG9EaXN0cmlidXRlOworfQorCiB2b2lkIElubGluZUNvbnRlbnRBbGlnbmVyOjphcHBs eVJ1YnlCYXNlQWxpZ25tZW50T2Zmc2V0KElubGluZURpc3BsYXk6OkJveGVzJiBkaXNwbGF5Qm94 ZXMsIGNvbnN0IEhhc2hNYXA8Y29uc3QgQm94KiwgSW5saW5lTGF5b3V0VW5pdD4mIGFsaWdubWVu dE9mZnNldExpc3QsIEFkanVzdENvbnRlbnRPbmx5SW5zaWRlUnVieUJhc2UgYWRqdXN0Q29udGVu dE9ubHlJbnNpZGVSdWJ5QmFzZSwgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlubGluZUZvcm1h dHRpbmdDb250ZXh0KQogewogICAgIEFTU0VSVCghYWxpZ25tZW50T2Zmc2V0TGlzdC5pc0VtcHR5 KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lQ29udGVudEFsaWduZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRBbGlnbmVyLmgKaW5kZXggYjUw MzZjMjY0MmE4Li41Y2Y3NjVhOWY1NDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUNvbnRlbnRBbGlnbmVyLmgKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lQ29u dGVudEFsaWduZXIuaApAQCAtMzMsNiArMzMsOCBAQCBwdWJsaWM6CiAgICAgc3RhdGljIElubGlu ZUxheW91dFVuaXQgYXBwbHlUZXh0QWxpZ25KdXN0aWZ5KExpbmU6OlJ1bkxpc3QmLCBJbmxpbmVM YXlvdXRVbml0IHNwYWNlVG9EaXN0cmlidXRlLCBzaXplX3QgaGFuZ2luZ1RyYWlsaW5nV2hpdGVz cGFjZUxlbmd0aCk7CiAKICAgICBzdGF0aWMgSW5saW5lTGF5b3V0VW5pdCBhcHBseVJ1YnlBbGln blNwYWNlQXJvdW5kKExpbmU6OlJ1bkxpc3QmLCBXVEY6OlJhbmdlPHNpemVfdD4sIElubGluZUxh eW91dFVuaXQgc3BhY2VUb0Rpc3RyaWJ1dGUpOworICAgIC8vIEZJWE1FOiBUaGlzIGlzIGEgd29y a2Fyb3VuZCB1bnRpbCBhZnRlciB3ZSBnZW5lcmF0ZSBpbmxpbmUgYm94ZXMgZm9yIGFubm90YXRp b24gY29udGVudC4KKyAgICBzdGF0aWMgSW5saW5lTGF5b3V0VW5pdCBhcHBseVJ1YnlBbGlnbk9u QW5ub3RhdGlvbkJveChMaW5lOjpSdW5MaXN0JiwgSW5saW5lTGF5b3V0VW5pdCBzcGFjZVRvRGlz dHJpYnV0ZSk7CiAKICAgICBlbnVtIGNsYXNzIEFkanVzdENvbnRlbnRPbmx5SW5zaWRlUnVieUJh c2UgOiBib29sIHsgTm8sIFllcyB9OwogICAgIHN0YXRpYyB2b2lkIGFwcGx5UnVieUJhc2VBbGln bm1lbnRPZmZzZXQoSW5saW5lRGlzcGxheTo6Qm94ZXMmLCBjb25zdCBIYXNoTWFwPGNvbnN0IEJv eCosIElubGluZUxheW91dFVuaXQ+JiBhbGlnbm1lbnRPZmZzZXRMaXN0LCBBZGp1c3RDb250ZW50 T25seUluc2lkZVJ1YnlCYXNlLCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IDQ4OGY5ZjdhMGIzMC4uNzgyMTFh NGY5MGMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC01 MDMsMjcgKzUwMywzMCBAQCBMaW5lQ29udGVudCBMaW5lQnVpbGRlcjo6cGxhY2VJbmxpbmVBbmRG bG9hdENvbnRlbnQoY29uc3QgSW5saW5lSXRlbVJhbmdlJiBuZWVkcwogICAgICAgICBtX2xpbmUu cmVzZXRCaWRpTGV2ZWxGb3JUcmFpbGluZ1doaXRlc3BhY2Uocm9vdFN0eWxlLmlzTGVmdFRvUmln aHREaXJlY3Rpb24oKSA/IFVCSURJX0xUUiA6IFVCSURJX1JUTCk7CiAKICAgICAgICAgaWYgKG1f bGluZS5oYXNDb250ZW50KCkpIHsKLSAgICAgICAgICAgIGF1dG8gcnVuc0V4cGFuZEhvcml6b250 YWxseSA9IFsmXSB7CisgICAgICAgICAgICBhdXRvIGFwcGx5UnVuQmFzZWRBbGlnbm1lbnRJZkFw cGxpY2FibGUgPSBbJl0gewogICAgICAgICAgICAgICAgIGlmIChpc0luSW50cmluc2ljV2lkdGhN b2RlKCkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgICAg ICAgICAgcmV0dXJuOworCisgICAgICAgICAgICAgICAgYXV0byBzcGFjZVRvRGlzdHJpYnV0ZSA9 IGhvcml6b250YWxBdmFpbGFibGVTcGFjZSAtIG1fbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCkg KyAobV9saW5lLmlzSGFuZ2luZ1RyYWlsaW5nQ29udGVudFdoaXRlc3BhY2UoKSA/IG1fbGluZS5o YW5naW5nVHJhaWxpbmdDb250ZW50V2lkdGgoKSA6IDAuZik7CisgICAgICAgICAgICAgICAgaWYg KG1fbGluZS5oYXNSdWJ5Q29udGVudCgpKSB7CisgICAgICAgICAgICAgICAgICAgIGxpbmVDb250 ZW50LnJ1YnlBbGlnbm1lbnRPZmZzZXRMaXN0ID0gUnVieUZvcm1hdHRpbmdDb250ZXh0OjphcHBs eVJ1YnlBbGlnbihtX2xpbmUsIGZvcm1hdHRpbmdDb250ZXh0KCkpOworICAgICAgICAgICAgICAg ICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIGlmIChyb290 KCkuaXNSdWJ5QW5ub3RhdGlvbkJveCgpICYmIHJvb3RTdHlsZS50ZXh0QWxpZ24oKSA9PSBSZW5k ZXJTdHlsZTo6aW5pdGlhbFRleHRBbGlnbigpKSB7Ci0gICAgICAgICAgICAgICAgICAgIC8vIEZJ WE1FOiBUaGlzIGlzIGEgd29ya2Fyb3VuZCB1bnRpbCBhZnRlciB3ZSBnZW5lcmF0ZSBpbmxpbmUg Ym94ZXMgZm9yIGFubm90YXRpb24gY29udGVudC4KLSAgICAgICAgICAgICAgICAgICAgcmV0dXJu IHRydWU7CisgICAgICAgICAgICAgICAgICAgIElubGluZUNvbnRlbnRBbGlnbmVyOjphcHBseVJ1 YnlBbGlnbk9uQW5ub3RhdGlvbkJveChtX2xpbmUucnVucygpLCBzcGFjZVRvRGlzdHJpYnV0ZSk7 CisgICAgICAgICAgICAgICAgICAgIG1fbGluZS5pbmZsYXRlQ29udGVudExvZ2ljYWxXaWR0aChz cGFjZVRvRGlzdHJpYnV0ZSk7CisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICAgICAgLy8gVGV4dCBpcyBqdXN0aWZpZWQgYWNjb3JkaW5n IHRvIHRoZSBtZXRob2Qgc3BlY2lmaWVkIGJ5IHRoZSB0ZXh0LWp1c3RpZnkgcHJvcGVydHksCiAg ICAgICAgICAgICAgICAgLy8gaW4gb3JkZXIgdG8gZXhhY3RseSBmaWxsIHRoZSBsaW5lIGJveC4g VW5sZXNzIG90aGVyd2lzZSBzcGVjaWZpZWQgYnkgdGV4dC1hbGlnbi1sYXN0LAogICAgICAgICAg ICAgICAgIC8vIHRoZSBsYXN0IGxpbmUgYmVmb3JlIGEgZm9yY2VkIGJyZWFrIG9yIHRoZSBlbmQg b2YgdGhlIGJsb2NrIGlzIHN0YXJ0LWFsaWduZWQuCi0gICAgICAgICAgICAgICAgaWYgKGlzTGFz dExpbmUgfHwgbV9saW5lLnJ1bnMoKS5sYXN0KCkuaXNMaW5lQnJlYWsoKSkKLSAgICAgICAgICAg ICAgICAgICAgcmV0dXJuIHJvb3RTdHlsZS50ZXh0QWxpZ25MYXN0KCkgPT0gVGV4dEFsaWduTGFz dDo6SnVzdGlmeTsKLSAgICAgICAgICAgICAgICByZXR1cm4gcm9vdFN0eWxlLnRleHRBbGlnbigp ID09IFRleHRBbGlnbk1vZGU6Okp1c3RpZnk7Ci0gICAgICAgICAgICB9OwotICAgICAgICAgICAg aWYgKHJ1bnNFeHBhbmRIb3Jpem9udGFsbHkoKSkgewotICAgICAgICAgICAgICAgIGF1dG8gc3Bh Y2VUb0Rpc3RyaWJ1dGUgPSBob3Jpem9udGFsQXZhaWxhYmxlU3BhY2UgLSBtX2xpbmUuY29udGVu dExvZ2ljYWxXaWR0aCgpICsgKG1fbGluZS5pc0hhbmdpbmdUcmFpbGluZ0NvbnRlbnRXaGl0ZXNw YWNlKCkgPyBtX2xpbmUuaGFuZ2luZ1RyYWlsaW5nQ29udGVudFdpZHRoKCkgOiAwLmYpOworICAg ICAgICAgICAgICAgIGF1dG8gaGFzVGV4dEFsaWduSnVzdGlmeSA9IChpc0xhc3RMaW5lIHx8IG1f bGluZS5ydW5zKCkubGFzdCgpLmlzTGluZUJyZWFrKCkpID8gcm9vdFN0eWxlLnRleHRBbGlnbkxh c3QoKSA9PSBUZXh0QWxpZ25MYXN0OjpKdXN0aWZ5IDogcm9vdFN0eWxlLnRleHRBbGlnbigpID09 IFRleHRBbGlnbk1vZGU6Okp1c3RpZnk7CisgICAgICAgICAgICAgICAgaWYgKCFoYXNUZXh0QWxp Z25KdXN0aWZ5KQorICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICAgICAg YXV0byBhZGRpdGlvbmFsU3BhY2VGb3JBbGlnbmVkQ29udGVudCA9IElubGluZUNvbnRlbnRBbGln bmVyOjphcHBseVRleHRBbGlnbkp1c3RpZnkobV9saW5lLnJ1bnMoKSwgc3BhY2VUb0Rpc3RyaWJ1 dGUsIG1fbGluZS5oYW5naW5nVHJhaWxpbmdXaGl0ZXNwYWNlTGVuZ3RoKCkpOwogICAgICAgICAg ICAgICAgIG1fbGluZS5pbmZsYXRlQ29udGVudExvZ2ljYWxXaWR0aChhZGRpdGlvbmFsU3BhY2VG b3JBbGlnbmVkQ29udGVudCk7Ci0gICAgICAgICAgICB9IGVsc2UgaWYgKG1fbGluZS5oYXNSdWJ5 Q29udGVudCgpKQotICAgICAgICAgICAgICAgIGxpbmVDb250ZW50LnJ1YnlBbGlnbm1lbnRPZmZz ZXRMaXN0ID0gUnVieUZvcm1hdHRpbmdDb250ZXh0OjphcHBseVJ1YnlBbGlnbihtX2xpbmUsIGZv cm1hdHRpbmdDb250ZXh0KCkpOwotCisgICAgICAgICAgICB9OworICAgICAgICAgICAgYXBwbHlS dW5CYXNlZEFsaWdubWVudElmQXBwbGljYWJsZSgpOwogICAgICAgICAgICAgYXV0byYgbGFzdFRl eHRDb250ZW50ID0gbV9saW5lLnJ1bnMoKS5sYXN0KCkudGV4dENvbnRlbnQoKTsKICAgICAgICAg ICAgIGxpbmVDb250ZW50LmVuZHNXaXRoSHlwaGVuID0gbGFzdFRleHRDb250ZW50ICYmIGxhc3RU ZXh0Q29udGVudC0+bmVlZHNIeXBoZW47CiAgICAgICAgIH0K