223480 2021-03-18 14:35:57 -0700 Add a fast path for subdivideAndResolveStyle() 2021-03-18 21:55:07 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser bfulgham changseok dbates esprehn+autocc ews-watchlist glenn kondapallykalyan mmaxfield pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1741430 0 simon.fraser 2021-03-18 14:35:57 -0700 Add a fast path for subdivideAndResolveStyle() 1741437 1 423661 simon.fraser 2021-03-18 14:44:36 -0700 Created attachment 423661 Patch 1741452 2 423661 mmaxfield 2021-03-18 15:11:15 -0700 Comment on attachment 423661 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423661&action=review > Source/WebCore/ChangeLog:9 > + Most of the time, InlineTextBox::paint() will be painting text runs with no marked text, > + so optimize subdivideAndResolveStyle() for this case. Is the motivation cleanliness or performance? If performance, would be good to validate with a perf test. > Source/WebCore/rendering/MarkedTextStyle.cpp:157 > + if (textsToCoalesce.size() < 2) nit: I think 1 is a more obvious sentinel than 2, so I would say "<= 1" instead of "< 2". 1741478 3 423665 simon.fraser 2021-03-18 16:04:48 -0700 Created attachment 423665 Patch 1741550 4 dbates 2021-03-18 18:51:17 -0700 Looks good 1741551 5 423665 dbates 2021-03-18 18:52:52 -0700 Comment on attachment 423665 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423665&action=review > Source/WebCore/rendering/MarkedTextStyle.cpp:123 > + Vector<StyledMarkedText> frontmostMarkedTexts; Consider moving this back to avoid allocating inline storage. 1741581 6 ews-feeder 2021-03-18 21:21:40 -0700 Committed r274700: <https://commits.webkit.org/r274700> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423665. 1741582 7 webkit-bug-importer 2021-03-18 21:22:17 -0700 <rdar://problem/75605441> 423661 2021-03-18 14:44:36 -0700 2021-03-18 15:11:15 -0700 Patch bug-223480-20210318144435.patch text/plain 3261 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2FhN2M0NjliYjFiNzlk ZDg3MjY2MmRkYTQwMjNjMGUxNWZlMTcyMi4uYmVlMzE3ZDZlNTVlYjY2YTMxODhlZTgxZjVkYTgw MzhmZmEzNmQ4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTAzLTE4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBhIGZhc3Qg cGF0aCBmb3Igc3ViZGl2aWRlQW5kUmVzb2x2ZVN0eWxlKCkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzQ4MAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vc3Qgb2YgdGhlIHRpbWUsIElubGluZVRleHRC b3g6OnBhaW50KCkgd2lsbCBiZSBwYWludGluZyB0ZXh0IHJ1bnMgd2l0aCBubyBtYXJrZWQgdGV4 dCwKKyAgICAgICAgc28gb3B0aW1pemUgc3ViZGl2aWRlQW5kUmVzb2x2ZVN0eWxlKCkgZm9yIHRo aXMgY2FzZS4KKworICAgICAgICAqIHJlbmRlcmluZy9NYXJrZWRUZXh0U3R5bGUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6c3ViZGl2aWRlQW5kUmVzb2x2ZVN0eWxlKToKKyAgICAgICAgKFdlYkNv cmU6OmNvYWxlc2NlQWRqYWNlbnRNYXJrZWRUZXh0cyk6IE5vIG5lZWQgdG8gZG8gYW55IHdvcmsg aWYgdGhlcmUgYXJlIHplcm8gb3Igb25lCisgICAgICAgIHJhbmdlcy4KKwogMjAyMS0wMy0xNyAg U2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBBdm9pZCB1 bm5lY2Vzc2FyeSByZXBhaW50cyB3aGVuIHRyYW5zZm9ybXMgY2hhbmdlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTWFya2VkVGV4dFN0eWxlLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9NYXJrZWRUZXh0U3R5bGUuY3BwCmluZGV4IGYzMWExZjIzN2U5NWU2MTI1 YjY0ZTc2NDczMTM0MWQyNWMzOGRlZmEuLmNhOTY3YjJhMWUyY2RlMjk4N2VkMzU3YzFkNTE3NDQx NDk4ZjFiMTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9NYXJrZWRUZXh0 U3R5bGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9NYXJrZWRUZXh0U3R5bGUu Y3BwCkBAIC0xMjAsMTYgKzEyMCwyMyBAQCBWZWN0b3I8U3R5bGVkTWFya2VkVGV4dD4gc3ViZGl2 aWRlQW5kUmVzb2x2ZVN0eWxlKGNvbnN0IFZlY3RvcjxNYXJrZWRUZXh0PiYgdGV4dAogICAgIGlm ICh0ZXh0c1RvU3ViZGl2aWRlLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIHsgfTsKIAorICAg IFZlY3RvcjxTdHlsZWRNYXJrZWRUZXh0PiBmcm9udG1vc3RNYXJrZWRUZXh0czsKKworICAgIGF1 dG8mIGxpbmVTdHlsZSA9IGlzRmlyc3RMaW5lID8gcmVuZGVyZXIuZmlyc3RMaW5lU3R5bGUoKSA6 IHJlbmRlcmVyLnN0eWxlKCk7CisgICAgYXV0byBiYXNlU3R5bGUgPSBjb21wdXRlU3R5bGVGb3JV bm1hcmtlZE1hcmtlZFRleHQocmVuZGVyZXIsIGxpbmVTdHlsZSwgaXNGaXJzdExpbmUsIHBhaW50 SW5mbyk7CisKKyAgICBpZiAodGV4dHNUb1N1YmRpdmlkZS5zaXplKCkgPT0gMSAmJiB0ZXh0c1Rv U3ViZGl2aWRlWzBdLnR5cGUgPT0gTWFya2VkVGV4dDo6VW5tYXJrZWQpIHsKKyAgICAgICAgU3R5 bGVkTWFya2VkVGV4dCBzdHlsZWRNYXJrZWRUZXh0ID0gdGV4dHNUb1N1YmRpdmlkZVswXTsKKyAg ICAgICAgc3R5bGVkTWFya2VkVGV4dC5zdHlsZSA9IFdURk1vdmUoYmFzZVN0eWxlKTsKKyAgICAg ICAgcmV0dXJuIHsgc3R5bGVkTWFya2VkVGV4dCB9OworICAgIH0KKwogICAgIGF1dG8gbWFya2Vk VGV4dHMgPSBzdWJkaXZpZGUodGV4dHNUb1N1YmRpdmlkZSk7CiAgICAgQVNTRVJUKCFtYXJrZWRU ZXh0cy5pc0VtcHR5KCkpOwogICAgIGlmIChVTkxJS0VMWShtYXJrZWRUZXh0cy5pc0VtcHR5KCkp KQogICAgICAgICByZXR1cm4geyB9OwogCi0gICAgYXV0byYgbGluZVN0eWxlID0gaXNGaXJzdExp bmUgPyByZW5kZXJlci5maXJzdExpbmVTdHlsZSgpIDogcmVuZGVyZXIuc3R5bGUoKTsKLSAgICBh dXRvIGJhc2VTdHlsZSA9IGNvbXB1dGVTdHlsZUZvclVubWFya2VkTWFya2VkVGV4dChyZW5kZXJl ciwgbGluZVN0eWxlLCBpc0ZpcnN0TGluZSwgcGFpbnRJbmZvKTsKLQogICAgIC8vIENvbXB1dGUg ZnJvbnRtb3N0IG92ZXJsYXBwaW5nIHN0eWxlZCBtYXJrZWQgdGV4dHMuCi0gICAgVmVjdG9yPFN0 eWxlZE1hcmtlZFRleHQ+IGZyb250bW9zdE1hcmtlZFRleHRzOwogICAgIGZyb250bW9zdE1hcmtl ZFRleHRzLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkobWFya2VkVGV4dHMuc2l6ZSgpKTsKICAgICBm cm9udG1vc3RNYXJrZWRUZXh0cy51bmNoZWNrZWRBcHBlbmQocmVzb2x2ZVN0eWxlRm9yTWFya2Vk VGV4dChtYXJrZWRUZXh0c1swXSwgYmFzZVN0eWxlLCByZW5kZXJlciwgbGluZVN0eWxlLCBwYWlu dEluZm8pKTsKICAgICBmb3IgKGF1dG8gaXQgPSBtYXJrZWRUZXh0cy5iZWdpbigpICsgMSwgZW5k ID0gbWFya2VkVGV4dHMuZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkgewpAQCAtMTQ3LDggKzE1NCw4 IEBAIFZlY3RvcjxTdHlsZWRNYXJrZWRUZXh0PiBzdWJkaXZpZGVBbmRSZXNvbHZlU3R5bGUoY29u c3QgVmVjdG9yPE1hcmtlZFRleHQ+JiB0ZXh0CiAKIFZlY3RvcjxTdHlsZWRNYXJrZWRUZXh0PiBj b2FsZXNjZUFkamFjZW50TWFya2VkVGV4dHMoY29uc3QgVmVjdG9yPFN0eWxlZE1hcmtlZFRleHQ+ JiB0ZXh0c1RvQ29hbGVzY2UsIE1hcmtlZFRleHRTdHlsZXNFcXVhbGl0eUZ1bmN0aW9uIGFyZU1h cmtlZFRleHRTdHlsZXNFcXVhbCkKIHsKLSAgICBpZiAodGV4dHNUb0NvYWxlc2NlLmlzRW1wdHko KSkKLSAgICAgICAgcmV0dXJuIHsgfTsKKyAgICBpZiAodGV4dHNUb0NvYWxlc2NlLnNpemUoKSA8 IDIpCisgICAgICAgIHJldHVybiB0ZXh0c1RvQ29hbGVzY2U7CiAKICAgICBhdXRvIGFyZUFkamFj ZW50TWFya2VkVGV4dHNXaXRoU2FtZVN0eWxlID0gWyZdIChjb25zdCBTdHlsZWRNYXJrZWRUZXh0 JiBhLCBjb25zdCBTdHlsZWRNYXJrZWRUZXh0JiBiKSB7CiAgICAgICAgIHJldHVybiBhLmVuZE9m ZnNldCA9PSBiLnN0YXJ0T2Zmc2V0ICYmIGFyZU1hcmtlZFRleHRTdHlsZXNFcXVhbChhLnN0eWxl LCBiLnN0eWxlKTsK 423665 2021-03-18 16:04:48 -0700 2021-03-18 21:55:07 -0700 Patch bug-223480-20210318160447.patch text/plain 3349 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2FhN2M0NjliYjFiNzlk ZDg3MjY2MmRkYTQwMjNjMGUxNWZlMTcyMi4uN2U2M2U3MDZmYzIwNjZjZTY1Y2RmZTZhYzg1MzVj ZDU4ZWZlMTc5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAzLTE4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBhIGZhc3Qg cGF0aCBmb3Igc3ViZGl2aWRlQW5kUmVzb2x2ZVN0eWxlKCkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzQ4MAorCisgICAgICAgIFJldmlld2VkIGJ5 IE15bGVzIE1heGZpZWxkLgorCisgICAgICAgIE1vc3Qgb2YgdGhlIHRpbWUsIElubGluZVRleHRC b3g6OnBhaW50KCkgd2lsbCBiZSBwYWludGluZyB0ZXh0IHJ1bnMgd2l0aCBubyBtYXJrZWQgdGV4 dCwKKyAgICAgICAgc28gb3B0aW1pemUgc3ViZGl2aWRlQW5kUmVzb2x2ZVN0eWxlKCkgZm9yIHRo aXMgY2FzZS4KKworICAgICAgICBUaGlzIHJlbW92ZXMgMS42JSBvZiB0aGUgdGltZSBpbiBwYWlu dGluZyBpbiB0aGUgTW90aW9uTWFyayBEZXNpZ24gc3VidGVzdC4KKworICAgICAgICAqIHJlbmRl cmluZy9NYXJrZWRUZXh0U3R5bGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c3ViZGl2aWRlQW5k UmVzb2x2ZVN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OmNvYWxlc2NlQWRqYWNlbnRNYXJrZWRU ZXh0cyk6IE5vIG5lZWQgdG8gZG8gYW55IHdvcmsgaWYgdGhlcmUgYXJlIHplcm8gb3Igb25lCisg ICAgICAgIHJhbmdlcy4KKwogMjAyMS0wMy0xNyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2Vy QGFwcGxlLmNvbT4KIAogICAgICAgICBBdm9pZCB1bm5lY2Vzc2FyeSByZXBhaW50cyB3aGVuIHRy YW5zZm9ybXMgY2hhbmdlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTWFy a2VkVGV4dFN0eWxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9NYXJrZWRUZXh0U3R5 bGUuY3BwCmluZGV4IGYzMWExZjIzN2U5NWU2MTI1YjY0ZTc2NDczMTM0MWQyNWMzOGRlZmEuLjVj OGY1ZDRkZmJkMWMwMGZlNjUwN2EyOTQ4MjliMDliNjU1YThhMDkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9NYXJrZWRUZXh0U3R5bGUuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9NYXJrZWRUZXh0U3R5bGUuY3BwCkBAIC0xMjAsMTYgKzEyMCwyMyBAQCBW ZWN0b3I8U3R5bGVkTWFya2VkVGV4dD4gc3ViZGl2aWRlQW5kUmVzb2x2ZVN0eWxlKGNvbnN0IFZl Y3RvcjxNYXJrZWRUZXh0PiYgdGV4dAogICAgIGlmICh0ZXh0c1RvU3ViZGl2aWRlLmlzRW1wdHko KSkKICAgICAgICAgcmV0dXJuIHsgfTsKIAorICAgIFZlY3RvcjxTdHlsZWRNYXJrZWRUZXh0PiBm cm9udG1vc3RNYXJrZWRUZXh0czsKKworICAgIGF1dG8mIGxpbmVTdHlsZSA9IGlzRmlyc3RMaW5l ID8gcmVuZGVyZXIuZmlyc3RMaW5lU3R5bGUoKSA6IHJlbmRlcmVyLnN0eWxlKCk7CisgICAgYXV0 byBiYXNlU3R5bGUgPSBjb21wdXRlU3R5bGVGb3JVbm1hcmtlZE1hcmtlZFRleHQocmVuZGVyZXIs IGxpbmVTdHlsZSwgaXNGaXJzdExpbmUsIHBhaW50SW5mbyk7CisKKyAgICBpZiAodGV4dHNUb1N1 YmRpdmlkZS5zaXplKCkgPT0gMSAmJiB0ZXh0c1RvU3ViZGl2aWRlWzBdLnR5cGUgPT0gTWFya2Vk VGV4dDo6VW5tYXJrZWQpIHsKKyAgICAgICAgU3R5bGVkTWFya2VkVGV4dCBzdHlsZWRNYXJrZWRU ZXh0ID0gdGV4dHNUb1N1YmRpdmlkZVswXTsKKyAgICAgICAgc3R5bGVkTWFya2VkVGV4dC5zdHls ZSA9IFdURk1vdmUoYmFzZVN0eWxlKTsKKyAgICAgICAgcmV0dXJuIHsgc3R5bGVkTWFya2VkVGV4 dCB9OworICAgIH0KKwogICAgIGF1dG8gbWFya2VkVGV4dHMgPSBzdWJkaXZpZGUodGV4dHNUb1N1 YmRpdmlkZSk7CiAgICAgQVNTRVJUKCFtYXJrZWRUZXh0cy5pc0VtcHR5KCkpOwogICAgIGlmIChV TkxJS0VMWShtYXJrZWRUZXh0cy5pc0VtcHR5KCkpKQogICAgICAgICByZXR1cm4geyB9OwogCi0g ICAgYXV0byYgbGluZVN0eWxlID0gaXNGaXJzdExpbmUgPyByZW5kZXJlci5maXJzdExpbmVTdHls ZSgpIDogcmVuZGVyZXIuc3R5bGUoKTsKLSAgICBhdXRvIGJhc2VTdHlsZSA9IGNvbXB1dGVTdHls ZUZvclVubWFya2VkTWFya2VkVGV4dChyZW5kZXJlciwgbGluZVN0eWxlLCBpc0ZpcnN0TGluZSwg cGFpbnRJbmZvKTsKLQogICAgIC8vIENvbXB1dGUgZnJvbnRtb3N0IG92ZXJsYXBwaW5nIHN0eWxl ZCBtYXJrZWQgdGV4dHMuCi0gICAgVmVjdG9yPFN0eWxlZE1hcmtlZFRleHQ+IGZyb250bW9zdE1h cmtlZFRleHRzOwogICAgIGZyb250bW9zdE1hcmtlZFRleHRzLnJlc2VydmVJbml0aWFsQ2FwYWNp dHkobWFya2VkVGV4dHMuc2l6ZSgpKTsKICAgICBmcm9udG1vc3RNYXJrZWRUZXh0cy51bmNoZWNr ZWRBcHBlbmQocmVzb2x2ZVN0eWxlRm9yTWFya2VkVGV4dChtYXJrZWRUZXh0c1swXSwgYmFzZVN0 eWxlLCByZW5kZXJlciwgbGluZVN0eWxlLCBwYWludEluZm8pKTsKICAgICBmb3IgKGF1dG8gaXQg PSBtYXJrZWRUZXh0cy5iZWdpbigpICsgMSwgZW5kID0gbWFya2VkVGV4dHMuZW5kKCk7IGl0ICE9 IGVuZDsgKytpdCkgewpAQCAtMTQ3LDggKzE1NCw4IEBAIFZlY3RvcjxTdHlsZWRNYXJrZWRUZXh0 PiBzdWJkaXZpZGVBbmRSZXNvbHZlU3R5bGUoY29uc3QgVmVjdG9yPE1hcmtlZFRleHQ+JiB0ZXh0 CiAKIFZlY3RvcjxTdHlsZWRNYXJrZWRUZXh0PiBjb2FsZXNjZUFkamFjZW50TWFya2VkVGV4dHMo Y29uc3QgVmVjdG9yPFN0eWxlZE1hcmtlZFRleHQ+JiB0ZXh0c1RvQ29hbGVzY2UsIE1hcmtlZFRl eHRTdHlsZXNFcXVhbGl0eUZ1bmN0aW9uIGFyZU1hcmtlZFRleHRTdHlsZXNFcXVhbCkKIHsKLSAg ICBpZiAodGV4dHNUb0NvYWxlc2NlLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuIHsgfTsKKyAg ICBpZiAodGV4dHNUb0NvYWxlc2NlLnNpemUoKSA8PSAxKQorICAgICAgICByZXR1cm4gdGV4dHNU b0NvYWxlc2NlOwogCiAgICAgYXV0byBhcmVBZGphY2VudE1hcmtlZFRleHRzV2l0aFNhbWVTdHls ZSA9IFsmXSAoY29uc3QgU3R5bGVkTWFya2VkVGV4dCYgYSwgY29uc3QgU3R5bGVkTWFya2VkVGV4 dCYgYikgewogICAgICAgICByZXR1cm4gYS5lbmRPZmZzZXQgPT0gYi5zdGFydE9mZnNldCAmJiBh cmVNYXJrZWRUZXh0U3R5bGVzRXF1YWwoYS5zdHlsZSwgYi5zdHlsZSk7Cg==