204653 2019-11-27 14:06:06 -0800 [LFC][IFC] Generate fewer InlineItems when new lines are not preserved 2019-11-27 18:34:08 -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 1593916 0 zalan 2019-11-27 14:06:06 -0800 no need to generate a segment break for each new line (which we will collapse most likely) 1593917 1 webkit-bug-importer 2019-11-27 14:06:38 -0800 <rdar://problem/57510133> 1593918 2 384425 zalan 2019-11-27 14:11:59 -0800 Created attachment 384425 Patch 1593937 3 zalan 2019-11-27 18:34:08 -0800 Committed r252915: <https://trac.webkit.org/changeset/252915> 384425 2019-11-27 14:11:59 -0800 2019-11-27 14:26:25 -0800 Patch bug-204653-20191127141130.patch text/plain 4134 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyOTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDU2N2Y1NTA2ODlhZmI2 N2ViZmZmNTE2ZDFmNjAxODkwMWY3ZTZhMi4uNjZiMTlkNzc3ZDI5YzRkMzQ2YmRiMDE4N2Y1MmMx YjY3ZmEwYjQxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTExLTI3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBHZW5lcmF0 ZSBmZXdlciBJbmxpbmVJdGVtcyB3aGVuIG5ldyBsaW5lcyBhcmUgbm90IHByZXNlcnZlZAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA0NjUzCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS81NzUxMDEzMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIHJlZHVjZXMgdGhlIG51bWJlciBvZiBJ bmxpbmVJdGVtcyBieSBtZXJnaW5nIChub24tcHJlc2VydmVkKW5ldyBsaW5lcyB3aXRoIG5laWdo Ym9yaW5nIHdoaXRlc3BhY2UgY2hhcmFjdGVycy4KKyAgICAgICAgW3RleHRcblxuIHRleHRdIC0+ IFt0ZXh0XVsgICBdW3RleHRdCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVUZXh0SXRlbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OmlzV2hpdGVzcGFj ZUNoYXJhY3Rlcik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Om1vdmVUb05leHROb25XaGl0 ZXNwYWNlUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVUZXh0SXRl bTo6Y3JlYXRlQW5kQXBwZW5kVGV4dEl0ZW1zKToKKwogMjAxOS0xMS0yNyAgWmFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdIFJ1biBsYXlvdXQgb24gdGhlIHJv b3Qgd2hlbiBJbnZhbGlkYXRpb25TdGF0ZSBpcyBlbXB0eS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmNwcAppbmRl eCA4NzU1MzhmNzY4MDc1NzY1Zjg1Zjg5NmEwNjIyNzlmM2FjYjgzNjVjLi5iZGRmOTAyNWJhNjc3 YTRiMWIyYjVkM2IxNGZlZDAyYTJiMWRhNWMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uY3BwCkBAIC0zNCwx NSArMzQsMTUgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewogCi1z dGF0aWMgaW5saW5lIGJvb2wgaXNXaGl0ZXNwYWNlQ2hhcmFjdGVyKGNoYXIgY2hhcmFjdGVyKQor c3RhdGljIGlubGluZSBib29sIGlzV2hpdGVzcGFjZUNoYXJhY3RlcihjaGFyIGNoYXJhY3Rlciwg Ym9vbCBwcmVzZXJ2ZU5ld2xpbmUpCiB7Ci0gICAgcmV0dXJuIGNoYXJhY3RlciA9PSAnICcgfHwg Y2hhcmFjdGVyID09ICdcdCc7CisgICAgcmV0dXJuIGNoYXJhY3RlciA9PSAnICcgfHwgY2hhcmFj dGVyID09ICdcdCcgfHwgKGNoYXJhY3RlciA9PSAnXG4nICYmICFwcmVzZXJ2ZU5ld2xpbmUpOwog fQogCi1zdGF0aWMgdW5zaWduZWQgbW92ZVRvTmV4dE5vbldoaXRlc3BhY2VQb3NpdGlvbihjb25z dCBTdHJpbmdWaWV3JiB0ZXh0Q29udGVudCwgdW5zaWduZWQgc3RhcnRQb3NpdGlvbikKK3N0YXRp YyB1bnNpZ25lZCBtb3ZlVG9OZXh0Tm9uV2hpdGVzcGFjZVBvc2l0aW9uKGNvbnN0IFN0cmluZ1Zp ZXcmIHRleHRDb250ZW50LCB1bnNpZ25lZCBzdGFydFBvc2l0aW9uLCBib29sIHByZXNlcnZlTmV3 bGluZSkKIHsKICAgICBhdXRvIG5leHROb25XaGl0ZVNwYWNlUG9zaXRpb24gPSBzdGFydFBvc2l0 aW9uOwotICAgIHdoaWxlIChuZXh0Tm9uV2hpdGVTcGFjZVBvc2l0aW9uIDwgdGV4dENvbnRlbnQu bGVuZ3RoKCkgJiYgaXNXaGl0ZXNwYWNlQ2hhcmFjdGVyKHRleHRDb250ZW50W25leHROb25XaGl0 ZVNwYWNlUG9zaXRpb25dKSkKKyAgICB3aGlsZSAobmV4dE5vbldoaXRlU3BhY2VQb3NpdGlvbiA8 IHRleHRDb250ZW50Lmxlbmd0aCgpICYmIGlzV2hpdGVzcGFjZUNoYXJhY3Rlcih0ZXh0Q29udGVu dFtuZXh0Tm9uV2hpdGVTcGFjZVBvc2l0aW9uXSwgcHJlc2VydmVOZXdsaW5lKSkKICAgICAgICAg KytuZXh0Tm9uV2hpdGVTcGFjZVBvc2l0aW9uOwogICAgIHJldHVybiBuZXh0Tm9uV2hpdGVTcGFj ZVBvc2l0aW9uIC0gc3RhcnRQb3NpdGlvbjsKIH0KQEAgLTEwNCwxNiArMTA0LDE1IEBAIHZvaWQg SW5saW5lVGV4dEl0ZW06OmNyZWF0ZUFuZEFwcGVuZFRleHRJdGVtcyhJbmxpbmVJdGVtcyYgaW5s aW5lQ29udGVudCwgY29uc3QKICAgICAgICAgICAgIHJldHVybiBjaGFyYWN0ZXIgPT0gJ1xuJzsK ICAgICAgICAgfTsKIAotICAgICAgICBpZiAoaXNTZWdtZW50QnJlYWtDYW5kaWRhdGUodGV4dFtj dXJyZW50UG9zaXRpb25dKSkgewotICAgICAgICAgICAgLy8gU2VnbWVudCBicmVha3Mgd2l0aCBw cmVzZXJ2ZSBuZXcgbGluZSBzdHlsZSAod2hpdGUtc3BhY2U6IHByZSwgcHJlLXdyYXAsIGJyZWFr LXNwYWNlcyBhbmQgcHJlLWxpbmUpIGNvbXB1dGUgdG8gZm9yY2VkIGxpbmUgYnJlYWsuICAKLSAg ICAgICAgICAgIGlubGluZUNvbnRlbnQuYXBwZW5kKHN0eWxlLnByZXNlcnZlTmV3bGluZSgpID8g bWFrZVVuaXF1ZTxJbmxpbmVJdGVtPihpbmxpbmVCb3gsIFR5cGU6OkZvcmNlZExpbmVCcmVhaykK LSAgICAgICAgICAgICAgICA6IElubGluZVRleHRJdGVtOjpjcmVhdGVTZWdtZW50QnJlYWtJdGVt KGlubGluZUJveCwgY3VycmVudFBvc2l0aW9uKSk7CisgICAgICAgIC8vIFNlZ21lbnQgYnJlYWtz IHdpdGggcHJlc2VydmUgbmV3IGxpbmUgc3R5bGUgKHdoaXRlLXNwYWNlOiBwcmUsIHByZS13cmFw LCBicmVhay1zcGFjZXMgYW5kIHByZS1saW5lKSBjb21wdXRlIHRvIGZvcmNlZCBsaW5lIGJyZWFr LgorICAgICAgICBpZiAoaXNTZWdtZW50QnJlYWtDYW5kaWRhdGUodGV4dFtjdXJyZW50UG9zaXRp b25dKSAmJiBzdHlsZS5wcmVzZXJ2ZU5ld2xpbmUoKSkgeworICAgICAgICAgICAgaW5saW5lQ29u dGVudC5hcHBlbmQobWFrZVVuaXF1ZTxJbmxpbmVJdGVtPihpbmxpbmVCb3gsIFR5cGU6OkZvcmNl ZExpbmVCcmVhaykpOwogICAgICAgICAgICAgKytjdXJyZW50UG9zaXRpb247CiAgICAgICAgICAg ICBjb250aW51ZTsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChpc1doaXRlc3BhY2VDaGFyYWN0 ZXIodGV4dFtjdXJyZW50UG9zaXRpb25dKSkgewotICAgICAgICAgICAgYXV0byBsZW5ndGggPSBt b3ZlVG9OZXh0Tm9uV2hpdGVzcGFjZVBvc2l0aW9uKHRleHQsIGN1cnJlbnRQb3NpdGlvbik7Cisg ICAgICAgIGlmIChpc1doaXRlc3BhY2VDaGFyYWN0ZXIodGV4dFtjdXJyZW50UG9zaXRpb25dLCBz dHlsZS5wcmVzZXJ2ZU5ld2xpbmUoKSkpIHsKKyAgICAgICAgICAgIGF1dG8gbGVuZ3RoID0gbW92 ZVRvTmV4dE5vbldoaXRlc3BhY2VQb3NpdGlvbih0ZXh0LCBjdXJyZW50UG9zaXRpb24sIHN0eWxl LnByZXNlcnZlTmV3bGluZSgpKTsKICAgICAgICAgICAgIGF1dG8gc2ltcGxlU2luZ2xlV2hpdGVz cGFjZUNvbnRlbnQgPSB0ZXh0Q29udGV4dC5jYW5Vc2VTaW1wbGlmaWVkQ29udGVudE1lYXN1cmlu ZyAmJiAobGVuZ3RoID09IDEgfHwgc3R5bGUuY29sbGFwc2VXaGl0ZVNwYWNlKCkpOwogICAgICAg ICAgICAgYXV0byB3aWR0aCA9IHNpbXBsZVNpbmdsZVdoaXRlc3BhY2VDb250ZW50ID8gbWFrZU9w dGlvbmFsKExheW91dFVuaXQgeyBmb250LnNwYWNlV2lkdGgoKSB9KSA6IGlubGluZUl0ZW1XaWR0 aChjdXJyZW50UG9zaXRpb24sIGxlbmd0aCk7CiAgICAgICAgICAgICBpbmxpbmVDb250ZW50LmFw cGVuZChJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlV2hpdGVzcGFjZUl0ZW0oaW5saW5lQm94LCBjdXJy ZW50UG9zaXRpb24sIGxlbmd0aCwgd2lkdGgpKTsK