204594 2019-11-25 14:52:49 -0800 [LFC][IFC] Use FontCascade::spaceWidth to measure single or collapsed whitespace content 2019-11-25 16:28:27 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1593521 0 zalan 2019-11-25 14:52:49 -0800 ssia 1593522 1 webkit-bug-importer 2019-11-25 14:53:13 -0800 <rdar://problem/57478360> 1593523 2 384318 zalan 2019-11-25 14:54:38 -0800 Created attachment 384318 Patch 1593524 3 384318 koivisto 2019-11-25 15:02:12 -0800 Comment on attachment 384318 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=384318&action=review > Source/WebCore/layout/inlineformatting/InlineTextItem.cpp:118 > + auto width = simpleSingleWhitespaceContent ? Optional<LayoutUnit>(LayoutUnit { font.spaceWidth() }) : inlineItemWidth(currentPosition, length); Shorter: makeOptional(LayoutUnit { font.spaceWidth() }) 1593528 4 384319 zalan 2019-11-25 15:44:20 -0800 Created attachment 384319 Patch 1593530 5 384319 commit-queue 2019-11-25 16:28:25 -0800 Comment on attachment 384319 Patch Clearing flags on attachment: 384319 Committed r252869: <https://trac.webkit.org/changeset/252869> 1593531 6 commit-queue 2019-11-25 16:28:27 -0800 All reviewed patches have been landed. Closing bug. 384318 2019-11-25 14:54:38 -0800 2019-11-25 15:44:18 -0800 Patch bug-204594-20191125145411.patch text/plain 3137 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyODY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTU4MTljYmUwMzJkNWQw YmI4ZGQxN2FjN2YxNTcxNWYxZWQzNzU4Yy4uNDg5YjI1MmExNTc3ODg4OWY4NDc4OTY5MGEyNTgz ZTg5NTg0YzA4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTExLTI1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBVc2UgRm9u dENhc2NhZGU6OnNwYWNlV2lkdGggdG8gbWVhc3VyZSBzaW5nbGUgb3IgY29sbGFwc2VkIHdoaXRl c3BhY2UgY29udGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjA0NTk0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NzQ3ODM2MD4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 SW5saW5lVGV4dEl0ZW06OmNyZWF0ZUFuZEFwcGVuZFRleHRJdGVtcyk6CisKIDIwMTktMTEtMjUg IFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXSBEbyBub3Qg cnVuIGxheW91dCB3aGVuIHNldE5lZWRzTGF5b3V0IGlzIGRpc2FibGVkCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5j cHAKaW5kZXggYjY5ZjM2MGNjOGEwMTdjZDNmOWVlYTUyZjVhMmRlMTE2ZDExZmZkNi4uYjZkZjAx NTJkNWYwMTE1NjliMjFhN2Y3ODdlZGNlOWI0ZmU4MGFjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmNwcApA QCAtMjksNiArMjksNyBAQAogI2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQog CiAjaW5jbHVkZSAiQnJlYWtMaW5lcy5oIgorI2luY2x1ZGUgIkZvbnRDYXNjYWRlLmgiCiAKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewpAQCAtODIsMTYgKzgzLDE4IEBA IHN0YXRpYyB1bnNpZ25lZCBtb3ZlVG9OZXh0QnJlYWthYmxlUG9zaXRpb24odW5zaWduZWQgc3Rh cnRQb3NpdGlvbiwgTGF6eUxpbmVCcmVhCiAKIHZvaWQgSW5saW5lVGV4dEl0ZW06OmNyZWF0ZUFu ZEFwcGVuZFRleHRJdGVtcyhJbmxpbmVJdGVtcyYgaW5saW5lQ29udGVudCwgY29uc3QgQm94JiBp bmxpbmVCb3gpCiB7Ci0gICAgYXV0byB0ZXh0ID0gaW5saW5lQm94LnRleHRDb250ZXh0KCktPmNv bnRlbnQ7CisgICAgYXV0byYgdGV4dENvbnRleHQgPSAqaW5saW5lQm94LnRleHRDb250ZXh0KCk7 CisgICAgYXV0byB0ZXh0ID0gdGV4dENvbnRleHQuY29udGVudDsKICAgICBpZiAoIXRleHQubGVu Z3RoKCkpCiAgICAgICAgIHJldHVybiBpbmxpbmVDb250ZW50LmFwcGVuZChJbmxpbmVUZXh0SXRl bTo6Y3JlYXRlRW1wdHlJdGVtKGlubGluZUJveCkpOwogCiAgICAgYXV0byYgc3R5bGUgPSBpbmxp bmVCb3guc3R5bGUoKTsKKyAgICBhdXRvJiBmb250ID0gc3R5bGUuZm9udENhc2NhZGUoKTsKICAg ICBMYXp5TGluZUJyZWFrSXRlcmF0b3IgbGluZUJyZWFrSXRlcmF0b3IodGV4dCk7CiAgICAgdW5z aWduZWQgY3VycmVudFBvc2l0aW9uID0gMDsKIAogICAgIGF1dG8gaW5saW5lSXRlbVdpZHRoID0g WyZdKGF1dG8gc3RhcnRQb3NpdGlvbiwgYXV0byBsZW5ndGgpIC0+IE9wdGlvbmFsPExheW91dFVu aXQ+IHsKLSAgICAgICAgaWYgKCFpbmxpbmVCb3gudGV4dENvbnRleHQoKS0+Y2FuVXNlU2ltcGxp ZmllZENvbnRlbnRNZWFzdXJpbmcpCisgICAgICAgIGlmICghdGV4dENvbnRleHQuY2FuVXNlU2lt cGxpZmllZENvbnRlbnRNZWFzdXJpbmcpCiAgICAgICAgICAgICByZXR1cm4geyB9OwogICAgICAg ICByZXR1cm4gVGV4dFV0aWw6OndpZHRoKGlubGluZUJveCwgc3RhcnRQb3NpdGlvbiwgc3RhcnRQ b3NpdGlvbiArIGxlbmd0aCk7CiAgICAgfTsKQEAgLTExMSw3ICsxMTQsOSBAQCB2b2lkIElubGlu ZVRleHRJdGVtOjpjcmVhdGVBbmRBcHBlbmRUZXh0SXRlbXMoSW5saW5lSXRlbXMmIGlubGluZUNv bnRlbnQsIGNvbnN0CiAKICAgICAgICAgaWYgKGlzV2hpdGVzcGFjZUNoYXJhY3Rlcih0ZXh0W2N1 cnJlbnRQb3NpdGlvbl0pKSB7CiAgICAgICAgICAgICBhdXRvIGxlbmd0aCA9IG1vdmVUb05leHRO b25XaGl0ZXNwYWNlUG9zaXRpb24odGV4dCwgY3VycmVudFBvc2l0aW9uKTsKLSAgICAgICAgICAg IGlubGluZUNvbnRlbnQuYXBwZW5kKElubGluZVRleHRJdGVtOjpjcmVhdGVXaGl0ZXNwYWNlSXRl bShpbmxpbmVCb3gsIGN1cnJlbnRQb3NpdGlvbiwgbGVuZ3RoLCBpbmxpbmVJdGVtV2lkdGgoY3Vy cmVudFBvc2l0aW9uLCBsZW5ndGgpKSk7CisgICAgICAgICAgICBhdXRvIHNpbXBsZVNpbmdsZVdo aXRlc3BhY2VDb250ZW50ID0gdGV4dENvbnRleHQuY2FuVXNlU2ltcGxpZmllZENvbnRlbnRNZWFz dXJpbmcgJiYgKGxlbmd0aCA9PSAxIHx8IHN0eWxlLmNvbGxhcHNlV2hpdGVTcGFjZSgpKTsKKyAg ICAgICAgICAgIGF1dG8gd2lkdGggPSBzaW1wbGVTaW5nbGVXaGl0ZXNwYWNlQ29udGVudCA/IE9w dGlvbmFsPExheW91dFVuaXQ+KExheW91dFVuaXQgeyBmb250LnNwYWNlV2lkdGgoKSB9KSA6IGlu bGluZUl0ZW1XaWR0aChjdXJyZW50UG9zaXRpb24sIGxlbmd0aCk7CisgICAgICAgICAgICBpbmxp bmVDb250ZW50LmFwcGVuZChJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlV2hpdGVzcGFjZUl0ZW0oaW5s aW5lQm94LCBjdXJyZW50UG9zaXRpb24sIGxlbmd0aCwgd2lkdGgpKTsKICAgICAgICAgICAgIGN1 cnJlbnRQb3NpdGlvbiArPSBsZW5ndGg7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAg fQo= 384319 2019-11-25 15:44:20 -0800 2019-11-25 16:28:25 -0800 Patch bug-204594-20191125154353.patch text/plain 3129 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyODY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTU4MTljYmUwMzJkNWQw YmI4ZGQxN2FjN2YxNTcxNWYxZWQzNzU4Yy4uMzgzODI5YThhMDI1ZjFkYzZjMjJlZmNkMjNmZDMy ZTkwMDA2MTE5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTExLTI1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBVc2UgRm9u dENhc2NhZGU6OnNwYWNlV2lkdGggdG8gbWVhc3VyZSBzaW5nbGUgb3IgY29sbGFwc2VkIHdoaXRl c3BhY2UgY29udGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjA0NTk0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NzQ3ODM2MD4KKworICAgICAg ICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 SW5saW5lVGV4dEl0ZW06OmNyZWF0ZUFuZEFwcGVuZFRleHRJdGVtcyk6CisKIDIwMTktMTEtMjUg IFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXSBEbyBub3Qg cnVuIGxheW91dCB3aGVuIHNldE5lZWRzTGF5b3V0IGlzIGRpc2FibGVkCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5j cHAKaW5kZXggYjY5ZjM2MGNjOGEwMTdjZDNmOWVlYTUyZjVhMmRlMTE2ZDExZmZkNi4uODc1NTM4 Zjc2ODA3NTc2NWY4NWY4OTZhMDYyMjc5ZjNhY2I4MzY1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmNwcApA QCAtMjksNiArMjksNyBAQAogI2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQog CiAjaW5jbHVkZSAiQnJlYWtMaW5lcy5oIgorI2luY2x1ZGUgIkZvbnRDYXNjYWRlLmgiCiAKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewpAQCAtODIsMTYgKzgzLDE4IEBA IHN0YXRpYyB1bnNpZ25lZCBtb3ZlVG9OZXh0QnJlYWthYmxlUG9zaXRpb24odW5zaWduZWQgc3Rh cnRQb3NpdGlvbiwgTGF6eUxpbmVCcmVhCiAKIHZvaWQgSW5saW5lVGV4dEl0ZW06OmNyZWF0ZUFu ZEFwcGVuZFRleHRJdGVtcyhJbmxpbmVJdGVtcyYgaW5saW5lQ29udGVudCwgY29uc3QgQm94JiBp bmxpbmVCb3gpCiB7Ci0gICAgYXV0byB0ZXh0ID0gaW5saW5lQm94LnRleHRDb250ZXh0KCktPmNv bnRlbnQ7CisgICAgYXV0byYgdGV4dENvbnRleHQgPSAqaW5saW5lQm94LnRleHRDb250ZXh0KCk7 CisgICAgYXV0byB0ZXh0ID0gdGV4dENvbnRleHQuY29udGVudDsKICAgICBpZiAoIXRleHQubGVu Z3RoKCkpCiAgICAgICAgIHJldHVybiBpbmxpbmVDb250ZW50LmFwcGVuZChJbmxpbmVUZXh0SXRl bTo6Y3JlYXRlRW1wdHlJdGVtKGlubGluZUJveCkpOwogCiAgICAgYXV0byYgc3R5bGUgPSBpbmxp bmVCb3guc3R5bGUoKTsKKyAgICBhdXRvJiBmb250ID0gc3R5bGUuZm9udENhc2NhZGUoKTsKICAg ICBMYXp5TGluZUJyZWFrSXRlcmF0b3IgbGluZUJyZWFrSXRlcmF0b3IodGV4dCk7CiAgICAgdW5z aWduZWQgY3VycmVudFBvc2l0aW9uID0gMDsKIAogICAgIGF1dG8gaW5saW5lSXRlbVdpZHRoID0g WyZdKGF1dG8gc3RhcnRQb3NpdGlvbiwgYXV0byBsZW5ndGgpIC0+IE9wdGlvbmFsPExheW91dFVu aXQ+IHsKLSAgICAgICAgaWYgKCFpbmxpbmVCb3gudGV4dENvbnRleHQoKS0+Y2FuVXNlU2ltcGxp ZmllZENvbnRlbnRNZWFzdXJpbmcpCisgICAgICAgIGlmICghdGV4dENvbnRleHQuY2FuVXNlU2lt cGxpZmllZENvbnRlbnRNZWFzdXJpbmcpCiAgICAgICAgICAgICByZXR1cm4geyB9OwogICAgICAg ICByZXR1cm4gVGV4dFV0aWw6OndpZHRoKGlubGluZUJveCwgc3RhcnRQb3NpdGlvbiwgc3RhcnRQ b3NpdGlvbiArIGxlbmd0aCk7CiAgICAgfTsKQEAgLTExMSw3ICsxMTQsOSBAQCB2b2lkIElubGlu ZVRleHRJdGVtOjpjcmVhdGVBbmRBcHBlbmRUZXh0SXRlbXMoSW5saW5lSXRlbXMmIGlubGluZUNv bnRlbnQsIGNvbnN0CiAKICAgICAgICAgaWYgKGlzV2hpdGVzcGFjZUNoYXJhY3Rlcih0ZXh0W2N1 cnJlbnRQb3NpdGlvbl0pKSB7CiAgICAgICAgICAgICBhdXRvIGxlbmd0aCA9IG1vdmVUb05leHRO b25XaGl0ZXNwYWNlUG9zaXRpb24odGV4dCwgY3VycmVudFBvc2l0aW9uKTsKLSAgICAgICAgICAg IGlubGluZUNvbnRlbnQuYXBwZW5kKElubGluZVRleHRJdGVtOjpjcmVhdGVXaGl0ZXNwYWNlSXRl bShpbmxpbmVCb3gsIGN1cnJlbnRQb3NpdGlvbiwgbGVuZ3RoLCBpbmxpbmVJdGVtV2lkdGgoY3Vy cmVudFBvc2l0aW9uLCBsZW5ndGgpKSk7CisgICAgICAgICAgICBhdXRvIHNpbXBsZVNpbmdsZVdo aXRlc3BhY2VDb250ZW50ID0gdGV4dENvbnRleHQuY2FuVXNlU2ltcGxpZmllZENvbnRlbnRNZWFz dXJpbmcgJiYgKGxlbmd0aCA9PSAxIHx8IHN0eWxlLmNvbGxhcHNlV2hpdGVTcGFjZSgpKTsKKyAg ICAgICAgICAgIGF1dG8gd2lkdGggPSBzaW1wbGVTaW5nbGVXaGl0ZXNwYWNlQ29udGVudCA/IG1h a2VPcHRpb25hbChMYXlvdXRVbml0IHsgZm9udC5zcGFjZVdpZHRoKCkgfSkgOiBpbmxpbmVJdGVt V2lkdGgoY3VycmVudFBvc2l0aW9uLCBsZW5ndGgpOworICAgICAgICAgICAgaW5saW5lQ29udGVu dC5hcHBlbmQoSW5saW5lVGV4dEl0ZW06OmNyZWF0ZVdoaXRlc3BhY2VJdGVtKGlubGluZUJveCwg Y3VycmVudFBvc2l0aW9uLCBsZW5ndGgsIHdpZHRoKSk7CiAgICAgICAgICAgICBjdXJyZW50UG9z aXRpb24gKz0gbGVuZ3RoOwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0K