233404 2021-11-20 20:11:38 -0800 [LFC][IFC] Cache measured width even if canUseSimplifiedTextMeasuring is false 2021-11-21 10:34:19 -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 1817165 0 zalan 2021-11-20 20:11:38 -0800 Just because we have to use the non-simplified text measuring, it does not mean the measured width is not cacheable. 1817167 1 444913 zalan 2021-11-20 20:34:40 -0800 Created attachment 444913 Patch 1817194 2 444927 zalan 2021-11-21 09:13:52 -0800 Created attachment 444927 Patch 1817198 3 ews-feeder 2021-11-21 10:33:13 -0800 Committed r286101 (244488@main): <https://commits.webkit.org/244488@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444927. 1817200 4 webkit-bug-importer 2021-11-21 10:34:19 -0800 <rdar://problem/85647459> 444913 2021-11-20 20:34:40 -0800 2021-11-21 09:13:49 -0800 Patch bug-233404-20211120203439.patch text/plain 8066 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzkwZDMwMzA1MGUxYjhj ZjE5YWQwM2ZmYmIwMzlmYjI3MDUxNWM2Ny4uOGQzZGFiNGJjMDY3NzljNjAxYTNkMjFmODY1YWI0 YjAxMjdjMDk4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTExLTIwICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIENhY2hlIG1l YXN1cmVkIHdpZHRoIGV2ZW4gaWYgY2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcgaXMgZmFs c2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzQw NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEp1c3Qg YmVjYXVzZSBzb21lIGNvbnRlbnQgZ29lcyB0aHJvdWdoIHRoZSBub24tc2ltcGxpZmllZCB0ZXh0 IG1lYXN1cmluZyBjb2RlcGF0aCwgaXQgZG9lcyBub3QKKyAgICAgICAgbmVjZXNzYXJ5IG1lYW4g d2UgY2FuJ3QgY2FjaGUgdGhlIG1lYXN1cmVkIHZhbHVlIG9uIHRoZSBpbmxpbmUgaXRlbSAoYWN0 dWFsbHksIHdlIGNhbiBjYWNoZSB0aGVzZSB2YWx1ZXMganVzdCBmaW5lIGluIG1vc3QgY2FzZXMp LgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGJlaW5nIGFibGUgdG8gY2Fj aGUgYmlkaSBjb250ZW50IG1lYXN1cmVkIHdpZHRocy4KKworICAgICAgICAqIGxheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OmNhbkNhY2hlTWVhc3VyZWRXaWR0aE9uSW5saW5lVGV4dEl0ZW0pOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OmJyZWFrQW5kQ29t cHV0ZUJpZGlMZXZlbHMpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1 aWxkZXI6OmhhbmRsZVRleHRDb250ZW50KToKKwogMjAyMS0xMS0yMCAgQWxhbiBCdWp0YXMgIDx6 YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3VwcG9ydCBmb3IgY2Fj aGluZyBiaWRpIElubGluZVRleHRJdGVtIHdpZHRocwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUl0ZW1zQnVpbGRlci5jcHAKaW5kZXggZjFiNzUxZTFkNmNiYzQyYTk0YjI5NTIyM2Q1MzhhNmZm NDgyZjY0OC4uYzQ5ZjBlOTc0YWM1OTFmN2I0OTc3YTFmYTQ0ZTI0NzQ3ZjVmZjJjYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lSXRlbXNCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCkBAIC03NiwxMiArNzYsMjIg QEAgc3RhdGljIHVuc2lnbmVkIG1vdmVUb05leHRCcmVha2FibGVQb3NpdGlvbih1bnNpZ25lZCBz dGFydFBvc2l0aW9uLCBMYXp5TGluZUJyZWEKICAgICByZXR1cm4gdGV4dExlbmd0aCAtIHN0YXJ0 UG9zaXRpb247CiB9CiAKLXN0YXRpYyBpbmxpbmUgYm9vbCBjYW5DYWNoZU1lYXN1cmVkV2lkdGhP bklubGluZVRleHRJdGVtKGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleHRCb3gpCitzdGF0 aWMgaW5saW5lIGJvb2wgY2FuQ2FjaGVNZWFzdXJlZFdpZHRoT25JbmxpbmVUZXh0SXRlbShjb25z dCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94LCBzaXplX3Qgc3RhcnQsIHNpemVfdCBsZW5n dGgsIGJvb2wgaXNXaGl0ZXNwYWNlKQogewotICAgIC8vIEZJWE1FOiBEaXNhYmxlIHdpZHRoIGNh Y2hpbmcgZm9yIHBvc2l0aW9uIGRlcGVuZGVudCBjb250ZW50IG9ubHkuCi0gICAgaWYgKCFpbmxp bmVUZXh0Qm94LmNhblVzZVNpbXBsaWZpZWRDb250ZW50TWVhc3VyaW5nKCkpCisgICAgLy8gRG8g bm90IGNhY2hlIHdoZW46CisgICAgLy8gMS4gZmlyc3QtbGluZSBzdHlsZSdzIHVuaXF1ZSBmb250 IHByb3BlcnRpZXMgbWF5IHByb2R1Y2Ugbm9uLW1hdGNoaW5nIHdpZHRoIHZhbHVlcy4KKyAgICAv LyAyLiBwb3NpdGlvbiBkZXBlbmRlbnQgY29udGVudCBpcyBwcmVzZW50IChwcmVzZXJ2ZWQgdGFi IGNoYXJhY3RlciBhdG0pLgorICAgIGlmIChpbmxpbmVUZXh0Qm94LnN0eWxlKCkuZm9udENhc2Nh ZGUoKSAhPSBpbmxpbmVUZXh0Qm94LmZpcnN0TGluZVN0eWxlKCkuZm9udENhc2NhZGUoKSkKICAg ICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHJldHVybiBpbmxpbmVUZXh0Qm94LnN0eWxlKCkuZm9u dENhc2NhZGUoKSA9PSBpbmxpbmVUZXh0Qm94LmZpcnN0TGluZVN0eWxlKCkuZm9udENhc2NhZGUo KTsKKyAgICBpZiAoIWlzV2hpdGVzcGFjZSB8fCAhVGV4dFV0aWw6OnNob3VsZFByZXNlcnZlU3Bh Y2VzQW5kVGFicyhpbmxpbmVUZXh0Qm94KSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgLy8g RklYTUU6IEN1cnJlbnRseSB3ZSBvcHQgb3V0IG9mIGNhY2hpbmcgb25seSB3aGVuIHdlIHNlZSBh IHByZXNlcnZlZCBcdCBjaGFyYWN0ZXIgKHBvc2l0aW9uIGRlcGVuZGVudCBtZWFzdXJlZCB3aWR0 aCkuCisgICAgYXV0byB0ZXh0Q29udGVudCA9IGlubGluZVRleHRCb3guY29udGVudCgpOworICAg IGZvciAoYXV0byBpbmRleCA9IHN0YXJ0OyBpbmRleCA8IHN0YXJ0ICsgbGVuZ3RoOyArK2luZGV4 KSB7CisgICAgICAgIGlmICh0ZXh0Q29udGVudFtpbmRleF0gPT0gdGFiQ2hhcmFjdGVyKQorICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogSW5s aW5lSXRlbXNCdWlsZGVyOjpJbmxpbmVJdGVtc0J1aWxkZXIoY29uc3QgQ29udGFpbmVyQm94JiBm b3JtYXR0aW5nQ29udGV4dFJvb3QsIElubGluZUZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0 YXRlKQpAQCAtMzExLDcgKzMyMSw3IEBAIHZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpicmVha0Fu ZENvbXB1dGVCaWRpTGV2ZWxzKElubGluZUl0ZW1zJiBpbmxpbmVJdGVtcykKICAgICAgICAgICAg ICAgICAvLyBDaGVjayBpZiB0aGlzIHRleHQgaXRlbSBpcyBvbiBiaWRpIGJvdW5kYXJ5IGFuZCBu ZWVkcyBzcGxpdHRpbmcuCiAgICAgICAgICAgICAgICAgYXV0byYgaW5saW5lVGV4dEl0ZW0gPSBk b3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oaW5saW5lSXRlbSk7CiAgICAgICAgICAgICAgICAgYXV0 byB3aWR0aCA9IFsmXShhdXRvIHN0YXJ0UG9zaXRpb24sIGF1dG8gbGVuZ3RoKSAtPiBzdGQ6Om9w dGlvbmFsPElubGluZUxheW91dFVuaXQ+IHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKCFjYW5D YWNoZU1lYXN1cmVkV2lkdGhPbklubGluZVRleHRJdGVtKGlubGluZVRleHRJdGVtLmlubGluZVRl eHRCb3goKSkpCisgICAgICAgICAgICAgICAgICAgIGlmICghY2FuQ2FjaGVNZWFzdXJlZFdpZHRo T25JbmxpbmVUZXh0SXRlbShpbmxpbmVUZXh0SXRlbS5pbmxpbmVUZXh0Qm94KCksIHN0YXJ0UG9z aXRpb24sIGxlbmd0aCwgaW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkpKQogICAgICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIFRl eHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbSwgaW5saW5lVGV4dEl0ZW0uc3R5bGUoKS5mb250 Q2FzY2FkZSgpLCBzdGFydFBvc2l0aW9uLCBzdGFydFBvc2l0aW9uICsgbGVuZ3RoLCB7IH0pOwog ICAgICAgICAgICAgICAgIH07CkBAIC0zODcsNiArMzk3LDcgQEAgdm9pZCBJbmxpbmVJdGVtc0J1 aWxkZXI6OmhhbmRsZVRleHRDb250ZW50KGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleHRC b3gsIEkKIAogICAgIGF1dG8mIHN0eWxlID0gaW5saW5lVGV4dEJveC5zdHlsZSgpOwogICAgIGF1 dG8mIGZvbnRDYXNjYWRlID0gc3R5bGUuZm9udENhc2NhZGUoKTsKKyAgICBhdXRvIHdoaXRlU3Bh Y2VXaWR0aCA9IHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4geyBmb250Q2FzY2FkZS5z cGFjZVdpZHRoKCkgfTsKICAgICBhdXRvIHNob3VsZFByZXNlcnZlU3BhY2VzQW5kVGFicyA9IFRl eHRVdGlsOjpzaG91bGRQcmVzZXJ2ZVNwYWNlc0FuZFRhYnMoaW5saW5lVGV4dEJveCk7CiAgICAg YXV0byB3aGl0ZXNwYWNlQ29udGVudElzVHJlYXRlZEFzU2luZ2xlU3BhY2UgPSAhc2hvdWxkUHJl c2VydmVTcGFjZXNBbmRUYWJzOwogICAgIGF1dG8gc2hvdWxkUHJlc2VydmVOZXdsaW5lID0gVGV4 dFV0aWw6OnNob3VsZFByZXNlcnZlTmV3bGluZShpbmxpbmVUZXh0Qm94KTsKQEAgLTM5NCwxMyAr NDA1LDYgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRsZVRleHRDb250ZW50KGNvbnN0 IElubGluZVRleHRCb3gmIGlubGluZVRleHRCb3gsIEkKICAgICBhdXRvIGxpbmVCcmVha0l0ZXJh dG9yID0gTGF6eUxpbmVCcmVha0l0ZXJhdG9yIHsgdGV4dCwgc3R5bGUuY29tcHV0ZWRMb2NhbGUo KSwgVGV4dFV0aWw6OmxpbmVCcmVha0l0ZXJhdG9yTW9kZShzdHlsZS5saW5lQnJlYWsoKSkgfTsK ICAgICB1bnNpZ25lZCBjdXJyZW50UG9zaXRpb24gPSAwOwogCi0gICAgYXV0byB0ZXh0V2lkdGgg PSBbJl0oYXV0byBzdGFydFBvc2l0aW9uLCBhdXRvIGxlbmd0aCkgLT4gc3RkOjpvcHRpb25hbDxJ bmxpbmVMYXlvdXRVbml0PiB7Ci0gICAgICAgIC8vIERlbGF5IGNvbnRlbnQgbWVhc3VyaW5nIHVu dGlsIGFmdGVyIGJpZGkgc3BsaXQuCi0gICAgICAgIGlmIChoYXNTZWVuQmlkaUNvbnRlbnQoKSB8 fCAhY2FuQ2FjaGVNZWFzdXJlZFdpZHRoT25JbmxpbmVUZXh0SXRlbShpbmxpbmVUZXh0Qm94KSkK LSAgICAgICAgICAgIHJldHVybiB7IH07Ci0gICAgICAgIHJldHVybiBUZXh0VXRpbDo6d2lkdGgo aW5saW5lVGV4dEJveCwgZm9udENhc2NhZGUsIHN0YXJ0UG9zaXRpb24sIHN0YXJ0UG9zaXRpb24g KyBsZW5ndGgsIHsgfSk7Ci0gICAgfTsKLQogICAgIHdoaWxlIChjdXJyZW50UG9zaXRpb24gPCBj b250ZW50TGVuZ3RoKSB7CiAgICAgICAgIGF1dG8gaGFuZGxlU2VnbWVudEJyZWFrID0gWyZdIHsK ICAgICAgICAgICAgIC8vIFNlZ21lbnQgYnJlYWtzIHdpdGggcHJlc2VydmUgbmV3IGxpbmUgc3R5 bGUgKHdoaXRlLXNwYWNlOiBwcmUsIHByZS13cmFwLCBicmVhay1zcGFjZXMgYW5kIHByZS1saW5l KSBjb21wdXRlIHRvIGZvcmNlZCBsaW5lIGJyZWFrLgpAQCAtNDIxLDggKzQyNSwxMyBAQCB2b2lk IElubGluZUl0ZW1zQnVpbGRlcjo6aGFuZGxlVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEJv eCYgaW5saW5lVGV4dEJveCwgSQogCiAgICAgICAgICAgICBBU1NFUlQod2hpdGVzcGFjZUNvbnRl bnQtPmxlbmd0aCk7CiAgICAgICAgICAgICBhdXRvIGFwcGVuZFdoaXRlc3BhY2VJdGVtID0gWyZd IChhdXRvIHN0YXJ0UG9zaXRpb24sIGF1dG8gaXRlbUxlbmd0aCkgewotICAgICAgICAgICAgICAg IGF1dG8gc2ltcGxlU2luZ2xlV2hpdGVzcGFjZUNvbnRlbnQgPSBpbmxpbmVUZXh0Qm94LmNhblVz ZVNpbXBsaWZpZWRDb250ZW50TWVhc3VyaW5nKCkgJiYgKGl0ZW1MZW5ndGggPT0gMSB8fCB3aGl0 ZXNwYWNlQ29udGVudElzVHJlYXRlZEFzU2luZ2xlU3BhY2UpOwotICAgICAgICAgICAgICAgIGF1 dG8gd2lkdGggPSBzaW1wbGVTaW5nbGVXaGl0ZXNwYWNlQ29udGVudCA/IHN0ZDo6bWFrZV9vcHRp b25hbChJbmxpbmVMYXlvdXRVbml0IHsgZm9udENhc2NhZGUuc3BhY2VXaWR0aCgpIH0pIDogdGV4 dFdpZHRoKHN0YXJ0UG9zaXRpb24sIGl0ZW1MZW5ndGgpOworICAgICAgICAgICAgICAgIGF1dG8g d2lkdGggPSBbJl0oKSAtPiBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IHsKKyAgICAg ICAgICAgICAgICAgICAgaWYgKCFjYW5DYWNoZU1lYXN1cmVkV2lkdGhPbklubGluZVRleHRJdGVt KGlubGluZVRleHRCb3gsIHN0YXJ0UG9zaXRpb24sIGl0ZW1MZW5ndGgsIHRydWUpKQorICAgICAg ICAgICAgICAgICAgICAgICAgcmV0dXJuIHsgfTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHdo aXRlc3BhY2VDb250ZW50SXNUcmVhdGVkQXNTaW5nbGVTcGFjZSB8fCAoaXRlbUxlbmd0aCA9PSAx ICYmIGlubGluZVRleHRCb3guY2FuVXNlU2ltcGxpZmllZENvbnRlbnRNZWFzdXJpbmcoKSkpCisg ICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gd2hpdGVTcGFjZVdpZHRoOworICAgICAgICAg ICAgICAgICAgICByZXR1cm4gVGV4dFV0aWw6OndpZHRoKGlubGluZVRleHRCb3gsIGZvbnRDYXNj YWRlLCBzdGFydFBvc2l0aW9uLCBzdGFydFBvc2l0aW9uICsgaXRlbUxlbmd0aCwgeyB9KTsKKyAg ICAgICAgICAgICAgICB9KCk7CiAgICAgICAgICAgICAgICAgaW5saW5lSXRlbXMuYXBwZW5kKElu bGluZVRleHRJdGVtOjpjcmVhdGVXaGl0ZXNwYWNlSXRlbShpbmxpbmVUZXh0Qm94LCBzdGFydFBv c2l0aW9uLCBpdGVtTGVuZ3RoLCBVQklESV9ERUZBVUxUX0xUUiwgd2hpdGVzcGFjZUNvbnRlbnQt PmlzV29yZFNlcGFyYXRvciwgd2lkdGgpKTsKICAgICAgICAgICAgIH07CiAgICAgICAgICAgICBp ZiAoc3R5bGUud2hpdGVTcGFjZSgpID09IFdoaXRlU3BhY2U6OkJyZWFrU3BhY2VzKSB7CkBAIC00 NTUsOCArNDY0LDE0IEBAIHZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpoYW5kbGVUZXh0Q29udGVu dChjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94LCBJCiAgICAgICAgICAgICAgICAg aGFzVHJhaWxpbmdTb2Z0SHlwaGVuID0gdGV4dFtlbmRQb3NpdGlvbiAtIDFdID09IHNvZnRIeXBo ZW47CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBBU1NFUlRfSU1QTElFUyhzdHlsZS5oeXBo ZW5zKCkgPT0gSHlwaGVuczo6Tm9uZSwgIWhhc1RyYWlsaW5nU29mdEh5cGhlbik7Ci0gICAgICAg ICAgICBhdXRvIGlubGluZUl0ZW1MZW5ndGggPSBlbmRQb3NpdGlvbiAtIHN0YXJ0UG9zaXRpb247 Ci0gICAgICAgICAgICBpbmxpbmVJdGVtcy5hcHBlbmQoSW5saW5lVGV4dEl0ZW06OmNyZWF0ZU5v bldoaXRlc3BhY2VJdGVtKGlubGluZVRleHRCb3gsIHN0YXJ0UG9zaXRpb24sIGlubGluZUl0ZW1M ZW5ndGgsIFVCSURJX0RFRkFVTFRfTFRSLCBoYXNUcmFpbGluZ1NvZnRIeXBoZW4sIHRleHRXaWR0 aChzdGFydFBvc2l0aW9uLCBpbmxpbmVJdGVtTGVuZ3RoKSkpOworICAgICAgICAgICAgYXV0byBs ZW5ndGggPSBlbmRQb3NpdGlvbiAtIHN0YXJ0UG9zaXRpb247CisgICAgICAgICAgICBhdXRvIHRl eHRXaWR0aCA9IFsmXSgpIC0+IHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4geworICAg ICAgICAgICAgICAgIC8vIERlbGF5IG5vbi13aGl0ZXNwYWNlIGNvbnRlbnQgbWVhc3VyaW5nIHVu dGlsIGFmdGVyIGJpZGkgc3BsaXQuCisgICAgICAgICAgICAgICAgaWYgKGhhc1NlZW5CaWRpQ29u dGVudCgpIHx8ICFjYW5DYWNoZU1lYXN1cmVkV2lkdGhPbklubGluZVRleHRJdGVtKGlubGluZVRl eHRCb3gsIHN0YXJ0UG9zaXRpb24sIGxlbmd0aCwgZmFsc2UpKQorICAgICAgICAgICAgICAgICAg ICByZXR1cm4geyB9OworICAgICAgICAgICAgICAgIHJldHVybiBUZXh0VXRpbDo6d2lkdGgoaW5s aW5lVGV4dEJveCwgZm9udENhc2NhZGUsIHN0YXJ0UG9zaXRpb24sIGVuZFBvc2l0aW9uLCB7IH0p OworICAgICAgICAgICAgfSgpOworICAgICAgICAgICAgaW5saW5lSXRlbXMuYXBwZW5kKElubGlu ZVRleHRJdGVtOjpjcmVhdGVOb25XaGl0ZXNwYWNlSXRlbShpbmxpbmVUZXh0Qm94LCBzdGFydFBv c2l0aW9uLCBsZW5ndGgsIFVCSURJX0RFRkFVTFRfTFRSLCBoYXNUcmFpbGluZ1NvZnRIeXBoZW4s IHRleHRXaWR0aCkpOwogICAgICAgICAgICAgY3VycmVudFBvc2l0aW9uID0gZW5kUG9zaXRpb247 CiAKICAgICAgICAgICAgIHJldHVybiB0cnVlOwo= 444927 2021-11-21 09:13:52 -0800 2021-11-21 10:33:14 -0800 Patch bug-233404-20211121091351.patch text/plain 7207 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MDk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTM5YmU1NzY4NjNkN2M2 Njg4ZTgyNDk4MDhhODlkOGU4Njk0YzJiYy4uZTA3YjMxYmQ2MDNjZTJlZWFiYmZjYjliNWJkNzNj OTc4YTEzZTkwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTExLTIxICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIENhY2hlIG1l YXN1cmVkIHdpZHRoIGV2ZW4gaWYgY2FuVXNlU2ltcGxpZmllZFRleHRNZWFzdXJpbmcgaXMgZmFs c2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzQw NAorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIEp1c3Qg YmVjYXVzZSBzb21lIGNvbnRlbnQgZ29lcyB0aHJvdWdoIHRoZSBub24tc2ltcGxpZmllZCB0ZXh0 IG1lYXN1cmluZyBjb2RlcGF0aCwgaXQgZG9lcyBub3QKKyAgICAgICAgbmVjZXNzYXJ5IG1lYW4g d2UgY2FuJ3QgY2FjaGUgdGhlIG1lYXN1cmVkIHZhbHVlIG9uIHRoZSBpbmxpbmUgaXRlbSAoYWN0 dWFsbHksIHdlIGNhbiBjYWNoZSB0aGVzZSB2YWx1ZXMganVzdCBmaW5lIGluIG1vc3QgY2FzZXMp LgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGJlaW5nIGFibGUgdG8gY2Fj aGUgYmlkaSBjb250ZW50IG1lYXN1cmVkIHdpZHRocy4KKworICAgICAgICAqIGxheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OmNhbkNhY2hlTWVhc3VyZWRXaWR0aE9uSW5saW5lVGV4dEl0ZW0pOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRsZVRleHRD b250ZW50KToKKwogMjAyMS0xMS0yMSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0xGQ11bSUZDXSBJbnRyb2R1Y2UgY2FuQ2FjaGVNZWFzdXJlZFdpZHRoT25Jbmxp bmVUZXh0SXRlbQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAKaW5k ZXggNWU2MGFiMzJjZTNmNzFkYzVmZjkzNDdkMzRlYTM0NTEyN2M5ZjEyYi4uOTRmMTU4MWUyMzFh MzFiMDEzOWE3ZTYzODA4MGU1MDJlODdlNWU0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVJdGVtc0J1aWxkZXIuY3BwCkBAIC0zNDksMTIgKzM0OSwyMiBAQCB2b2lkIElubGluZUl0ZW1z QnVpbGRlcjo6YnJlYWtBbmRDb21wdXRlQmlkaUxldmVscyhJbmxpbmVJdGVtcyYgaW5saW5lSXRl bXMpCiAgICAgc2V0QmlkaUxldmVsRm9yT3BhcXVlSW5saW5lSXRlbXMoKTsKIH0KIAotc3RhdGlj IGlubGluZSBib29sIGNhbkNhY2hlTWVhc3VyZWRXaWR0aE9uSW5saW5lVGV4dEl0ZW0oY29uc3Qg SW5saW5lVGV4dEJveCYgaW5saW5lVGV4dEJveCkKK3N0YXRpYyBpbmxpbmUgYm9vbCBjYW5DYWNo ZU1lYXN1cmVkV2lkdGhPbklubGluZVRleHRJdGVtKGNvbnN0IElubGluZVRleHRCb3gmIGlubGlu ZVRleHRCb3gsIHNpemVfdCBzdGFydCwgc2l6ZV90IGxlbmd0aCwgYm9vbCBpc1doaXRlc3BhY2Up CiB7Ci0gICAgLy8gRklYTUU6IERpc2FibGUgd2lkdGggY2FjaGluZyBmb3IgcG9zaXRpb24gZGVw ZW5kZW50IGNvbnRlbnQgb25seS4KLSAgICBpZiAoIWlubGluZVRleHRCb3guY2FuVXNlU2ltcGxp ZmllZENvbnRlbnRNZWFzdXJpbmcoKSkKKyAgICAvLyBEbyBub3QgY2FjaGUgd2hlbjoKKyAgICAv LyAxLiBmaXJzdC1saW5lIHN0eWxlJ3MgdW5pcXVlIGZvbnQgcHJvcGVydGllcyBtYXkgcHJvZHVj ZSBub24tbWF0Y2hpbmcgd2lkdGggdmFsdWVzLgorICAgIC8vIDIuIHBvc2l0aW9uIGRlcGVuZGVu dCBjb250ZW50IGlzIHByZXNlbnQgKHByZXNlcnZlZCB0YWIgY2hhcmFjdGVyIGF0bSkuCisgICAg aWYgKGlubGluZVRleHRCb3guc3R5bGUoKS5mb250Q2FzY2FkZSgpICE9IGlubGluZVRleHRCb3gu Zmlyc3RMaW5lU3R5bGUoKS5mb250Q2FzY2FkZSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0g ICAgcmV0dXJuIGlubGluZVRleHRCb3guc3R5bGUoKS5mb250Q2FzY2FkZSgpID09IGlubGluZVRl eHRCb3guZmlyc3RMaW5lU3R5bGUoKS5mb250Q2FzY2FkZSgpOworICAgIGlmICghaXNXaGl0ZXNw YWNlIHx8ICFUZXh0VXRpbDo6c2hvdWxkUHJlc2VydmVTcGFjZXNBbmRUYWJzKGlubGluZVRleHRC b3gpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAvLyBGSVhNRTogQ3VycmVudGx5IHdlIG9w dCBvdXQgb2YgY2FjaGluZyBvbmx5IHdoZW4gd2Ugc2VlIGEgcHJlc2VydmVkIFx0IGNoYXJhY3Rl ciAocG9zaXRpb24gZGVwZW5kZW50IG1lYXN1cmVkIHdpZHRoKS4KKyAgICBhdXRvIHRleHRDb250 ZW50ID0gaW5saW5lVGV4dEJveC5jb250ZW50KCk7CisgICAgZm9yIChhdXRvIGluZGV4ID0gc3Rh cnQ7IGluZGV4IDwgc3RhcnQgKyBsZW5ndGg7ICsraW5kZXgpIHsKKyAgICAgICAgaWYgKHRleHRD b250ZW50W2luZGV4XSA9PSB0YWJDaGFyYWN0ZXIpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgfQorICAgIHJldHVybiB0cnVlOwogfQogCiB2b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6 aGFuZGxlVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEJveCYgaW5saW5lVGV4dEJveCwgSW5s aW5lSXRlbXMmIGlubGluZUl0ZW1zKQpAQCAtMzY5LDYgKzM3OSw3IEBAIHZvaWQgSW5saW5lSXRl bXNCdWlsZGVyOjpoYW5kbGVUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVU ZXh0Qm94LCBJCiAKICAgICBhdXRvJiBzdHlsZSA9IGlubGluZVRleHRCb3guc3R5bGUoKTsKICAg ICBhdXRvJiBmb250Q2FzY2FkZSA9IHN0eWxlLmZvbnRDYXNjYWRlKCk7CisgICAgYXV0byB3aGl0 ZVNwYWNlV2lkdGggPSBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IHsgZm9udENhc2Nh ZGUuc3BhY2VXaWR0aCgpIH07CiAgICAgYXV0byBzaG91bGRQcmVzZXJ2ZVNwYWNlc0FuZFRhYnMg PSBUZXh0VXRpbDo6c2hvdWxkUHJlc2VydmVTcGFjZXNBbmRUYWJzKGlubGluZVRleHRCb3gpOwog ICAgIGF1dG8gd2hpdGVzcGFjZUNvbnRlbnRJc1RyZWF0ZWRBc1NpbmdsZVNwYWNlID0gIXNob3Vs ZFByZXNlcnZlU3BhY2VzQW5kVGFiczsKICAgICBhdXRvIHNob3VsZFByZXNlcnZlTmV3bGluZSA9 IFRleHRVdGlsOjpzaG91bGRQcmVzZXJ2ZU5ld2xpbmUoaW5saW5lVGV4dEJveCk7CkBAIC0zNzYs MTMgKzM4Nyw2IEBAIHZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpoYW5kbGVUZXh0Q29udGVudChj b25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94LCBJCiAgICAgYXV0byBsaW5lQnJlYWtJ dGVyYXRvciA9IExhenlMaW5lQnJlYWtJdGVyYXRvciB7IHRleHQsIHN0eWxlLmNvbXB1dGVkTG9j YWxlKCksIFRleHRVdGlsOjpsaW5lQnJlYWtJdGVyYXRvck1vZGUoc3R5bGUubGluZUJyZWFrKCkp IH07CiAgICAgdW5zaWduZWQgY3VycmVudFBvc2l0aW9uID0gMDsKIAotICAgIGF1dG8gdGV4dFdp ZHRoID0gWyZdKGF1dG8gc3RhcnRQb3NpdGlvbiwgYXV0byBsZW5ndGgpIC0+IHN0ZDo6b3B0aW9u YWw8SW5saW5lTGF5b3V0VW5pdD4gewotICAgICAgICAvLyBEZWxheSBjb250ZW50IG1lYXN1cmlu ZyB1bnRpbCBhZnRlciBiaWRpIHNwbGl0LgotICAgICAgICBpZiAoaGFzU2VlbkJpZGlDb250ZW50 KCkgfHwgIWNhbkNhY2hlTWVhc3VyZWRXaWR0aE9uSW5saW5lVGV4dEl0ZW0oaW5saW5lVGV4dEJv eCkpCi0gICAgICAgICAgICByZXR1cm4geyB9OwotICAgICAgICByZXR1cm4gVGV4dFV0aWw6Ondp ZHRoKGlubGluZVRleHRCb3gsIGZvbnRDYXNjYWRlLCBzdGFydFBvc2l0aW9uLCBzdGFydFBvc2l0 aW9uICsgbGVuZ3RoLCB7IH0pOwotICAgIH07Ci0KICAgICB3aGlsZSAoY3VycmVudFBvc2l0aW9u IDwgY29udGVudExlbmd0aCkgewogICAgICAgICBhdXRvIGhhbmRsZVNlZ21lbnRCcmVhayA9IFsm XSB7CiAgICAgICAgICAgICAvLyBTZWdtZW50IGJyZWFrcyB3aXRoIHByZXNlcnZlIG5ldyBsaW5l IHN0eWxlICh3aGl0ZS1zcGFjZTogcHJlLCBwcmUtd3JhcCwgYnJlYWstc3BhY2VzIGFuZCBwcmUt bGluZSkgY29tcHV0ZSB0byBmb3JjZWQgbGluZSBicmVhay4KQEAgLTQwMyw4ICs0MDcsMTMgQEAg dm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRsZVRleHRDb250ZW50KGNvbnN0IElubGluZVRl eHRCb3gmIGlubGluZVRleHRCb3gsIEkKIAogICAgICAgICAgICAgQVNTRVJUKHdoaXRlc3BhY2VD b250ZW50LT5sZW5ndGgpOwogICAgICAgICAgICAgYXV0byBhcHBlbmRXaGl0ZXNwYWNlSXRlbSA9 IFsmXSAoYXV0byBzdGFydFBvc2l0aW9uLCBhdXRvIGl0ZW1MZW5ndGgpIHsKLSAgICAgICAgICAg ICAgICBhdXRvIHNpbXBsZVNpbmdsZVdoaXRlc3BhY2VDb250ZW50ID0gaW5saW5lVGV4dEJveC5j YW5Vc2VTaW1wbGlmaWVkQ29udGVudE1lYXN1cmluZygpICYmIChpdGVtTGVuZ3RoID09IDEgfHwg d2hpdGVzcGFjZUNvbnRlbnRJc1RyZWF0ZWRBc1NpbmdsZVNwYWNlKTsKLSAgICAgICAgICAgICAg ICBhdXRvIHdpZHRoID0gc2ltcGxlU2luZ2xlV2hpdGVzcGFjZUNvbnRlbnQgPyBzdGQ6Om1ha2Vf b3B0aW9uYWwoSW5saW5lTGF5b3V0VW5pdCB7IGZvbnRDYXNjYWRlLnNwYWNlV2lkdGgoKSB9KSA6 IHRleHRXaWR0aChzdGFydFBvc2l0aW9uLCBpdGVtTGVuZ3RoKTsKKyAgICAgICAgICAgICAgICBh dXRvIHdpZHRoID0gWyZdKCkgLT4gc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB7Cisg ICAgICAgICAgICAgICAgICAgIGlmICghY2FuQ2FjaGVNZWFzdXJlZFdpZHRoT25JbmxpbmVUZXh0 SXRlbShpbmxpbmVUZXh0Qm94LCBzdGFydFBvc2l0aW9uLCBpdGVtTGVuZ3RoLCB0cnVlKSkKKyAg ICAgICAgICAgICAgICAgICAgICAgIHJldHVybiB7IH07CisgICAgICAgICAgICAgICAgICAgIGlm ICh3aGl0ZXNwYWNlQ29udGVudElzVHJlYXRlZEFzU2luZ2xlU3BhY2UgfHwgKGl0ZW1MZW5ndGgg PT0gMSAmJiBpbmxpbmVUZXh0Qm94LmNhblVzZVNpbXBsaWZpZWRDb250ZW50TWVhc3VyaW5nKCkp KQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHdoaXRlU3BhY2VXaWR0aDsKKyAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0Qm94LCBmb250 Q2FzY2FkZSwgc3RhcnRQb3NpdGlvbiwgc3RhcnRQb3NpdGlvbiArIGl0ZW1MZW5ndGgsIHsgfSk7 CisgICAgICAgICAgICAgICAgfSgpOwogICAgICAgICAgICAgICAgIGlubGluZUl0ZW1zLmFwcGVu ZChJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlV2hpdGVzcGFjZUl0ZW0oaW5saW5lVGV4dEJveCwgc3Rh cnRQb3NpdGlvbiwgaXRlbUxlbmd0aCwgVUJJRElfREVGQVVMVF9MVFIsIHdoaXRlc3BhY2VDb250 ZW50LT5pc1dvcmRTZXBhcmF0b3IsIHdpZHRoKSk7CiAgICAgICAgICAgICB9OwogICAgICAgICAg ICAgaWYgKHN0eWxlLndoaXRlU3BhY2UoKSA9PSBXaGl0ZVNwYWNlOjpCcmVha1NwYWNlcykgewpA QCAtNDM3LDEwICs0NDYsMTUgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRsZVRleHRD b250ZW50KGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleHRCb3gsIEkKICAgICAgICAgICAg ICAgICBoYXNUcmFpbGluZ1NvZnRIeXBoZW4gPSB0ZXh0W2VuZFBvc2l0aW9uIC0gMV0gPT0gc29m dEh5cGhlbjsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIEFTU0VSVF9JTVBMSUVTKHN0eWxl Lmh5cGhlbnMoKSA9PSBIeXBoZW5zOjpOb25lLCAhaGFzVHJhaWxpbmdTb2Z0SHlwaGVuKTsKLSAg ICAgICAgICAgIGF1dG8gaW5saW5lSXRlbUxlbmd0aCA9IGVuZFBvc2l0aW9uIC0gc3RhcnRQb3Np dGlvbjsKLSAgICAgICAgICAgIGlubGluZUl0ZW1zLmFwcGVuZChJbmxpbmVUZXh0SXRlbTo6Y3Jl YXRlTm9uV2hpdGVzcGFjZUl0ZW0oaW5saW5lVGV4dEJveCwgc3RhcnRQb3NpdGlvbiwgaW5saW5l SXRlbUxlbmd0aCwgVUJJRElfREVGQVVMVF9MVFIsIGhhc1RyYWlsaW5nU29mdEh5cGhlbiwgdGV4 dFdpZHRoKHN0YXJ0UG9zaXRpb24sIGlubGluZUl0ZW1MZW5ndGgpKSk7CisgICAgICAgICAgICBh dXRvIGxlbmd0aCA9IGVuZFBvc2l0aW9uIC0gc3RhcnRQb3NpdGlvbjsKKyAgICAgICAgICAgIGF1 dG8gdGV4dFdpZHRoID0gWyZdKCkgLT4gc3RkOjpvcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB7 CisgICAgICAgICAgICAgICAgLy8gRGVsYXkgbm9uLXdoaXRlc3BhY2UgY29udGVudCBtZWFzdXJp bmcgdW50aWwgYWZ0ZXIgYmlkaSBzcGxpdC4KKyAgICAgICAgICAgICAgICBpZiAoaGFzU2VlbkJp ZGlDb250ZW50KCkgfHwgIWNhbkNhY2hlTWVhc3VyZWRXaWR0aE9uSW5saW5lVGV4dEl0ZW0oaW5s aW5lVGV4dEJveCwgc3RhcnRQb3NpdGlvbiwgbGVuZ3RoLCBmYWxzZSkpCisgICAgICAgICAgICAg ICAgICAgIHJldHVybiB7IH07CisgICAgICAgICAgICAgICAgcmV0dXJuIFRleHRVdGlsOjp3aWR0 aChpbmxpbmVUZXh0Qm94LCBmb250Q2FzY2FkZSwgc3RhcnRQb3NpdGlvbiwgZW5kUG9zaXRpb24s IHsgfSk7CisgICAgICAgICAgICB9KCk7CisgICAgICAgICAgICBpbmxpbmVJdGVtcy5hcHBlbmQo SW5saW5lVGV4dEl0ZW06OmNyZWF0ZU5vbldoaXRlc3BhY2VJdGVtKGlubGluZVRleHRCb3gsIHN0 YXJ0UG9zaXRpb24sIGxlbmd0aCwgVUJJRElfREVGQVVMVF9MVFIsIGhhc1RyYWlsaW5nU29mdEh5 cGhlbiwgdGV4dFdpZHRoKSk7CiAgICAgICAgICAgICBjdXJyZW50UG9zaXRpb24gPSBlbmRQb3Np dGlvbjsKLQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH07CiAgICAgICAgIGlm IChoYW5kbGVOb25XaGl0ZXNwYWNlKCkpCg==