230925 2021-09-28 16:56:59 -0700 [LFC][IFC] Use the first-line style when measuring text content when applicable 2021-09-29 16:28:19 -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 1798112 0 zalan 2021-09-28 16:56:59 -0700 ssia 1798114 1 439547 zalan 2021-09-28 17:00:05 -0700 Created attachment 439547 Patch 1798526 2 439648 zalan 2021-09-29 13:31:30 -0700 Created attachment 439648 Patch 1798663 3 ews-feeder 2021-09-29 16:27:42 -0700 Committed r283275 (242304@main): <https://commits.webkit.org/242304@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439648. 1798664 4 webkit-bug-importer 2021-09-29 16:28:19 -0700 <rdar://problem/83694108> 439547 2021-09-28 17:00:05 -0700 2021-09-29 13:31:28 -0700 Patch bug-230925-20210928170004.patch text/plain 3298 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTBkM2QwZWE1YjczYTY5 ZGE2MmNiNjU1NjhhNjRiMTQ0ZGM2YzEzZS4uNWM4NmM4MDhmYWI0MmYwODc0YzhmNjVkNjY4ZDEy YzUxOGZkNDNjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA5LTI4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFVzZSB0aGUg Zmlyc3QtbGluZSBzdHlsZSB3aGVuIG1lYXN1cmluZyB0ZXh0IGNvbnRlbnQgd2hlbiBhcHBsaWNh YmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzA5 MjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEaXNh YmxlICJzaW1wbGlmaWVkIGNvbnRlbnQgbWVhc3VyaW5nIiB3aGVuIGZpcnN0LXN0eWxlIGlzIHBy ZXNlbnQuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVy OjppbmxpbmVJdGVtV2lkdGggY29uc3QpOgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZVRleHRJdGVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6SW5saW5lVGV4dEl0ZW06OmNyZWF0ZUFuZEFwcGVuZFRleHRJdGVtcyk6CisKIDIwMjEtMDkt MjggIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10g UGFzcyBpbiB0aGUgZmlyc3QtbGluZSBzdHlsZSB0byB0aGUgSW5saW5lQ29udGVudEJyZWFrZXI6 OkNvbnRpbnVvdXNDb250ZW50IHJ1bnMgaWYgYXBwbGljYWJsZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxk ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IDM4MmM3NjQyODJjMjFhN2JmYTNjY2RiMzkyZjY3 Njc4NTc2N2FlMWYuLjNkYTIyMDM5MDhjMTg0MWUzZjY4YmFjNjY4NWViOTA2YzhmYzY3YWMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAgLTIxNyw5ICsyMTcs MTEgQEAgSW5saW5lTGF5b3V0VW5pdCBMaW5lQnVpbGRlcjo6aW5saW5lSXRlbVdpZHRoKGNvbnN0 IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIElubGkKIHsKICAgICBpZiAoaXM8SW5saW5lVGV4dEl0 ZW0+KGlubGluZUl0ZW0pKSB7CiAgICAgICAgIGF1dG8mIGlubGluZVRleHRJdGVtID0gZG93bmNh c3Q8SW5saW5lVGV4dEl0ZW0+KGlubGluZUl0ZW0pOwotICAgICAgICBhdXRvJiBmb250Q2FzY2Fk ZSA9IGlubGluZVRleHRJdGVtLmxheW91dEJveCgpLnN0eWxlKCkuZm9udENhc2NhZGUoKTsKLSAg ICAgICAgaWYgKGF1dG8gY29udGVudFdpZHRoID0gaW5saW5lVGV4dEl0ZW0ud2lkdGgoKSkKKyAg ICAgICAgaWYgKGF1dG8gY29udGVudFdpZHRoID0gaW5saW5lVGV4dEl0ZW0ud2lkdGgoKSkgewor ICAgICAgICAgICAgQVNTRVJUKGlubGluZVRleHRJdGVtLmZpcnN0TGluZVN0eWxlKCkgPT0gaW5s aW5lVGV4dEl0ZW0uc3R5bGUoKSk7CiAgICAgICAgICAgICByZXR1cm4gKmNvbnRlbnRXaWR0aDsK KyAgICAgICAgfQorICAgICAgICBhdXRvJiBmb250Q2FzY2FkZSA9IG1faXNGaXJzdExpbmUgPyBp bmxpbmVUZXh0SXRlbS5maXJzdExpbmVTdHlsZSgpLmZvbnRDYXNjYWRlKCkgOiBpbmxpbmVUZXh0 SXRlbS5zdHlsZSgpLmZvbnRDYXNjYWRlKCk7CiAgICAgICAgIGlmICghaW5saW5lVGV4dEl0ZW0u aXNXaGl0ZXNwYWNlKCkgfHwgSW5saW5lVGV4dEl0ZW06OnNob3VsZFByZXNlcnZlU3BhY2VzQW5k VGFicyhpbmxpbmVUZXh0SXRlbSkpCiAgICAgICAgICAgICByZXR1cm4gVGV4dFV0aWw6OndpZHRo KGlubGluZVRleHRJdGVtLCBmb250Q2FzY2FkZSwgY29udGVudExvZ2ljYWxMZWZ0KTsKICAgICAg ICAgcmV0dXJuIFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbSwgZm9udENhc2NhZGUsIGlu bGluZVRleHRJdGVtLnN0YXJ0KCksIGlubGluZVRleHRJdGVtLnN0YXJ0KCkgKyAxLCBjb250ZW50 TG9naWNhbExlZnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lVGV4dEl0ZW0uY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lVGV4dEl0ZW0uY3BwCmluZGV4IGRl MDdlM2UyODM5ODAzNDIyMTYyMTczYTU0MTQyMmM4ZGUyYTgzZGUuLjY1M2NlZjgzNDNlNjRhNjNh YWQzZWI0M2YxNzAxNzE1Y2Q0NTI0ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZVRleHRJdGVtLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVUZXh0SXRl bS5jcHAKQEAgLTg4LDYgKzg4LDggQEAgdm9pZCBJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlQW5kQXBw ZW5kVGV4dEl0ZW1zKElubGluZUl0ZW1zJiBpbmxpbmVDb250ZW50LCBjb25zdAogICAgIGF1dG8g aW5saW5lSXRlbVdpZHRoID0gWyZdKGF1dG8gc3RhcnRQb3NpdGlvbiwgYXV0byBsZW5ndGgpIC0+ IHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gewogICAgICAgICBpZiAoIWlubGluZVRl eHRCb3guY2FuVXNlU2ltcGxpZmllZENvbnRlbnRNZWFzdXJpbmcoKSkKICAgICAgICAgICAgIHJl dHVybiB7IH07CisgICAgICAgIGlmIChpbmxpbmVUZXh0Qm94LnN0eWxlKCkgIT0gaW5saW5lVGV4 dEJveC5maXJzdExpbmVTdHlsZSgpKQorICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAgICAgICAg cmV0dXJuIFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0Qm94LCBmb250Q2FzY2FkZSwgc3RhcnRQ b3NpdGlvbiwgc3RhcnRQb3NpdGlvbiArIGxlbmd0aCwgeyB9KTsKICAgICB9OwogCg== 439648 2021-09-29 13:31:30 -0700 2021-09-29 16:27:44 -0700 Patch bug-230925-20210929133129.patch text/plain 3298 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmFkNWJhZjMwZDJjMTM0 Yjc4Yzk3YTBjYWNmOWY0OTYwMTM4OGI4MC4uYTRiODQwZGMzODJiNGJmM2MzZTk2MDE2MWQ2OTBi NjEzYmQ0YmJkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA5LTI5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFVzZSB0aGUg Zmlyc3QtbGluZSBzdHlsZSB3aGVuIG1lYXN1cmluZyB0ZXh0IGNvbnRlbnQgd2hlbiBhcHBsaWNh YmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzA5 MjUKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBEaXNh YmxlICJzaW1wbGlmaWVkIGNvbnRlbnQgbWVhc3VyaW5nIiB3aGVuIGZpcnN0LXN0eWxlIGlzIHBy ZXNlbnQuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVy OjppbmxpbmVJdGVtV2lkdGggY29uc3QpOgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZVRleHRJdGVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6SW5saW5lVGV4dEl0ZW06OmNyZWF0ZUFuZEFwcGVuZFRleHRJdGVtcyk6CisKIDIwMjEtMDkt MjkgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10g UGFzcyBpbiB0aGUgZmlyc3QtbGluZSBzdHlsZSB0byB0aGUgSW5saW5lQ29udGVudEJyZWFrZXI6 OkNvbnRpbnVvdXNDb250ZW50IHJ1bnMgaWYgYXBwbGljYWJsZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxk ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IDM4MmM3NjQyODJjMjFhN2JmYTNjY2RiMzkyZjY3 Njc4NTc2N2FlMWYuLjNkYTIyMDM5MDhjMTg0MWUzZjY4YmFjNjY4NWViOTA2YzhmYzY3YWMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUxpbmVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAgLTIxNyw5ICsyMTcs MTEgQEAgSW5saW5lTGF5b3V0VW5pdCBMaW5lQnVpbGRlcjo6aW5saW5lSXRlbVdpZHRoKGNvbnN0 IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIElubGkKIHsKICAgICBpZiAoaXM8SW5saW5lVGV4dEl0 ZW0+KGlubGluZUl0ZW0pKSB7CiAgICAgICAgIGF1dG8mIGlubGluZVRleHRJdGVtID0gZG93bmNh c3Q8SW5saW5lVGV4dEl0ZW0+KGlubGluZUl0ZW0pOwotICAgICAgICBhdXRvJiBmb250Q2FzY2Fk ZSA9IGlubGluZVRleHRJdGVtLmxheW91dEJveCgpLnN0eWxlKCkuZm9udENhc2NhZGUoKTsKLSAg ICAgICAgaWYgKGF1dG8gY29udGVudFdpZHRoID0gaW5saW5lVGV4dEl0ZW0ud2lkdGgoKSkKKyAg ICAgICAgaWYgKGF1dG8gY29udGVudFdpZHRoID0gaW5saW5lVGV4dEl0ZW0ud2lkdGgoKSkgewor ICAgICAgICAgICAgQVNTRVJUKGlubGluZVRleHRJdGVtLmZpcnN0TGluZVN0eWxlKCkgPT0gaW5s aW5lVGV4dEl0ZW0uc3R5bGUoKSk7CiAgICAgICAgICAgICByZXR1cm4gKmNvbnRlbnRXaWR0aDsK KyAgICAgICAgfQorICAgICAgICBhdXRvJiBmb250Q2FzY2FkZSA9IG1faXNGaXJzdExpbmUgPyBp bmxpbmVUZXh0SXRlbS5maXJzdExpbmVTdHlsZSgpLmZvbnRDYXNjYWRlKCkgOiBpbmxpbmVUZXh0 SXRlbS5zdHlsZSgpLmZvbnRDYXNjYWRlKCk7CiAgICAgICAgIGlmICghaW5saW5lVGV4dEl0ZW0u aXNXaGl0ZXNwYWNlKCkgfHwgSW5saW5lVGV4dEl0ZW06OnNob3VsZFByZXNlcnZlU3BhY2VzQW5k VGFicyhpbmxpbmVUZXh0SXRlbSkpCiAgICAgICAgICAgICByZXR1cm4gVGV4dFV0aWw6OndpZHRo KGlubGluZVRleHRJdGVtLCBmb250Q2FzY2FkZSwgY29udGVudExvZ2ljYWxMZWZ0KTsKICAgICAg ICAgcmV0dXJuIFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbSwgZm9udENhc2NhZGUsIGlu bGluZVRleHRJdGVtLnN0YXJ0KCksIGlubGluZVRleHRJdGVtLnN0YXJ0KCkgKyAxLCBjb250ZW50 TG9naWNhbExlZnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lVGV4dEl0ZW0uY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lVGV4dEl0ZW0uY3BwCmluZGV4IGRl MDdlM2UyODM5ODAzNDIyMTYyMTczYTU0MTQyMmM4ZGUyYTgzZGUuLjY1M2NlZjgzNDNlNjRhNjNh YWQzZWI0M2YxNzAxNzE1Y2Q0NTI0ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZVRleHRJdGVtLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVUZXh0SXRl bS5jcHAKQEAgLTg4LDYgKzg4LDggQEAgdm9pZCBJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlQW5kQXBw ZW5kVGV4dEl0ZW1zKElubGluZUl0ZW1zJiBpbmxpbmVDb250ZW50LCBjb25zdAogICAgIGF1dG8g aW5saW5lSXRlbVdpZHRoID0gWyZdKGF1dG8gc3RhcnRQb3NpdGlvbiwgYXV0byBsZW5ndGgpIC0+ IHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gewogICAgICAgICBpZiAoIWlubGluZVRl eHRCb3guY2FuVXNlU2ltcGxpZmllZENvbnRlbnRNZWFzdXJpbmcoKSkKICAgICAgICAgICAgIHJl dHVybiB7IH07CisgICAgICAgIGlmIChpbmxpbmVUZXh0Qm94LnN0eWxlKCkgIT0gaW5saW5lVGV4 dEJveC5maXJzdExpbmVTdHlsZSgpKQorICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAgICAgICAg cmV0dXJuIFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0Qm94LCBmb250Q2FzY2FkZSwgc3RhcnRQ b3NpdGlvbiwgc3RhcnRQb3NpdGlvbiArIGxlbmd0aCwgeyB9KTsKICAgICB9OwogCg==