205096 2019-12-10 18:38:37 -0800 [LFC][IFC] Move single whitespace measuring to TextUtil 2019-12-11 06:37:31 -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 1597478 0 zalan 2019-12-10 18:38:37 -0800 so that anyone can call it. 1597479 1 webkit-bug-importer 2019-12-10 18:39:07 -0800 <rdar://problem/57818442> 1597484 2 385338 zalan 2019-12-10 18:54:05 -0800 Created attachment 385338 Patch 1597603 3 zalan 2019-12-11 06:37:31 -0800 Committed r253370: <https://trac.webkit.org/changeset/253370> 385338 2019-12-10 18:54:05 -0800 2019-12-11 06:26:59 -0800 Patch bug-205096-20191210185404.patch text/plain 6771 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzMzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDA5Yzg2YWJiNmNjMjli ZGE4NjNmOGJlN2ZmZTUxMTQxODg1NzEzYy4uODJmNjJkNjUyYTE3MzQ5MTgyZTMwZmQwMGJkMjJm ZjY1OTFjZmUyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE5LTEyLTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIHNp bmdsZSB3aGl0ZXNwYWNlIG1lYXN1cmluZyB0byBUZXh0VXRpbAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1MDk2CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS81NzgxODQ0Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBJZiB0aGUgVGV4dFV0aWw6OndpZHRoKCkgY2FsbHNpdGVzIHBhc3MgaW4gdGhlIElu bGluZVRleHRJdGVtLCB3ZSBjYW4gZmFzdC1wYXRoIHRoZSBzaW5nbGUgd2hpdGVzcGFjZQorICAg ICAgICBjaGFyYWN0ZXIgY2FzZSAocGVyZm9ybWFuY2UpIGFuZCByZXR1cm4gd2lkdGggPCAwIChj b3JyZWN0bmVzcykgd2hlbiB3b3JkLXNwYWNpbmcgaXMgbmVnYXRpdmUuCisKKyAgICAgICAgKiBs YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCcmVha2VyOjpicmVha2luZ0NvbnRleHRGb3JJbmxpbmVDb250 ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJyZWFrZXI6OnRyeUJyZWFraW5n VGV4dFJ1biBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxh eW91dENvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjppbmxpbmVJdGVtV2lk dGgpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL3RleHQvVGV4dFV0aWwuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUZXh0VXRpbDo6d2lkdGgpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpUZXh0VXRpbDo6aHlwaGVuUG9zaXRpb25CZWZvcmUpOiBEZWxldGVk LgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL3RleHQvVGV4dFV0aWwuaDoKKwog MjAxOS0xMi0xMCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtM RkNdW0lGQ10gUGFydGlhbCB0cmFpbGluZyB3aWR0aCBzaG91bGQgaW5jbHVkZSB0aGUgaHlwaGVu IHdoZW4gYXBwbGljYWJsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwCmluZGV4IDNlM2M0NDU1MWIw ZThiYzBhN2I0YzI3MGI0YTVjNDA1ODJmZGJjNjcuLjViNDliNzcwZTFkZGVmN2YzYTNjYjQ0MDE1 YzMxMmE4MzNkMzliNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5jcHAKQEAgLTExMCw3ICsxMTAs NyBAQCBMaW5lQnJlYWtlcjo6QnJlYWtpbmdDb250ZXh0IExpbmVCcmVha2VyOjpicmVha2luZ0Nv bnRleHRGb3JJbmxpbmVDb250ZW50KGNvbnN0CiAgICAgICAgICAgICAgICAgQVNTRVJUKGlubGlu ZVRleHRJdGVtLmxlbmd0aCgpKTsKICAgICAgICAgICAgICAgICBpZiAoaW5saW5lVGV4dEl0ZW0u bGVuZ3RoKCkgPT0gMSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHsgQnJlYWtpbmdDb250 ZXh0OjpDb250ZW50V3JhcHBpbmdSdWxlOjpLZWVwLCB7IH0gfTsKLSAgICAgICAgICAgICAgICBh dXRvIGZpcnN0Q2hhcmFjdGVyV2lkdGggPSBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0u bGF5b3V0Qm94KCksIGlubGluZVRleHRJdGVtLnN0YXJ0KCksIGlubGluZVRleHRJdGVtLnN0YXJ0 KCkgKyAxKTsKKyAgICAgICAgICAgICAgICBhdXRvIGZpcnN0Q2hhcmFjdGVyV2lkdGggPSBUZXh0 VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0sIGlubGluZVRleHRJdGVtLnN0YXJ0KCksIGlubGlu ZVRleHRJdGVtLnN0YXJ0KCkgKyAxKTsKICAgICAgICAgICAgICAgICByZXR1cm4geyBCcmVha2lu Z0NvbnRleHQ6OkNvbnRlbnRXcmFwcGluZ1J1bGU6OlNwbGl0LCBCcmVha2luZ0NvbnRleHQ6OlBh cnRpYWxUcmFpbGluZ0NvbnRlbnQgeyBmaXJzdFRleHRSdW5JbmRleCwgMSwgZmlyc3RDaGFyYWN0 ZXJXaWR0aCwgZmFsc2UgfSB9OwogICAgICAgICAgICAgfQogICAgICAgICAgICAgcmV0dXJuIHsg QnJlYWtpbmdDb250ZXh0OjpDb250ZW50V3JhcHBpbmdSdWxlOjpTcGxpdCwgcGFydGlhbFRyYWls aW5nQ29udGVudCB9OwpAQCAtMjE5LDcgKzIxOSw3IEBAIE9wdGlvbmFsPExpbmVCcmVha2VyOjpM ZWZ0U2lkZT4gTGluZUJyZWFrZXI6OnRyeUJyZWFraW5nVGV4dFJ1bihjb25zdCBDb250ZW50OjpS CiAgICAgaWYgKCFoeXBoZW5Mb2NhdGlvbiB8fCBoeXBoZW5Mb2NhdGlvbiA8IGxpbWl0QmVmb3Jl KQogICAgICAgICByZXR1cm4geyB9OwogICAgIC8vIGh5cGhlbkxvY2F0aW9uIGlzIHJlbGF0aXZl IHRvIHRoZSBzdGFydCBvZiB0aGlzIElubGluZUl0ZW1UZXh0LgotICAgIGF1dG8gdHJhaWxpbmdQ YXJ0aWFsUnVuV2lkdGhXaXRoSHlwaGVuID0gVGV4dFV0aWw6OndpZHRoKGlubGluZVRleHRJdGVt LmxheW91dEJveCgpLCBpbmxpbmVUZXh0SXRlbS5zdGFydCgpLCBpbmxpbmVUZXh0SXRlbS5zdGFy dCgpICsgaHlwaGVuTG9jYXRpb24pICsgaHlwaGVuV2lkdGg7IAorICAgIGF1dG8gdHJhaWxpbmdQ YXJ0aWFsUnVuV2lkdGhXaXRoSHlwaGVuID0gVGV4dFV0aWw6OndpZHRoKGlubGluZVRleHRJdGVt LCBpbmxpbmVUZXh0SXRlbS5zdGFydCgpLCBpbmxpbmVUZXh0SXRlbS5zdGFydCgpICsgaHlwaGVu TG9jYXRpb24pICsgaHlwaGVuV2lkdGg7IAogICAgIHJldHVybiBMZWZ0U2lkZSB7IGh5cGhlbkxv Y2F0aW9uLCB0cmFpbGluZ1BhcnRpYWxSdW5XaWR0aFdpdGhIeXBoZW4sIHRydWUgfTsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxh eW91dENvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv TGluZUxheW91dENvbnRleHQuY3BwCmluZGV4IGRlODM0ODM3MGQyNTAyYTAyMzU4ODBmMTNjMjA5 ZDgxZDIxNWFkZDEuLmJhOGQ1YWMzNGNjMjcyNDQ1OTQ4MmFlNTkyZjg5MGY0ZjJiZWFmMWMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlv dXRDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9MaW5lTGF5b3V0Q29udGV4dC5jcHAKQEAgLTQyLDEzICs0MiwxMCBAQCBzdGF0aWMgSW5saW5l TGF5b3V0VW5pdCBpbmxpbmVJdGVtV2lkdGgoY29uc3QgRm9ybWF0dGluZ0NvbnRleHQmIGZvcm1h dHRpbmdDb250ZQogCiAgICAgaWYgKGlzPElubGluZVRleHRJdGVtPihpbmxpbmVJdGVtKSkgewog ICAgICAgICBhdXRvJiBpbmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJdGVtPihp bmxpbmVJdGVtKTsKLSAgICAgICAgYXV0byBjb250ZW50V2lkdGggPSBpbmxpbmVUZXh0SXRlbS53 aWR0aCgpOwotICAgICAgICBpZiAoIWNvbnRlbnRXaWR0aCkgewotICAgICAgICAgICAgYXV0byBl bmQgPSBpbmxpbmVUZXh0SXRlbS5pc0NvbGxhcHNpYmxlKCkgPyBpbmxpbmVUZXh0SXRlbS5zdGFy dCgpICsgMSA6IGlubGluZVRleHRJdGVtLmVuZCgpOwotICAgICAgICAgICAgY29udGVudFdpZHRo ID0gVGV4dFV0aWw6OndpZHRoKGlubGluZVRleHRJdGVtLmxheW91dEJveCgpLCBpbmxpbmVUZXh0 SXRlbS5zdGFydCgpLCBlbmQsIGNvbnRlbnRMb2dpY2FsTGVmdCk7Ci0gICAgICAgIH0KLSAgICAg ICAgYXV0byB3b3JkU3BhY2luZyA9IElubGluZUxheW91dFVuaXQoaW5saW5lVGV4dEl0ZW0uaXNX aGl0ZXNwYWNlKCkgPyBpbmxpbmVUZXh0SXRlbS5zdHlsZSgpLmZvbnRDYXNjYWRlKCkud29yZFNw YWNpbmcoKSA6IDApOwotICAgICAgICByZXR1cm4gKmNvbnRlbnRXaWR0aCArIHdvcmRTcGFjaW5n OworICAgICAgICBpZiAoYXV0byBjb250ZW50V2lkdGggPSBpbmxpbmVUZXh0SXRlbS53aWR0aCgp KQorICAgICAgICAgICAgcmV0dXJuICpjb250ZW50V2lkdGg7CisgICAgICAgIGF1dG8gZW5kID0g aW5saW5lVGV4dEl0ZW0uaXNDb2xsYXBzaWJsZSgpID8gaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSAr IDEgOiBpbmxpbmVUZXh0SXRlbS5lbmQoKTsKKyAgICAgICAgcmV0dXJuIFRleHRVdGlsOjp3aWR0 aChpbmxpbmVUZXh0SXRlbSwgaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSwgZW5kLCBjb250ZW50TG9n aWNhbExlZnQpOwogICAgIH0KIAogICAgIGF1dG8mIGxheW91dEJveCA9IGlubGluZUl0ZW0ubGF5 b3V0Qm94KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy90ZXh0L1RleHRVdGlsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL3RleHQvVGV4dFV0aWwuY3BwCmluZGV4IDFmMTNlNjg0ZTQ2ZjdkZWI0OWRkYzUwOGZk MzRkNmMxMjA0OTBjMDcuLjE1ZmFjOTY2OTY4NDRiOGFjMWIwYzU2M2E1NWRiZGFlNWRlZWY4MTkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL3RleHQv VGV4dFV0aWwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L3RleHQvVGV4dFV0aWwuY3BwCkBAIC0yOSwxNCArMjksMjAgQEAKICNpZiBFTkFCTEUoTEFZT1VU X0ZPUk1BVFRJTkdfQ09OVEVYVCkKIAogI2luY2x1ZGUgIkZvbnRDYXNjYWRlLmgiCisjaW5jbHVk ZSAiSW5saW5lVGV4dEl0ZW0uaCIKICNpbmNsdWRlICJSZW5kZXJTdHlsZS5oIgogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0IHsKIAotT3B0aW9uYWw8dW5zaWduZWQ+IFRl eHRVdGlsOjpoeXBoZW5Qb3NpdGlvbkJlZm9yZShjb25zdCBJbmxpbmVJdGVtJiwgdW5zaWduZWQs IHVuc2lnbmVkKQorSW5saW5lTGF5b3V0VW5pdCBUZXh0VXRpbDo6d2lkdGgoY29uc3QgSW5saW5l VGV4dEl0ZW0mIGlubGluZVRleHRJdGVtLCB1bnNpZ25lZCBmcm9tLCB1bnNpZ25lZCB0bywgSW5s aW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQpCiB7Ci0gICAgcmV0dXJuIFdURjo6bnVs bG9wdDsKKyAgICAvLyBGYXN0IHBhdGggZm9yIHNpbmdsZSB3aGl0ZXNwYWNlIGNoYXJhY3Rlci4K KyAgICBpZiAoaW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkgJiYgKHRvIC0gZnJvbSkgPT0g MSkgeworICAgICAgICBhdXRvIGZvbnQgPSBpbmxpbmVUZXh0SXRlbS5zdHlsZSgpLmZvbnRDYXNj YWRlKCk7CisgICAgICAgIHJldHVybiBmb250LnNwYWNlV2lkdGgoKSArIGZvbnQud29yZFNwYWNp bmcoKTsKKyAgICB9CisgICAgcmV0dXJuIFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbS5s YXlvdXRCb3goKSwgZnJvbSwgdG8sIGNvbnRlbnRMb2dpY2FsTGVmdCk7CiB9CiAKIElubGluZUxh eW91dFVuaXQgVGV4dFV0aWw6OndpZHRoKGNvbnN0IEJveCYgaW5saW5lQm94LCB1bnNpZ25lZCBm cm9tLCB1bnNpZ25lZCB0bywgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy90ZXh0L1Rl eHRVdGlsLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy90ZXh0L1Rl eHRVdGlsLmgKaW5kZXggYzE5MTkxOTQwNDdkZTVlYzc4Nzk2Y2RmYTFlMWU4NGU1YTdkZTVjOC4u ODlmZWUyMmI5MTZjMDg0MDg5NDY5NjdkYzU4MDliYjYyN2U1ODRjNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4dC9UZXh0VXRpbC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL3RleHQvVGV4dFV0aWwuaApA QCAtMzcsOCArMzcsOCBAQCBuYW1lc3BhY2UgTGF5b3V0IHsKIAogY2xhc3MgVGV4dFV0aWwgewog cHVibGljOgorICAgIHN0YXRpYyBJbmxpbmVMYXlvdXRVbml0IHdpZHRoKGNvbnN0IElubGluZVRl eHRJdGVtJiwgdW5zaWduZWQgZnJvbSwgdW5zaWduZWQgdG8sIElubGluZUxheW91dFVuaXQgY29u dGVudExvZ2ljYWxMZWZ0ID0gMCk7CiAgICAgc3RhdGljIElubGluZUxheW91dFVuaXQgd2lkdGgo Y29uc3QgQm94JiwgdW5zaWduZWQgZnJvbSwgdW5zaWduZWQgdG8sIElubGluZUxheW91dFVuaXQg Y29udGVudExvZ2ljYWxMZWZ0ID0gMCk7Ci0gICAgc3RhdGljIE9wdGlvbmFsPHVuc2lnbmVkPiBo eXBoZW5Qb3NpdGlvbkJlZm9yZShjb25zdCBJbmxpbmVJdGVtJiwgdW5zaWduZWQgZnJvbSwgdW5z aWduZWQgbGVuZ3RoKTsKICAgICBzdHJ1Y3QgU3BsaXREYXRhIHsKICAgICAgICAgdW5zaWduZWQg c3RhcnQgeyAwIH07CiAgICAgICAgIHVuc2lnbmVkIGxlbmd0aCB7IDAgfTsK