152104 2015-12-09 19:40:46 -0800 TextPainter: Make before and after selection painting more explicit. 2015-12-09 21:00:18 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan mmaxfield simon.fraser oldest_to_newest 1148050 0 zalan 2015-12-09 19:40:46 -0800 Instead of swapping start and end positions, we should call 0-startPosition and endPosition-length drawText calls. 1148056 1 267068 zalan 2015-12-09 19:54:38 -0800 Created attachment 267068 Patch 1148064 2 267068 mmaxfield 2015-12-09 20:48:36 -0800 Comment on attachment 267068 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=267068&action=review > Source/WebCore/rendering/TextPainter.cpp:172 > // For stroked painting, we have to change the text drawing mode. It's probably dangerous to leave that mutated as a side Comment should probably go above the GraphicsContextStateSaver. > Source/WebCore/rendering/TextPainter.cpp:184 > // paint only the text that is selected Period makes it a sentence. 1148065 3 zalan 2015-12-09 21:00:18 -0800 Committed r193891: <http://trac.webkit.org/changeset/193891> 267068 2015-12-09 19:54:38 -0800 2015-12-09 20:48:36 -0800 Patch bug-152104-20151209195408.patch text/plain 7129 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTkzODc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2Q4NDM4ODFhYzFjMWY2 NGVkM2E2YWE4NDliNmM1NGZiMDM2NWE4Ni4uYjMwNGJiMWNmZWVjNTE3ODAzNjVjOGYyNDk2Yjc1 MTNjOTExMjVmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE1LTEyLTA5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgVGV4dFBhaW50ZXI6IE1ha2Ug YmVmb3JlIGFuZCBhZnRlciBzZWxlY3Rpb24gcGFpbnRpbmcgbW9yZSBleHBsaWNpdC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjEwNAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluc3RlYWQgb2Ygc3dh cHBpbmcgc3RhcnQgZW5kIGVuZCBwb3NpdGlvbnMgYW5kIGV4cGVjdGluZyBUZXh0UGFpbnRlcjo6 ZHJhd1RleHRPckVtcGhhc2lzTWFya3MoKQorICAgICAgICB0byByZWNvZ25pemUgaXQsIHdlIGNh bGwgcGFpbnRpbmcgd2l0aCAwIC0gc3RhcnRQb3NpdGlvbiBhbmQgZW5kUG9zaXRpb24gLSBsZW5n dGguIAorCisgICAgICAgIE5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICog cmVuZGVyaW5nL1RleHRQYWludGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRQYWludGVy OjpkcmF3VGV4dE9yRW1waGFzaXNNYXJrcyk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0UGFpbnRl cjo6cGFpbnRUZXh0QW5kRW1waGFzaXNNYXJrc0lmTmVlZGVkKToKKyAgICAgICAgKFdlYkNvcmU6 OlRleHRQYWludGVyOjpwYWludFRleHQpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dFBhaW50ZXI6 OnBhaW50RW1waGFzaXNNYXJrc0lmTmVlZGVkKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OlRleHRQYWludGVyOjpwYWludFRleHRXaXRoU3R5bGUpOiBEZWxldGVkLgorICAgICAgICAqIHJl bmRlcmluZy9UZXh0UGFpbnRlci5oOgorCiAyMDE1LTEyLTA5ICBTaW1vbiBGcmFzZXIgIDxzaW1v bi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEFkanVzdCBsYXllciBiYWNraW5nIHN0b3Jl IGZvcm1hdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRQYWludGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0UGFpbnRlci5jcHAKaW5kZXggNzg0 NTY3Y2EyOGI3ZWYyY2FjZjI0NGZjMzAyYzk0N2RkNjcwOTBjMy4uZjg3ZjU2NDM0NmY1M2Q3MGJm ZTY4ODlkMDgxZmNiZmFmY2QxZWZjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1RleHRQYWludGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dFBh aW50ZXIuY3BwCkBAIC0xMDcsMjMgKzEwNywxMSBAQCBUZXh0UGFpbnRlcjo6VGV4dFBhaW50ZXIo R3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBib29sIHBhaW50U2VsZWN0ZWRUZXh0T25seSwgYgog dm9pZCBUZXh0UGFpbnRlcjo6ZHJhd1RleHRPckVtcGhhc2lzTWFya3MoY29uc3QgRm9udENhc2Nh ZGUmIGZvbnQsIGNvbnN0IFRleHRSdW4mIHRleHRSdW4sIGNvbnN0IEF0b21pY1N0cmluZyYgZW1w aGFzaXNNYXJrLAogICAgIGludCBlbXBoYXNpc01hcmtPZmZzZXQsIGNvbnN0IEZsb2F0UG9pbnQm IHRleHRPcmlnaW4sIGludCBzdGFydE9mZnNldCwgaW50IGVuZE9mZnNldCkKIHsKLSAgICBhdXRv IGRyYXdUZXh0ID0gWyZdKGludCBmcm9tLCBpbnQgdG8pCi0gICAgewotICAgICAgICBpZiAoZW1w aGFzaXNNYXJrLmlzRW1wdHkoKSkKLSAgICAgICAgICAgIG1fY29udGV4dC5kcmF3VGV4dChmb250 LCB0ZXh0UnVuLCB0ZXh0T3JpZ2luLCBmcm9tLCB0byk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAg ICAgIG1fY29udGV4dC5kcmF3RW1waGFzaXNNYXJrcyhmb250LCB0ZXh0UnVuLCBlbXBoYXNpc01h cmssIHRleHRPcmlnaW4gKyBJbnRTaXplKDAsIGVtcGhhc2lzTWFya09mZnNldCksIGZyb20sIHRv KTsKLSAgICB9OwotCi0gICAgaWYgKHN0YXJ0T2Zmc2V0IDw9IGVuZE9mZnNldCkgewotICAgICAg ICBkcmF3VGV4dChzdGFydE9mZnNldCwgZW5kT2Zmc2V0KTsKLSAgICAgICAgcmV0dXJuOwotICAg IH0KLSAgICAKLSAgICBpZiAoZW5kT2Zmc2V0ID4gMCkKLSAgICAgICAgZHJhd1RleHQoMCwgZW5k T2Zmc2V0KTsKLSAgICBpZiAoc3RhcnRPZmZzZXQgPCBtX2xlbmd0aCkKLSAgICAgICAgZHJhd1Rl eHQoc3RhcnRPZmZzZXQsIG1fbGVuZ3RoKTsKKyAgICBBU1NFUlQoc3RhcnRPZmZzZXQgPCBlbmRP ZmZzZXQpOworICAgIGlmIChlbXBoYXNpc01hcmsuaXNFbXB0eSgpKQorICAgICAgICBtX2NvbnRl eHQuZHJhd1RleHQoZm9udCwgdGV4dFJ1biwgdGV4dE9yaWdpbiwgc3RhcnRPZmZzZXQsIGVuZE9m ZnNldCk7CisgICAgZWxzZQorICAgICAgICBtX2NvbnRleHQuZHJhd0VtcGhhc2lzTWFya3MoZm9u dCwgdGV4dFJ1biwgZW1waGFzaXNNYXJrLCB0ZXh0T3JpZ2luICsgSW50U2l6ZSgwLCBlbXBoYXNp c01hcmtPZmZzZXQpLCBzdGFydE9mZnNldCwgZW5kT2Zmc2V0KTsKIH0KIAogdm9pZCBUZXh0UGFp bnRlcjo6cGFpbnRUZXh0V2l0aFNoYWRvd3MoY29uc3QgU2hhZG93RGF0YSogc2hhZG93LCBjb25z dCBGb250Q2FzY2FkZSYgZm9udCwgY29uc3QgVGV4dFJ1biYgdGV4dFJ1biwgY29uc3QgQXRvbWlj U3RyaW5nJiBlbXBoYXNpc01hcmssCkBAIC0xNTMsOCArMTQxLDExIEBAIHZvaWQgVGV4dFBhaW50 ZXI6OnBhaW50VGV4dFdpdGhTaGFkb3dzKGNvbnN0IFNoYWRvd0RhdGEqIHNoYWRvdywgY29uc3Qg Rm9udENhc2NhCiAgICAgfQogfQogCi12b2lkIFRleHRQYWludGVyOjpwYWludEVtcGhhc2lzTWFy a3NJZk5lZWRlZChpbnQgc3RhcnRPZmZzZXQsIGludCBlbmRPZmZzZXQsIGNvbnN0IFRleHRQYWlu dFN0eWxlJiBwYWludFN0eWxlLCBjb25zdCBTaGFkb3dEYXRhKiBzaGFkb3cpCit2b2lkIFRleHRQ YWludGVyOjpwYWludFRleHRBbmRFbXBoYXNpc01hcmtzSWZOZWVkZWQoaW50IHN0YXJ0T2Zmc2V0 LCBpbnQgZW5kT2Zmc2V0LCBjb25zdCBUZXh0UGFpbnRTdHlsZSYgcGFpbnRTdHlsZSwgY29uc3Qg U2hhZG93RGF0YSogc2hhZG93KQogeworICAgIC8vIEZJWE1FOiBUcnVuY2F0ZSByaWdodC10by1s ZWZ0IHRleHQgY29ycmVjdGx5LgorICAgIHBhaW50VGV4dFdpdGhTaGFkb3dzKHNoYWRvdywgbV9m b250LCBtX3RleHRSdW4sIG51bGxBdG9tLCAwLCBzdGFydE9mZnNldCwgZW5kT2Zmc2V0LCBtX3Rl eHRPcmlnaW4sIHBhaW50U3R5bGUuc3Ryb2tlV2lkdGggPiAwKTsKKwogICAgIGlmIChtX2VtcGhh c2lzTWFyay5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIApAQCAtMTcyLDI5ICsxNjMsMzAg QEAgdm9pZCBUZXh0UGFpbnRlcjo6cGFpbnRFbXBoYXNpc01hcmtzSWZOZWVkZWQoaW50IHN0YXJ0 T2Zmc2V0LCBpbnQgZW5kT2Zmc2V0LCBjb24KICAgICBpZiAobV9jb21iaW5lZFRleHQpCiAgICAg ICAgIG1fY29udGV4dC5jb25jYXRDVE0ocm90YXRpb24obV9ib3hSZWN0LCBDb3VudGVyY2xvY2t3 aXNlKSk7CiB9Ci0KLXZvaWQgVGV4dFBhaW50ZXI6OnBhaW50VGV4dFdpdGhTdHlsZShjb25zdCBU ZXh0UGFpbnRTdHlsZSYgcGFpbnRTdHlsZSwgaW50IHN0YXJ0T2Zmc2V0LCBpbnQgZW5kT2Zmc2V0 LCBjb25zdCBTaGFkb3dEYXRhKiBzaGFkb3cpCi17Ci0gICAgR3JhcGhpY3NDb250ZXh0U3RhdGVT YXZlciBzdGF0ZVNhdmVyKG1fY29udGV4dCwgcGFpbnRTdHlsZS5zdHJva2VXaWR0aCA+IDApOwot ICAgIHVwZGF0ZUdyYXBoaWNzQ29udGV4dChtX2NvbnRleHQsIHBhaW50U3R5bGUpOwotICAgIC8v IEZJWE1FOiBUcnVuY2F0ZSByaWdodC10by1sZWZ0IHRleHQgY29ycmVjdGx5LgotICAgIHBhaW50 VGV4dFdpdGhTaGFkb3dzKHNoYWRvdywgbV9mb250LCBtX3RleHRSdW4sIG51bGxBdG9tLCAwLCBz dGFydE9mZnNldCwgZW5kT2Zmc2V0LCBtX3RleHRPcmlnaW4sIHBhaW50U3R5bGUuc3Ryb2tlV2lk dGggPiAwKTsKLSAgICBwYWludEVtcGhhc2lzTWFya3NJZk5lZWRlZChzdGFydE9mZnNldCwgZW5k T2Zmc2V0LCBwYWludFN0eWxlLCBzaGFkb3cpOwotfQogICAgIAogdm9pZCBUZXh0UGFpbnRlcjo6 cGFpbnRUZXh0KCkKIHsKICAgICBpZiAoIW1fcGFpbnRTZWxlY3RlZFRleHRPbmx5KSB7CisgICAg ICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcihtX2NvbnRleHQsIG1fdGV4 dFBhaW50U3R5bGUuc3Ryb2tlV2lkdGggPiAwKTsKKyAgICAgICAgdXBkYXRlR3JhcGhpY3NDb250 ZXh0KG1fY29udGV4dCwgbV90ZXh0UGFpbnRTdHlsZSk7CiAgICAgICAgIC8vIEZvciBzdHJva2Vk IHBhaW50aW5nLCB3ZSBoYXZlIHRvIGNoYW5nZSB0aGUgdGV4dCBkcmF3aW5nIG1vZGUuIEl0J3Mg cHJvYmFibHkgZGFuZ2Vyb3VzIHRvIGxlYXZlIHRoYXQgbXV0YXRlZCBhcyBhIHNpZGUKICAgICAg ICAgLy8gZWZmZWN0LCBzbyBvbmx5IHdoZW4gd2Uga25vdyB3ZSdyZSBzdHJva2luZywgZG8gYSBz YXZlL3Jlc3RvcmUuCi0gICAgICAgIGludCBzdGFydFBvc2l0aW9uID0gbV9wYWludFNlbGVjdGVk VGV4dFNlcGFyYXRlbHkgPyBtX3NlbGVjdGlvbkVuZCA6IDA7Ci0gICAgICAgIGludCBlbmRQb3Np dGlvbiA9IG1fcGFpbnRTZWxlY3RlZFRleHRTZXBhcmF0ZWx5ID8gbV9zZWxlY3Rpb25TdGFydCA6 IG1fbGVuZ3RoOwotICAgICAgICBwYWludFRleHRXaXRoU3R5bGUobV90ZXh0UGFpbnRTdHlsZSwg c3RhcnRQb3NpdGlvbiwgZW5kUG9zaXRpb24sIG1fdGV4dFNoYWRvdyk7CisgICAgICAgIGlmICht X3BhaW50U2VsZWN0ZWRUZXh0U2VwYXJhdGVseSkgeworICAgICAgICAgICAgLy8gUGFpbnQgdGhl IGJlZm9yZSBhbmQgYWZ0ZXIgc2VsZWN0aW9uIHBhcnRzLgorICAgICAgICAgICAgaWYgKG1fc2Vs ZWN0aW9uU3RhcnQgPiAwKQorICAgICAgICAgICAgICAgIHBhaW50VGV4dEFuZEVtcGhhc2lzTWFy a3NJZk5lZWRlZCgwLCBtX3NlbGVjdGlvblN0YXJ0LCBtX3RleHRQYWludFN0eWxlLCBtX3RleHRT aGFkb3cpOworICAgICAgICAgICAgaWYgKG1fc2VsZWN0aW9uRW5kIDwgbV9sZW5ndGgpCisgICAg ICAgICAgICAgICAgcGFpbnRUZXh0QW5kRW1waGFzaXNNYXJrc0lmTmVlZGVkKG1fc2VsZWN0aW9u RW5kLCBtX2xlbmd0aCwgbV90ZXh0UGFpbnRTdHlsZSwgbV90ZXh0U2hhZG93KTsKKyAgICAgICAg fSBlbHNlCisgICAgICAgICAgICBwYWludFRleHRBbmRFbXBoYXNpc01hcmtzSWZOZWVkZWQoMCwg bV9sZW5ndGgsIG1fdGV4dFBhaW50U3R5bGUsIG1fdGV4dFNoYWRvdyk7CiAgICAgfQogCiAgICAg Ly8gcGFpbnQgb25seSB0aGUgdGV4dCB0aGF0IGlzIHNlbGVjdGVkCi0gICAgaWYgKChtX3BhaW50 U2VsZWN0ZWRUZXh0T25seSB8fCBtX3BhaW50U2VsZWN0ZWRUZXh0U2VwYXJhdGVseSkgJiYgbV9z ZWxlY3Rpb25TdGFydCA8IG1fc2VsZWN0aW9uRW5kKQotICAgICAgICBwYWludFRleHRXaXRoU3R5 bGUobV9zZWxlY3Rpb25QYWludFN0eWxlLCBtX3NlbGVjdGlvblN0YXJ0LCBtX3NlbGVjdGlvbkVu ZCwgbV9zZWxlY3Rpb25TaGFkb3cpOworICAgIGlmICgobV9wYWludFNlbGVjdGVkVGV4dE9ubHkg fHwgbV9wYWludFNlbGVjdGVkVGV4dFNlcGFyYXRlbHkpICYmIG1fc2VsZWN0aW9uU3RhcnQgPCBt X3NlbGVjdGlvbkVuZCkgeworICAgICAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRl U2F2ZXIobV9jb250ZXh0LCBtX3NlbGVjdGlvblBhaW50U3R5bGUuc3Ryb2tlV2lkdGggPiAwKTsK KyAgICAgICAgdXBkYXRlR3JhcGhpY3NDb250ZXh0KG1fY29udGV4dCwgbV9zZWxlY3Rpb25QYWlu dFN0eWxlKTsKKyAgICAgICAgcGFpbnRUZXh0QW5kRW1waGFzaXNNYXJrc0lmTmVlZGVkKG1fc2Vs ZWN0aW9uU3RhcnQsIG1fc2VsZWN0aW9uRW5kLCBtX3NlbGVjdGlvblBhaW50U3R5bGUsIG1fc2Vs ZWN0aW9uU2hhZG93KTsKKyAgICB9CiB9CiAKICNpZiBFTkFCTEUoQ1NTM19URVhUX0RFQ09SQVRJ T05fU0tJUF9JTkspCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dFBh aW50ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0UGFpbnRlci5oCmluZGV4IGI3 Mjg2MTQzYWI2ZmIzODlhNDg0NzI5NDJiMjhiNjExNjZhNDNkYWUuLjA0MTEyNTk1YTU0ZjcxYzBi ZmY1NjI5ZmVjNmQ0NDU2NThjMTk5NmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9UZXh0UGFpbnRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0UGFp bnRlci5oCkBAIC01OSw4ICs1OSw3IEBAIHByaXZhdGU6CiAgICAgICAgIGNvbnN0IEZsb2F0UG9p bnQmIHRleHRPcmlnaW4sIGludCBzdGFydE9mZnNldCwgaW50IGVuZE9mZnNldCk7CiAgICAgdm9p ZCBwYWludFRleHRXaXRoU2hhZG93cyhjb25zdCBTaGFkb3dEYXRhKiwgY29uc3QgRm9udENhc2Nh ZGUmLCBjb25zdCBUZXh0UnVuJiwgY29uc3QgQXRvbWljU3RyaW5nJiBlbXBoYXNpc01hcmssIGlu dCBlbXBoYXNpc01hcmtPZmZzZXQsCiAgICAgICAgIGludCBzdGFydE9mZnNldCwgaW50IGVuZE9m ZnNldCwgY29uc3QgRmxvYXRQb2ludCYgdGV4dE9yaWdpbiwgYm9vbCBzdHJva2VkKTsKLSAgICB2 b2lkIHBhaW50VGV4dFdpdGhTdHlsZShjb25zdCBUZXh0UGFpbnRTdHlsZSYsIGludCBzdGFydE9m ZnNldCwgaW50IGVuZE9mZnNldCwgY29uc3QgU2hhZG93RGF0YSopOwotICAgIHZvaWQgcGFpbnRF bXBoYXNpc01hcmtzSWZOZWVkZWQoaW50IHN0YXJ0T2Zmc2V0LCBpbnQgZW5kT2Zmc2V0LCBjb25z dCBUZXh0UGFpbnRTdHlsZSYsIGNvbnN0IFNoYWRvd0RhdGEqKTsKKyAgICB2b2lkIHBhaW50VGV4 dEFuZEVtcGhhc2lzTWFya3NJZk5lZWRlZChpbnQgc3RhcnRPZmZzZXQsIGludCBlbmRPZmZzZXQs IGNvbnN0IFRleHRQYWludFN0eWxlJiwgY29uc3QgU2hhZG93RGF0YSopOwogCiAgICAgR3JhcGhp Y3NDb250ZXh0JiBtX2NvbnRleHQ7CiAgICAgVGV4dFBhaW50U3R5bGUmIG1fdGV4dFBhaW50U3R5 bGU7Cg==