261745 2023-09-19 08:47:45 -0700 [IFC][Ruby] Only inline axis layout needs InlineItems 2023-09-19 11:39:17 -0700 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 1978297 0 zalan 2023-09-19 08:47:45 -0700 ssia 1978298 1 467752 zalan 2023-09-19 08:51:13 -0700 Created attachment 467752 [fast-cq]Patch 1978365 2 ews-feeder 2023-09-19 11:38:41 -0700 Committed 268138@main (e8f87cf56fac): <https://commits.webkit.org/268138@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 467752. 1978366 3 webkit-bug-importer 2023-09-19 11:39:17 -0700 <rdar://problem/115738070> 467752 2023-09-19 08:51:13 -0700 2023-09-19 11:38:42 -0700 [fast-cq]Patch bug-261745-20230919085112.patch text/plain 11273 zalan RnJvbSAyMmY2NmQ3ZWFiNTFiMGVlNDcyZjkzZDRiYTgyZGQ5ZmQxYmYzNjM3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFR1ZSwgMTkgU2VwIDIwMjMgMDg6NDc6NTggLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVtS dWJ5XSBPbmx5IGlubGluZSBheGlzIGxheW91dCBuZWVkcyBJbmxpbmVJdGVtcwogaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2MTc0NQoKUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCgpUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBydW5uaW5nIGJsb2NrIGF4aXMg bGF5b3V0IGZvciBydWJ5IGNvbnRlbnQgKGhlaWdodC9hbm5vdGF0aW9uIGJveCBwbGFjZW1lbnQp IHdoaWNoIGhhcHBlbnMKYWZ0ZXIgbGluZSBicmVha2luZyB3aGVyZSB3ZSBkb24ndCBoYXZlIElu bGluZUl0ZW1zIGFueW1vcmUuCgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKFdlYkNvcmU6OkxheW91dDo6TGlu ZUJ1aWxkZXI6OmhhbmRsZVJ1YnlDb250ZW50KToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5jcHA6IE1v dmUgSW5saW5lSXRlbXMgb3V0IG9mIGMndG9yLgooV2ViQ29yZTo6TGF5b3V0OjpSdWJ5Rm9ybWF0 dGluZ0NvbnRleHQ6OlJ1YnlGb3JtYXR0aW5nQ29udGV4dCk6CihXZWJDb3JlOjpMYXlvdXQ6OlJ1 YnlGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5saW5lQXhpcyk6CihXZWJDb3JlOjpMYXlvdXQ6 OlJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0UnVieUJhc2VJbmxpbmVBeGlzKToKKiBTb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9ydWJ5L1J1YnlGb3Jt YXR0aW5nQ29udGV4dC5oOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91 dEJveC5oOgooV2ViQ29yZTo6TGF5b3V0OjpCb3g6OmlzUnVieUJhc2UgY29uc3QpOgotLS0KIC4u Li9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwICAgICAgICAgICAgICB8ICAyICstCiAuLi4v aW5saW5lL3J1YnkvUnVieUZvcm1hdHRpbmdDb250ZXh0LmNwcCAgICAgfCA0MSArKysrKysrKysr Ky0tLS0tLS0tCiAuLi4vaW5saW5lL3J1YnkvUnVieUZvcm1hdHRpbmdDb250ZXh0LmggICAgICAg fCAgNyArKy0tCiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaCAg fCAgMSArCiA0IGZpbGVzIGNoYW5nZWQsIDI4IGluc2VydGlvbnMoKyksIDIzIGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCAxNGMyN2Nk NjA3ZGQuLjM4MTdmYmFjNWIzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWls ZGVyLmNwcApAQCAtMTExNCw3ICsxMTE0LDcgQEAgTGluZUJ1aWxkZXI6OlJlc3VsdCBMaW5lQnVp bGRlcjo6cHJvY2Vzc0xpbmVCcmVha2luZ1Jlc3VsdChjb25zdCBMaW5lQ2FuZGlkYXRlJgogTGlu ZUJ1aWxkZXI6OlJlc3VsdCBMaW5lQnVpbGRlcjo6aGFuZGxlUnVieUNvbnRlbnQoY29uc3QgSW5s aW5lSXRlbVJhbmdlJiBydWJ5Q29udGFpbmVyUmFuZ2UsIElubGluZUxheW91dFVuaXQgYXZhaWxh YmxlV2lkdGhGb3JDYW5kaWRhdGVDb250ZW50KQogewogICAgIEFTU0VSVChtX2lubGluZUl0ZW1z W3J1YnlDb250YWluZXJSYW5nZS5zdGFydEluZGV4KCldLmxheW91dEJveCgpLmlzUnVieSgpKTsK LSAgICBSdWJ5Rm9ybWF0dGluZ0NvbnRleHQgeyBmb3JtYXR0aW5nQ29udGV4dCgpLCBtX2lubGlu ZUl0ZW1zIH0ubGF5b3V0SW5saW5lQXhpcyhydWJ5Q29udGFpbmVyUmFuZ2UsIG1fbGluZSwgYXZh aWxhYmxlV2lkdGhGb3JDYW5kaWRhdGVDb250ZW50KTsKKyAgICBSdWJ5Rm9ybWF0dGluZ0NvbnRl eHQgeyBmb3JtYXR0aW5nQ29udGV4dCgpIH0ubGF5b3V0SW5saW5lQXhpcyhydWJ5Q29udGFpbmVy UmFuZ2UsIG1faW5saW5lSXRlbXMsIG1fbGluZSwgYXZhaWxhYmxlV2lkdGhGb3JDYW5kaWRhdGVD b250ZW50KTsKICAgICByZXR1cm4geyBJbmxpbmVDb250ZW50QnJlYWtlcjo6SXNFbmRPZkxpbmU6 Ok5vLCB7IHJ1YnlDb250YWluZXJSYW5nZS5lbmRJbmRleCgpIC0gcnVieUNvbnRhaW5lclJhbmdl LnN0YXJ0SW5kZXgoKSwgZmFsc2UgfSB9OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29u dGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggYzg2YjUzMWJiNDQ0Li5lMmZk ZmJiZmFmNmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL3J1YnkvUnVieUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0 aW5nQ29udGV4dC5jcHAKQEAgLTMxLDEzICszMSwxMiBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewog bmFtZXNwYWNlIExheW91dCB7CiAKLVJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6UnVieUZvcm1hdHRp bmdDb250ZXh0KGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBwYXJlbnRGb3JtYXR0aW5n Q29udGV4dCwgY29uc3QgSW5saW5lSXRlbXMmIGlubGluZUl0ZW1zKQorUnVieUZvcm1hdHRpbmdD b250ZXh0OjpSdWJ5Rm9ybWF0dGluZ0NvbnRleHQoY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQmIHBhcmVudEZvcm1hdHRpbmdDb250ZXh0KQogICAgIDogbV9wYXJlbnRGb3JtYXR0aW5nQ29u dGV4dChwYXJlbnRGb3JtYXR0aW5nQ29udGV4dCkKLSAgICAsIG1faW5saW5lSXRlbXMoaW5saW5l SXRlbXMpCiB7CiB9CiAKLXZvaWQgUnVieUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbmxpbmVB eGlzKGNvbnN0IElubGluZUl0ZW1SYW5nZSYgcnVieVJhbmdlLCBMaW5lJiBsaW5lLCBJbmxpbmVM YXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoKQordm9pZCBSdWJ5Rm9ybWF0dGluZ0NvbnRleHQ6Omxh eW91dElubGluZUF4aXMoY29uc3QgSW5saW5lSXRlbVJhbmdlJiBydWJ5UmFuZ2UsIGNvbnN0IElu bGluZUl0ZW1zJiBpbmxpbmVJdGVtcywgTGluZSYgbGluZSwgSW5saW5lTGF5b3V0VW5pdCBhdmFp bGFibGVXaWR0aCkKIHsKICAgICBVTlVTRURfUEFSQU0oYXZhaWxhYmxlV2lkdGgpOwogCkBAIC00 NSw3ICs0NCw3IEBAIHZvaWQgUnVieUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbmxpbmVBeGlz KGNvbnN0IElubGluZUl0ZW1SYW5nZSYgcnVieVJhbmdlLCBMCiAgICAgLy8gUnVieSBjb250YWlu ZXIgaW5saW5lIGl0ZW0gbGlzdCBpcyBhcyBmb2xsb3dzOgogICAgIC8vIFtydWJ5IGNvbnRhaW5l ciBzdGFydF1bcnVieSBiYXNlIHN0YXJ0XVtydWJ5IGJhc2UgY29udGVudF1bcnVieSBiYXNlIGVu ZF1bLi4uXVtydWJ5IGNvbnRhaW5lciBlbmRdCiAKLSAgICBhdXRvJiBydWJ5Q29udGFpbmVyU3Rh cnQgPSBtX2lubGluZUl0ZW1zW3J1YnlSYW5nZS5zdGFydEluZGV4KCldOworICAgIGF1dG8mIHJ1 YnlDb250YWluZXJTdGFydCA9IGlubGluZUl0ZW1zW3J1YnlSYW5nZS5zdGFydEluZGV4KCldOwog ICAgIGF1dG8gcnVieUNvbnRhaW5lckVuZEluZGV4ID0gcnVieVJhbmdlLmVuZEluZGV4KCkgLSAx OwogICAgIEFTU0VSVChydWJ5Q29udGFpbmVyU3RhcnQubGF5b3V0Qm94KCkuaXNSdWJ5KCkpOwog ICAgIGxpbmUuYXBwZW5kKHJ1YnlDb250YWluZXJTdGFydCwgcnVieUNvbnRhaW5lclN0YXJ0LnN0 eWxlKCksIHsgfSk7CkBAIC01NSwzNSArNTQsMzQgQEAgdm9pZCBSdWJ5Rm9ybWF0dGluZ0NvbnRl eHQ6OmxheW91dElubGluZUF4aXMoY29uc3QgSW5saW5lSXRlbVJhbmdlJiBydWJ5UmFuZ2UsIEwK ICAgICAgICAgYXV0byBoYW5kbGVSdWJ5Q29sdW1uID0gWyZdIHsKICAgICAgICAgICAgIC8vIHJ1 YnkgY29sdW1uOiByZXByZXNlbnRlZCBieSBhIHNpbmdsZSBydWJ5IGJhc2UgYW5kIG9uZSBydWJ5 IGFubm90YXRpb24KICAgICAgICAgICAgIC8vIGZyb20gZWFjaCBpbnRlcmxpbmVhciBhbm5vdGF0 aW9uIGxldmVsIGluIGl0cyBydWJ5IHNlZ21lbnQuCi0gICAgICAgICAgICBhdXRvJiBydWJ5QmFz ZVN0YXJ0ID0gbV9pbmxpbmVJdGVtc1tiYXNlQ29udGVudEluZGV4KytdOwotICAgICAgICAgICAg QVNTRVJUKHJ1YnlCYXNlU3RhcnQuc3R5bGUoKS5kaXNwbGF5KCkgPT0gRGlzcGxheVR5cGU6OlJ1 YnlCYXNlKTsKKyAgICAgICAgICAgIGF1dG8mIHJ1YnlCYXNlU3RhcnQgPSBpbmxpbmVJdGVtc1ti YXNlQ29udGVudEluZGV4KytdOworICAgICAgICAgICAgQVNTRVJUKHJ1YnlCYXNlU3RhcnQubGF5 b3V0Qm94KCkuaXNSdWJ5QmFzZSgpKTsKICAgICAgICAgICAgIGxpbmUuYXBwZW5kKHJ1YnlCYXNl U3RhcnQsIHJ1YnlCYXNlU3RhcnQuc3R5bGUoKSwgeyB9KTsKIAotICAgICAgICAgICAgYmFzZUNv bnRlbnRJbmRleCArPSBsYXlvdXRSdWJ5QmFzZUlubGluZUF4aXMobGluZSwgcnVieUJhc2VTdGFy dC5sYXlvdXRCb3goKSwgYmFzZUNvbnRlbnRJbmRleCk7CisgICAgICAgICAgICBiYXNlQ29udGVu dEluZGV4ICs9IGxheW91dFJ1YnlCYXNlSW5saW5lQXhpcyhsaW5lLCBydWJ5QmFzZVN0YXJ0Lmxh eW91dEJveCgpLCBiYXNlQ29udGVudEluZGV4LCBpbmxpbmVJdGVtcyk7CiAKLSAgICAgICAgICAg IGF1dG8mIHJ1YnlCYXNlRW5kID0gbV9pbmxpbmVJdGVtc1tiYXNlQ29udGVudEluZGV4KytdOwot ICAgICAgICAgICAgQVNTRVJUKHJ1YnlCYXNlRW5kLmxheW91dEJveCgpLnN0eWxlKCkuZGlzcGxh eSgpID09IERpc3BsYXlUeXBlOjpSdWJ5QmFzZSk7CisgICAgICAgICAgICBhdXRvJiBydWJ5QmFz ZUVuZCA9IGlubGluZUl0ZW1zW2Jhc2VDb250ZW50SW5kZXgrK107CisgICAgICAgICAgICBBU1NF UlQocnVieUJhc2VFbmQubGF5b3V0Qm94KCkuaXNSdWJ5QmFzZSgpKTsKICAgICAgICAgICAgIGxp bmUuYXBwZW5kKHJ1YnlCYXNlRW5kLCBydWJ5QmFzZUVuZC5sYXlvdXRCb3goKS5zdHlsZSgpLCB7 IH0pOwogICAgICAgICB9OwogICAgICAgICBoYW5kbGVSdWJ5Q29sdW1uKCk7CiAgICAgfQogCi0g ICAgYXV0byYgcnVieUNvbnRhaW5lckVuZCA9IG1faW5saW5lSXRlbXNbcnVieUNvbnRhaW5lckVu ZEluZGV4XTsKKyAgICBhdXRvJiBydWJ5Q29udGFpbmVyRW5kID0gaW5saW5lSXRlbXNbcnVieUNv bnRhaW5lckVuZEluZGV4XTsKICAgICBBU1NFUlQocnVieUNvbnRhaW5lckVuZC5sYXlvdXRCb3go KS5pc1J1YnkoKSk7CiAgICAgbGluZS5hcHBlbmQocnVieUNvbnRhaW5lckVuZCwgcnVieUNvbnRh aW5lckVuZC5zdHlsZSgpLCB7IH0pOwogfQogCi1zaXplX3QgUnVieUZvcm1hdHRpbmdDb250ZXh0 OjpsYXlvdXRSdWJ5QmFzZUlubGluZUF4aXMoTGluZSYgbGluZSwgY29uc3QgQm94JiBydWJ5QmFz ZUxheW91dEJveCwgc2l6ZV90IHJ1YnlCYXNlQ29udGVudFN0YXJ0KQorc2l6ZV90IFJ1YnlGb3Jt YXR0aW5nQ29udGV4dDo6bGF5b3V0UnVieUJhc2VJbmxpbmVBeGlzKExpbmUmIGxpbmUsIGNvbnN0 IEJveCYgcnVieUJhc2VMYXlvdXRCb3gsIHNpemVfdCBydWJ5QmFzZUNvbnRlbnRTdGFydEluZGV4 LCBjb25zdCBJbmxpbmVJdGVtcyYgaW5saW5lSXRlbXMpCiB7CiAgICAgLy8gQXBwZW5kIHJ1Ynkg YmFzZSBjb250ZW50IChpbmNsdWRpbmcgc3RhcnQvZW5kIGlubGluZSBib3gpIHRvIHRoZSBsaW5l IGFuZCBhcHBseSAicnVieS1hbGlnbjogc3BhY2UtYmV0d2VlbiIgb24gdGhlIHJ1Ynkgc3VicmFu Z2UuCiAgICAgYXV0byYgZm9ybWF0dGluZ0dlb21ldHJ5ID0gcGFyZW50Rm9ybWF0dGluZ0NvbnRl eHQoKS5mb3JtYXR0aW5nR2VvbWV0cnkoKTsKLSAgICBhdXRvIGFubm90YXRpb25Cb3hMb2dpY2Fs V2lkdGggPSBJbmxpbmVMYXlvdXRVbml0IHsgcnVieUJhc2VMYXlvdXRCb3guYXNzb2NpYXRlZFJ1 YnlBbm5vdGF0aW9uQm94KCkgPyBJbmxpbmVMYXlvdXRVbml0KHBhcmVudEZvcm1hdHRpbmdDb250 ZXh0KCkuZ2VvbWV0cnlGb3JCb3goKnJ1YnlCYXNlTGF5b3V0Qm94LmFzc29jaWF0ZWRSdWJ5QW5u b3RhdGlvbkJveCgpKS5tYXJnaW5Cb3hXaWR0aCgpKSA6IDAuZiB9OwogICAgIGF1dG8gbGluZUxv Z2ljYWxSaWdodCA9IGxpbmUuY29udGVudExvZ2ljYWxSaWdodCgpOwogICAgIGF1dG8gYmFzZUNv bnRlbnRMb2dpY2FsV2lkdGggPSBJbmxpbmVMYXlvdXRVbml0IHsgfTsKICAgICBhdXRvIGJhc2VS dW5TdGFydCA9IGxpbmUucnVucygpLnNpemUoKTsKIAotICAgIGZvciAoc2l6ZV90IGluZGV4ID0g cnVieUJhc2VDb250ZW50U3RhcnQ7IGluZGV4IDwgbV9pbmxpbmVJdGVtcy5zaXplKCk7ICsraW5k ZXgpIHsKLSAgICAgICAgYXV0byYgcnVieUJhc2VJbmxpbmVJdGVtID0gbV9pbmxpbmVJdGVtc1tp bmRleF07CisgICAgZm9yIChzaXplX3QgaW5kZXggPSBydWJ5QmFzZUNvbnRlbnRTdGFydEluZGV4 OyBpbmRleCA8IGlubGluZUl0ZW1zLnNpemUoKTsgKytpbmRleCkgeworICAgICAgICBhdXRvJiBy dWJ5QmFzZUlubGluZUl0ZW0gPSBpbmxpbmVJdGVtc1tpbmRleF07CiAgICAgICAgIGlmICgmcnVi eUJhc2VJbmxpbmVJdGVtLmxheW91dEJveCgpID09ICZydWJ5QmFzZUxheW91dEJveCkgewogICAg ICAgICAgICAgYXV0byBiYXNlUnVuQ291bnQgPSBsaW5lLnJ1bnMoKS5zaXplKCkgLSBiYXNlUnVu U3RhcnQ7CiAgICAgICAgICAgICBpZiAoIWJhc2VSdW5Db3VudCkgewpAQCAtOTQsNyArOTIsMTMg QEAgc2l6ZV90IFJ1YnlGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0UnVieUJhc2VJbmxpbmVBeGlz KExpbmUmIGxpbmUsIGNvbnN0IEJveCYgcnUKICAgICAgICAgICAgIC8vIGh0dHBzOi8vZHJhZnRz LmNzc3dnLm9yZy9jc3MtcnVieS8jaW50ZXJsaW5lYXItaW5saW5lCiAgICAgICAgICAgICAvLyBX aXRoaW4gZWFjaCBiYXNlIGFuZCBhbm5vdGF0aW9uIGJveCwgaG93IHRoZSBleHRyYSBzcGFjZSBp cyBkaXN0cmlidXRlZCB3aGVuIGl0cyBjb250ZW50IGlzIG5hcnJvd2VyIHRoYW4KICAgICAgICAg ICAgIC8vIHRoZSBtZWFzdXJlIG9mIHRoZSBib3ggaXMgc3BlY2lmaWVkIGJ5IGl0cyBydWJ5LWFs aWduIHByb3BlcnR5LgotICAgICAgICAgICAgaWYgKGFubm90YXRpb25Cb3hMb2dpY2FsV2lkdGgg PiBiYXNlQ29udGVudExvZ2ljYWxXaWR0aCkgeworICAgICAgICAgICAgYXV0byBhcHBseVJ1YnlB bGlnbiA9IFsmXSB7CisgICAgICAgICAgICAgICAgYXV0byogYW5ub3RhdGlvbkJveCA9IHJ1YnlC YXNlTGF5b3V0Qm94LmFzc29jaWF0ZWRSdWJ5QW5ub3RhdGlvbkJveCgpOworICAgICAgICAgICAg ICAgIGlmICghYW5ub3RhdGlvbkJveCkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICAgICAgICAgIGF1dG8gYW5ub3RhdGlvbkJveExvZ2ljYWxXaWR0aCA9IElubGluZUxheW91 dFVuaXQgeyBwYXJlbnRGb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KCphbm5vdGF0 aW9uQm94KS5tYXJnaW5Cb3hXaWR0aCgpIH07CisgICAgICAgICAgICAgICAgaWYgKGFubm90YXRp b25Cb3hMb2dpY2FsV2lkdGggPD0gYmFzZUNvbnRlbnRMb2dpY2FsV2lkdGgpCisgICAgICAgICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgICAgICBhdXRvIGJhc2VSdW5SYW5nZSA9IFdU Rjo6UmFuZ2U8c2l6ZV90PiB7IGJhc2VSdW5TdGFydCwgYmFzZVJ1blN0YXJ0ICsgYmFzZVJ1bkNv dW50IH07CiAgICAgICAgICAgICAgICAgYXV0byBleHBhbnNpb24gPSBFeHBhbnNpb25JbmZvIHsg fTsKICAgICAgICAgICAgICAgICAvLyBydWJ5LWFsaWduOiBzcGFjZS1iZXR3ZWVuCkBAIC0xMDcs MTUgKzExMSwxNiBAQCBzaXplX3QgUnVieUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRSdWJ5QmFz ZUlubGluZUF4aXMoTGluZSYgbGluZSwgY29uc3QgQm94JiBydQogICAgICAgICAgICAgICAgICAg ICBhdXRvIGNlbnRlck9mZnNldCA9IChhbm5vdGF0aW9uQm94TG9naWNhbFdpZHRoIC0gYmFzZUNv bnRlbnRMb2dpY2FsV2lkdGgpIC8gMjsKICAgICAgICAgICAgICAgICAgICAgbGluZS5tb3ZlUnVu c0J5KGNlbnRlck9mZnNldCwgYmFzZVJ1blJhbmdlLmJlZ2luKCkpOwogICAgICAgICAgICAgICAg IH0KLSAgICAgICAgICAgICAgICByZXR1cm4gaW5kZXggLSBydWJ5QmFzZUNvbnRlbnRTdGFydDsK LSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH07CisgICAgICAgICAgICBhcHBseVJ1YnlBbGln bigpOworICAgICAgICAgICAgcmV0dXJuIGluZGV4IC0gcnVieUJhc2VDb250ZW50U3RhcnRJbmRl eDsKICAgICAgICAgfQogICAgICAgICBhdXRvIGxvZ2ljYWxXaWR0aCA9IGZvcm1hdHRpbmdHZW9t ZXRyeS5pbmxpbmVJdGVtV2lkdGgocnVieUJhc2VJbmxpbmVJdGVtLCBsaW5lTG9naWNhbFJpZ2h0 ICsgYmFzZUNvbnRlbnRMb2dpY2FsV2lkdGgsIHsgfSk7CiAgICAgICAgIGxpbmUuYXBwZW5kKHJ1 YnlCYXNlSW5saW5lSXRlbSwgcnVieUJhc2VJbmxpbmVJdGVtLnN0eWxlKCksIGxvZ2ljYWxXaWR0 aCk7CiAgICAgICAgIGJhc2VDb250ZW50TG9naWNhbFdpZHRoICs9IGxvZ2ljYWxXaWR0aDsKICAg ICB9CiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgcmV0dXJuIG1faW5saW5lSXRlbXMu c2l6ZSgpIC0gcnVieUJhc2VDb250ZW50U3RhcnQ7CisgICAgcmV0dXJuIGlubGluZUl0ZW1zLnNp emUoKSAtIHJ1YnlCYXNlQ29udGVudFN0YXJ0SW5kZXg7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3J1YnkvUnVieUZv cm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IDcyNmQ1Y2YwMWQ4 MC4uMTNjMmQ5ZWNjNWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9ydWJ5L1J1YnlGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL3J1YnkvUnVieUZv cm1hdHRpbmdDb250ZXh0LmgKQEAgLTMzLDE4ICszMywxNyBAQCBzdHJ1Y3QgSW5saW5lSXRlbVJh bmdlOwogCiBjbGFzcyBSdWJ5Rm9ybWF0dGluZ0NvbnRleHQgewogcHVibGljOgotICAgIFJ1YnlG b3JtYXR0aW5nQ29udGV4dChjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgcGFyZW50Rm9y bWF0dGluZ0NvbnRleHQsIGNvbnN0IElubGluZUl0ZW1zJik7CisgICAgUnVieUZvcm1hdHRpbmdD b250ZXh0KGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBwYXJlbnRGb3JtYXR0aW5nQ29u dGV4dCk7CiAKLSAgICB2b2lkIGxheW91dElubGluZUF4aXMoY29uc3QgSW5saW5lSXRlbVJhbmdl JiwgTGluZSYsIElubGluZUxheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgpOworICAgIHZvaWQgbGF5 b3V0SW5saW5lQXhpcyhjb25zdCBJbmxpbmVJdGVtUmFuZ2UmLCBjb25zdCBJbmxpbmVJdGVtcyYs IExpbmUmLCBJbmxpbmVMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoKTsKIAogcHJpdmF0ZToKLSAg ICBzaXplX3QgbGF5b3V0UnVieUJhc2VJbmxpbmVBeGlzKExpbmUmLCBjb25zdCBCb3gmIHJ1YnlC YXNlTGF5b3V0Qm94LCBzaXplX3QgcnVieUJhc2VDb250ZW50U3RhcnQpOworICAgIHNpemVfdCBs YXlvdXRSdWJ5QmFzZUlubGluZUF4aXMoTGluZSYsIGNvbnN0IEJveCYgcnVieUJhc2VMYXlvdXRC b3gsIHNpemVfdCBydWJ5QmFzZUNvbnRlbnRTdGFydCwgY29uc3QgSW5saW5lSXRlbXMmKTsKIAog ICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBwYXJlbnRGb3JtYXR0aW5nQ29udGV4 dCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFyZW50Rm9ybWF0dGluZ0NvbnRleHQ7IH0KIAogcHJpdmF0 ZToKICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgbV9wYXJlbnRGb3JtYXR0aW5n Q29udGV4dDsKLSAgICBjb25zdCBJbmxpbmVJdGVtcyYgbV9pbmxpbmVJdGVtczsKIH07CiAKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5o IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmgKaW5kZXggNmEw MDljMThjNTk1Li5hZjU2YTlhYWQwNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9sYXlvdXR0cmVlL0xheW91dEJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlv dXR0cmVlL0xheW91dEJveC5oCkBAIC0xMjMsNiArMTIzLDcgQEAgcHVibGljOgogICAgIGJvb2wg aXNEb2N1bWVudEJveCgpIGNvbnN0IHsgcmV0dXJuIG1fbm9kZVR5cGUgPT0gTm9kZVR5cGU6OkRv Y3VtZW50RWxlbWVudDsgfQogICAgIGJvb2wgaXNCb2R5Qm94KCkgY29uc3QgeyByZXR1cm4gbV9u b2RlVHlwZSA9PSBOb2RlVHlwZTo6Qm9keTsgfQogICAgIGJvb2wgaXNSdWJ5KCkgY29uc3QgeyBy ZXR1cm4gc3R5bGUoKS5kaXNwbGF5KCkgPT0gRGlzcGxheVR5cGU6OlJ1Ynk7IH0KKyAgICBib29s IGlzUnVieUJhc2UoKSBjb25zdCB7IHJldHVybiBzdHlsZSgpLmRpc3BsYXkoKSA9PSBEaXNwbGF5 VHlwZTo6UnVieUJhc2U7IH0KICAgICBib29sIGlzVGFibGVXcmFwcGVyQm94KCkgY29uc3QgeyBy ZXR1cm4gbV9ub2RlVHlwZSA9PSBOb2RlVHlwZTo6VGFibGVXcmFwcGVyQm94OyB9CiAgICAgYm9v bCBpc1RhYmxlQm94KCkgY29uc3QgeyByZXR1cm4gbV9ub2RlVHlwZSA9PSBOb2RlVHlwZTo6VGFi bGVCb3g7IH0KICAgICBib29sIGlzVGFibGVDYXB0aW9uKCkgY29uc3QgeyByZXR1cm4gc3R5bGUo KS5kaXNwbGF5KCkgPT0gRGlzcGxheVR5cGU6OlRhYmxlQ2FwdGlvbjsgfQo=