138754 2014-11-14 13:58:21 -0800 Remove computeTextPaintStyle's RenderText dependency. 2014-11-14 16:26:57 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn koivisto kondapallykalyan mmaxfield oldest_to_newest 1048859 0 zalan 2014-11-14 13:58:21 -0800 from TextPaintStyle computeTextPaintStyle(const RenderText&, const RenderStyle&, const PaintInfo&); to TextPaintStyle computeTextPaintStyle(const Frame&, const RenderStyle&, const PaintInfo&); So that in simple line layout, we can compute text paint style without across multiple renderers. 1048861 1 241622 zalan 2014-11-14 14:05:22 -0800 Created attachment 241622 Patch 1048866 2 mmaxfield 2014-11-14 14:18:47 -0800 Why is frame better than RenderText? unofficial r=me 1048926 3 241622 commit-queue 2014-11-14 16:26:53 -0800 Comment on attachment 241622 Patch Clearing flags on attachment: 241622 Committed r176147: <http://trac.webkit.org/changeset/176147> 1048927 4 commit-queue 2014-11-14 16:26:57 -0800 All reviewed patches have been landed. Closing bug. 241622 2014-11-14 14:05:22 -0800 2014-11-14 16:26:53 -0800 Patch bug-138754-20141114140530.patch text/plain 5840 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2MTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTBlYTg0MGU5ZTg3N2Uy MDRiOGI4MzY3MGRhZmY2N2ZlZGFmODBkMC4uMDZjMjBkMDg0ZDE5MDc3YzE3NWMyOTgyMzQ5Yzkz NjkyM2NiYjI2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTExLTE0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIGNvbXB1dGVUZXh0 UGFpbnRTdHlsZSdzIFJlbmRlclRleHQgZGVwZW5kZW5jeS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzODc1NAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNvIHRoYXQgd2UgY2FuIGNvbXB1dGUgdGV4dCBw YWludCBzdHlsZSBhY3Jvc3MgcmVuZGVyZXJzIGluIHNpbXBsZSBsaW5lIGxheW91dC4KKworICAg ICAgICBObyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIHJlbmRlcmluZy9J bmxpbmVUZXh0Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OnBhaW50 KToKKyAgICAgICAgKiByZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZ1bmN0aW9ucy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpwYWludEZsb3cpOgorICAgICAgICAq IHJlbmRlcmluZy9UZXh0UGFpbnRTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21wdXRl VGV4dFBhaW50U3R5bGUpOgorICAgICAgICAqIHJlbmRlcmluZy9UZXh0UGFpbnRTdHlsZS5oOgor CiAyMDE0LTExLTE0ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAg ICAgICAgIE1vdmUgRGF0YURldGVjdG9ycyBzY2FubmluZyBjb2RlIHRvIFdlYkNvcmUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcAppbmRleCA0OTFjZDRmZmVkNWI5 MzZiNGZhYmEwZjY2OTA1YzcwMGNlMDlkZmJhLi4wYzAxY2E5MzQzMmU1YTU5YWZmODE2YjA3MTM0 NTkxYmEwYzVlMGVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5l VGV4dEJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3gu Y3BwCkBAIC01MzAsNyArNTMwLDcgQEAgdm9pZCBJbmxpbmVUZXh0Qm94OjpwYWludChQYWludElu Zm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2V0LAogICAgIGJvb2wg dXNlQ3VzdG9tVW5kZXJsaW5lcyA9IGNvbnRhaW5zQ29tcG9zaXRpb24gJiYgcmVuZGVyZXIoKS5m cmFtZSgpLmVkaXRvcigpLmNvbXBvc2l0aW9uVXNlc0N1c3RvbVVuZGVybGluZXMoKTsKIAogICAg IC8vIERldGVybWluZSB0aGUgdGV4dCBjb2xvcnMgYW5kIHNlbGVjdGlvbiBjb2xvcnMuCi0gICAg VGV4dFBhaW50U3R5bGUgdGV4dFBhaW50U3R5bGUgPSBjb21wdXRlVGV4dFBhaW50U3R5bGUocmVu ZGVyZXIoKSwgbGluZVN0eWxlLCBwYWludEluZm8pOworICAgIFRleHRQYWludFN0eWxlIHRleHRQ YWludFN0eWxlID0gY29tcHV0ZVRleHRQYWludFN0eWxlKHJlbmRlcmVyKCkuZnJhbWUoKSwgbGlu ZVN0eWxlLCBwYWludEluZm8pOwogCiAgICAgYm9vbCBwYWludFNlbGVjdGVkVGV4dE9ubHk7CiAg ICAgYm9vbCBwYWludFNlbGVjdGVkVGV4dFNlcGFyYXRlbHk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZ1bmN0aW9ucy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZ1bmN0aW9ucy5jcHAKaW5kZXggNmE3 YzNiMWRiNDJmMzgzNDFhNWIwMmI5NDIyMWZmM2E3NTEwNDBjYi4uYzZhYzcyYmFkMDZhNmE0OGFj NTkxOGI5YTdkYTFkZGYzYmViZWEyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1NpbXBsZUxpbmVMYXlvdXRGdW5jdGlvbnMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0RnVuY3Rpb25zLmNwcApAQCAtNjcsMTUgKzY3LDExIEBA IHZvaWQgcGFpbnRGbG93KGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdywgY29uc3QgTGF5b3V0 JiBsYXlvdXQsIFBhaW50SW5mbyYgcGFpCiAgICAgaWYgKHN0eWxlLnZpc2liaWxpdHkoKSAhPSBW SVNJQkxFKQogICAgICAgICByZXR1cm47CiAKLSAgICBSZW5kZXJUZXh0JiB0ZXh0UmVuZGVyZXIg PSBkb3duY2FzdDxSZW5kZXJUZXh0PigqZmxvdy5maXJzdENoaWxkKCkpOwotICAgIEFTU0VSVCgh dGV4dFJlbmRlcmVyLmZpcnN0VGV4dEJveCgpKTsKLQogICAgIGJvb2wgZGVidWdCb3JkZXJzRW5h YmxlZCA9IGZsb3cuZnJhbWUoKS5zZXR0aW5ncygpLnNpbXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRl cnNFbmFibGVkKCk7CiAKICAgICBHcmFwaGljc0NvbnRleHQmIGNvbnRleHQgPSAqcGFpbnRJbmZv LmNvbnRleHQ7Ci0KICAgICBjb25zdCBGb250JiBmb250ID0gc3R5bGUuZm9udCgpOwotICAgIFRl eHRQYWludFN0eWxlIHRleHRQYWludFN0eWxlID0gY29tcHV0ZVRleHRQYWludFN0eWxlKHRleHRS ZW5kZXJlciwgc3R5bGUsIHBhaW50SW5mbyk7CisgICAgVGV4dFBhaW50U3R5bGUgdGV4dFBhaW50 U3R5bGUgPSBjb21wdXRlVGV4dFBhaW50U3R5bGUoZmxvdy5mcmFtZSgpLCBzdHlsZSwgcGFpbnRJ bmZvKTsKICAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIoY29udGV4dCwg dGV4dFBhaW50U3R5bGUuc3Ryb2tlV2lkdGggPiAwKTsKIAogICAgIHVwZGF0ZUdyYXBoaWNzQ29u dGV4dChjb250ZXh0LCB0ZXh0UGFpbnRTdHlsZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvVGV4dFBhaW50U3R5bGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1RleHRQYWludFN0eWxlLmNwcAppbmRleCBiMzk4ZmRkY2NjODVjOGQxZDI2Yjc2MzQzZTZkY2Jj OTQzZDJkMTQwLi4yMjI2ZWNkZjY5ZTUzYmJmNmJjODlkZTlkYmViYzczNjAzOTU2YTMxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dFBhaW50U3R5bGUuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0UGFpbnRTdHlsZS5jcHAKQEAgLTc0LDcgKzc0 LDcgQEAgc3RhdGljIENvbG9yIGFkanVzdENvbG9yRm9yVmlzaWJpbGl0eU9uQmFja2dyb3VuZChD b2xvciB0ZXh0Q29sb3IsIENvbG9yIGJhY2tncm8KICAgICByZXR1cm4gdGV4dENvbG9yLmxpZ2h0 KCk7CiB9CiAKLVRleHRQYWludFN0eWxlIGNvbXB1dGVUZXh0UGFpbnRTdHlsZShjb25zdCBSZW5k ZXJUZXh0JiByZW5kZXJlciwgY29uc3QgUmVuZGVyU3R5bGUmIGxpbmVTdHlsZSwgY29uc3QgUGFp bnRJbmZvJiBwYWludEluZm8pCitUZXh0UGFpbnRTdHlsZSBjb21wdXRlVGV4dFBhaW50U3R5bGUo Y29uc3QgRnJhbWUmIGZyYW1lLCBjb25zdCBSZW5kZXJTdHlsZSYgbGluZVN0eWxlLCBjb25zdCBQ YWludEluZm8mIHBhaW50SW5mbykKIHsKICAgICBUZXh0UGFpbnRTdHlsZSBwYWludFN0eWxlKGxp bmVTdHlsZS5jb2xvclNwYWNlKCkpOwogCkBAIC05MSw5ICs5MSw5IEBAIFRleHRQYWludFN0eWxl IGNvbXB1dGVUZXh0UGFpbnRTdHlsZShjb25zdCBSZW5kZXJUZXh0JiByZW5kZXJlciwgY29uc3Qg UmVuZGVyU3R5CiAgICAgfQogCiAgICAgaWYgKGxpbmVTdHlsZS5pbnNpZGVEZWZhdWx0QnV0dG9u KCkpIHsKLSAgICAgICAgUGFnZSogcGFnZSA9IHJlbmRlcmVyLmZyYW1lKCkucGFnZSgpOworICAg ICAgICBQYWdlKiBwYWdlID0gZnJhbWUucGFnZSgpOwogICAgICAgICBpZiAocGFnZSAmJiBwYWdl LT5mb2N1c0NvbnRyb2xsZXIoKS5pc0FjdGl2ZSgpKSB7Ci0gICAgICAgICAgICBwYWludFN0eWxl LmZpbGxDb2xvciA9IHJlbmRlcmVyLnRoZW1lKCkuc3lzdGVtQ29sb3IoQ1NTVmFsdWVBY3RpdmVi dXR0b250ZXh0KTsKKyAgICAgICAgICAgIHBhaW50U3R5bGUuZmlsbENvbG9yID0gcGFnZS0+dGhl bWUoKS5zeXN0ZW1Db2xvcihDU1NWYWx1ZUFjdGl2ZWJ1dHRvbnRleHQpOwogICAgICAgICAgICAg cmV0dXJuIHBhaW50U3R5bGU7CiAgICAgICAgIH0KICAgICB9CkBAIC0xMDEsMTAgKzEwMSwxMCBA QCBUZXh0UGFpbnRTdHlsZSBjb21wdXRlVGV4dFBhaW50U3R5bGUoY29uc3QgUmVuZGVyVGV4dCYg cmVuZGVyZXIsIGNvbnN0IFJlbmRlclN0eQogICAgIHBhaW50U3R5bGUuZmlsbENvbG9yID0gbGlu ZVN0eWxlLnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eVdlYmtpdFRleHRGaWxsQ29s b3IpOwogCiAgICAgYm9vbCBmb3JjZUJhY2tncm91bmRUb1doaXRlID0gZmFsc2U7Ci0gICAgaWYg KHJlbmRlcmVyLmRvY3VtZW50KCkucHJpbnRpbmcoKSkgeworICAgIGlmIChmcmFtZS5kb2N1bWVu dCgpICYmIGZyYW1lLmRvY3VtZW50KCktPnByaW50aW5nKCkpIHsKICAgICAgICAgaWYgKGxpbmVT dHlsZS5wcmludENvbG9yQWRqdXN0KCkgPT0gUHJpbnRDb2xvckFkanVzdEVjb25vbXkpCiAgICAg ICAgICAgICBmb3JjZUJhY2tncm91bmRUb1doaXRlID0gdHJ1ZTsKLSAgICAgICAgaWYgKHJlbmRl cmVyLmZyYW1lKCkuc2V0dGluZ3MoKS5zaG91bGRQcmludEJhY2tncm91bmRzKCkpCisgICAgICAg IGlmIChmcmFtZS5zZXR0aW5ncygpLnNob3VsZFByaW50QmFja2dyb3VuZHMoKSkKICAgICAgICAg ICAgIGZvcmNlQmFja2dyb3VuZFRvV2hpdGUgPSBmYWxzZTsKICAgICB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0UGFpbnRTdHlsZS5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1RleHRQYWludFN0eWxlLmgKaW5kZXggZjBkMjUyOGI4MzUwZWIzNDFiOGIw MzcwMGUwZDRkZmQyNjZjZmIyZS4uOTk0ZTQ1ZGNmNGU4YTQ4OTg4NGNkY2JjMjNiMWMyMDZiNzBh OTgwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRQYWludFN0eWxl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRQYWludFN0eWxlLmgKQEAgLTMx LDYgKzMxLDcgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitjbGFzcyBGcmFtZTsKIGNsYXNz IEdyYXBoaWNzQ29udGV4dDsKIGNsYXNzIFJlbmRlclRleHQ7CiBjbGFzcyBSZW5kZXJTdHlsZTsK QEAgLTUxLDcgKzUyLDcgQEAgc3RydWN0IFRleHRQYWludFN0eWxlIHsKICNlbmRpZgogfTsKIAot VGV4dFBhaW50U3R5bGUgY29tcHV0ZVRleHRQYWludFN0eWxlKGNvbnN0IFJlbmRlclRleHQmLCBj b25zdCBSZW5kZXJTdHlsZSYsIGNvbnN0IFBhaW50SW5mbyYpOworVGV4dFBhaW50U3R5bGUgY29t cHV0ZVRleHRQYWludFN0eWxlKGNvbnN0IEZyYW1lJiwgY29uc3QgUmVuZGVyU3R5bGUmLCBjb25z dCBQYWludEluZm8mKTsKIFRleHRQYWludFN0eWxlIGNvbXB1dGVUZXh0U2VsZWN0aW9uUGFpbnRT dHlsZShjb25zdCBUZXh0UGFpbnRTdHlsZSYsIGNvbnN0IFJlbmRlclRleHQmLCBjb25zdCBSZW5k ZXJTdHlsZSYsIGNvbnN0IFBhaW50SW5mbyYsIGJvb2wmIHBhaW50U2VsZWN0ZWRUZXh0T25seSwg Ym9vbCYgcGFpbnRTZWxlY3RlZFRleHRTZXBhcmF0ZWx5LCBjb25zdCBTaGFkb3dEYXRhKiYgc2Vs ZWN0aW9uU2hhZG93KTsKIAogZW51bSBGaWxsQ29sb3JUeXBlIHsgVXNlTm9ybWFsRmlsbENvbG9y LCBVc2VFbXBoYXNpc01hcmtDb2xvciB9Owo=