46744 2010-09-28 12:03:28 -0700 [Qt] Text drawing taints GraphicsContext's QPainter::pen() 2010-09-28 12:56:55 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 kling webkit-qt-unassigned abarth eric webkit.review.bot oldest_to_newest 286424 0 kling 2010-09-28 12:03:28 -0700 Drawing text currently replaces the GC's pen. This means that using canvas's strokeText() will make the canvas context's strokeStyle lose sync with the GC's pen. 286426 1 69082 kling 2010-09-28 12:04:57 -0700 Created attachment 69082 Proposed patch 286430 2 69082 kenneth 2010-09-28 12:07:21 -0700 Comment on attachment 69082 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=69082&action=review LGTM > WebCore/platform/graphics/qt/FontQt.cpp:212 > + QPen oldPen = p->pen(); Persoannly I like previousPen better than old. 286443 3 kling 2010-09-28 12:19:59 -0700 Committed r68549: <http://trac.webkit.org/changeset/68549> 286476 4 webkit.review.bot 2010-09-28 12:56:55 -0700 http://trac.webkit.org/changeset/68549 might have broken SnowLeopard Intel Release (Tests) 69082 2010-09-28 12:04:57 -0700 2010-09-28 12:07:21 -0700 Proposed patch bug-46744.diff text/plain 6016 kling ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5NGFhYzhlLi4yYTNjOWEzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDkt MjggIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5nQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFRleHQgZHJhd2luZyB0 YWludHMgR3JhcGhpY3NDb250ZXh0J3MgUVBhaW50ZXI6OnBlbigpCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Njc0NAorCisgICAgICAgIEFkZCB0ZXN0 IHRvIGNoZWNrIHRoYXQgc3Ryb2tlVGV4dCgpIGRvZXNuJ3QgYnJlYWsgdGhlIGZpbGxTdHlsZQor ICAgICAgICBhbmQgZmlsbFRleHQoKSBkb2Vzbid0IGJyZWFrIHRoZSBzdHJva2VTdHlsZS4KKwor ICAgICAgICAqIGZhc3QvY2FudmFzL2NhbnZhcy1zdHlsZS1pbnRhY3QtYWZ0ZXItdGV4dC1leHBl Y3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvY2FudmFzL2NhbnZhcy1zdHlsZS1pbnRh Y3QtYWZ0ZXItdGV4dC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2NhbnZhcy9zY3JpcHQt dGVzdHMvY2FudmFzLXN0eWxlLWludGFjdC1hZnRlci10ZXh0LmpzOiBBZGRlZC4KKwogMjAxMC0w OS0yOCAgQW5kcmVpIFBvcGVzY3UgIDxhbmRyZWlwQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jYW52 YXMvY2FudmFzLXN0eWxlLWludGFjdC1hZnRlci10ZXh0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRl c3RzL2Zhc3QvY2FudmFzL2NhbnZhcy1zdHlsZS1pbnRhY3QtYWZ0ZXItdGV4dC1leHBlY3RlZC50 eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOWM3NTVmYQotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL2NhbnZhcy1zdHlsZS1pbnRhY3QtYWZ0 ZXItdGV4dC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwzMSBAQAorVGVzdCB0aGF0IHRoZSByZW5k ZXJpbmcgY29udGV4dCdzIHN0cm9rZVN0eWxlIGFuZCBmaWxsU3R5bGUgYXJlIGludGFjdCBhZnRl ciBjYWxsaW5nIHN0cm9rZVRleHQoKSBhbmQgZmlsbFRleHQoKQorCitPbiBzdWNjZXNzLCB5b3Ug d2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBD T01QTEVURSIuCisKKworQ2hlY2tpbmcgaW5pdGlhbCBzdGF0ZSBmb3Igc2FuaXR5CitQQVNTIGN0 eC5maWxsU3R5bGUgaXMgJyNmZjAwMDAnCitQQVNTIGltZ2RhdGFbMF0gaXMgMjU1CitQQVNTIGlt Z2RhdGFbMV0gaXMgMAorUEFTUyBpbWdkYXRhWzJdIGlzIDAKK1BBU1MgaW1nZGF0YVszXSBpcyAy NTUKK1BBU1MgaW1nZGF0YVs0XSBpcyAwCitQQVNTIGltZ2RhdGFbNV0gaXMgMAorUEFTUyBpbWdk YXRhWzZdIGlzIDAKK1BBU1MgaW1nZGF0YVs3XSBpcyAwCitDYWxsaW5nIGZpbGxUZXh0KCkgdG8g dHJ5IGFuZCBicmVhayB0aGUgc3Ryb2tlU3R5bGUuCitQQVNTIGN0eC5zdHJva2VTdHlsZSBpcyAn IzAwODAwMCcKK1BBU1MgaW1nZGF0YVswXSBpcyAwCitQQVNTIGltZ2RhdGFbMV0gaXMgMTI4CitQ QVNTIGltZ2RhdGFbMl0gaXMgMAorUEFTUyBpbWdkYXRhWzNdIGlzIDI1NQorQ2FsbGluZyBzdHJv a2VUZXh0KCkgdG8gdHJ5IGFuZCBicmVhayB0aGUgZmlsbFN0eWxlLgorUEFTUyBjdHguZmlsbFN0 eWxlIGlzICcjMDA4MDAwJworUEFTUyBpbWdkYXRhWzBdIGlzIDAKK1BBU1MgaW1nZGF0YVsxXSBp cyAxMjgKK1BBU1MgaW1nZGF0YVsyXSBpcyAwCitQQVNTIGltZ2RhdGFbM10gaXMgMjU1CitQQVNT IHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvY2FudmFzLXN0eWxlLWludGFjdC1hZnRlci10ZXh0 Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9jYW52YXMtc3R5bGUtaW50YWN0LWFmdGVy LXRleHQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kMmNmOGRhCi0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvY2FudmFzLXN0eWxlLWlu dGFjdC1hZnRlci10ZXh0Lmh0bWwKQEAgLTAsMCArMSwxMyBAQAorPCFET0NUWVBFIEhUTUwgUFVC TElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0i c3R5bGVzaGVldCIgaHJlZj0iLi4vanMvcmVzb3VyY2VzL2pzLXRlc3Qtc3R5bGUuY3NzIj4KKzxz Y3JpcHQgc3JjPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9o ZWFkPgorPGJvZHk+Cis8cCBpZD0iZGVzY3JpcHRpb24iPjwvcD4KKzxkaXYgaWQ9ImNvbnNvbGUi PjwvZGl2PgorPHNjcmlwdCBzcmM9InNjcmlwdC10ZXN0cy9jYW52YXMtc3R5bGUtaW50YWN0LWFm dGVyLXRleHQuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9qcy10 ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC9jYW52YXMvc2NyaXB0LXRlc3RzL2NhbnZhcy1zdHlsZS1pbnRhY3QtYWZ0 ZXItdGV4dC5qcyBiL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL3NjcmlwdC10ZXN0cy9jYW52YXMt c3R5bGUtaW50YWN0LWFmdGVyLXRleHQuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uYTQ0YTcxMwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY2FudmFz L3NjcmlwdC10ZXN0cy9jYW52YXMtc3R5bGUtaW50YWN0LWFmdGVyLXRleHQuanMKQEAgLTAsMCAr MSw1MSBAQAorZGVzY3JpcHRpb24oIlRlc3QgdGhhdCB0aGUgcmVuZGVyaW5nIGNvbnRleHQncyBz dHJva2VTdHlsZSBhbmQgZmlsbFN0eWxlIGFyZSBpbnRhY3QgYWZ0ZXIgY2FsbGluZyBzdHJva2VU ZXh0KCkgYW5kIGZpbGxUZXh0KCkiKTsKK3ZhciBjdHggPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCdjYW52YXMnKS5nZXRDb250ZXh0KCcyZCcpOworCitjdHguZmlsbFN0eWxlID0gJ3JlZCc7Citj dHguZmlsbFJlY3QoMCwgMCwgMSwgMSk7CisKK2RlYnVnKCJDaGVja2luZyBpbml0aWFsIHN0YXRl IGZvciBzYW5pdHkiKTsKK3ZhciBpbWFnZURhdGEgPSBjdHguZ2V0SW1hZ2VEYXRhKDAsIDAsIDIs IDEpOwordmFyIGltZ2RhdGEgPSBpbWFnZURhdGEuZGF0YTsKK3Nob3VsZEJlKCJjdHguZmlsbFN0 eWxlIiwgIicjZmYwMDAwJyIpOworc2hvdWxkQmUoImltZ2RhdGFbMF0iLCAiMjU1Iik7CitzaG91 bGRCZSgiaW1nZGF0YVsxXSIsICIwIik7CitzaG91bGRCZSgiaW1nZGF0YVsyXSIsICIwIik7Citz aG91bGRCZSgiaW1nZGF0YVszXSIsICIyNTUiKTsKK3Nob3VsZEJlKCJpbWdkYXRhWzRdIiwgIjAi KTsKK3Nob3VsZEJlKCJpbWdkYXRhWzVdIiwgIjAiKTsKK3Nob3VsZEJlKCJpbWdkYXRhWzZdIiwg IjAiKTsKK3Nob3VsZEJlKCJpbWdkYXRhWzddIiwgIjAiKTsKKworZGVidWcoIkNhbGxpbmcgZmls bFRleHQoKSB0byB0cnkgYW5kIGJyZWFrIHRoZSBzdHJva2VTdHlsZS4iKTsKK2N0eC5zdHJva2VT dHlsZSA9ICdncmVlbic7CitjdHgubGluZVdpZHRoID0gMTA7CitjdHguZmlsbFN0eWxlID0gJ3Jl ZCc7CitjdHguZmlsbFRleHQoIlgiLCAwLCAwKTsKK3Nob3VsZEJlKCJjdHguc3Ryb2tlU3R5bGUi LCAiJyMwMDgwMDAnIik7CitjdHguYmVnaW5QYXRoKCk7CitjdHgubW92ZVRvKDAsIDApOworY3R4 LmxpbmVUbygxMCwgMTApOworY3R4LnN0cm9rZSgpOworaW1hZ2VEYXRhID0gY3R4LmdldEltYWdl RGF0YSgyLCAyLCAxLCAxKTsKK2ltZ2RhdGEgPSBpbWFnZURhdGEuZGF0YTsKK3Nob3VsZEJlKCJp bWdkYXRhWzBdIiwgIjAiKTsKK3Nob3VsZEJlKCJpbWdkYXRhWzFdIiwgIjEyOCIpOworc2hvdWxk QmUoImltZ2RhdGFbMl0iLCAiMCIpOworc2hvdWxkQmUoImltZ2RhdGFbM10iLCAiMjU1Iik7CisK K2RlYnVnKCJDYWxsaW5nIHN0cm9rZVRleHQoKSB0byB0cnkgYW5kIGJyZWFrIHRoZSBmaWxsU3R5 bGUuIik7CitjdHguc3Ryb2tlU3R5bGUgPSAncmVkJzsKK2N0eC5saW5lV2lkdGggPSAxMDA7Citj dHguZmlsbFN0eWxlID0gJ2dyZWVuJzsKK2N0eC5zdHJva2VUZXh0KCJYIiwgMCwgMCk7CitzaG91 bGRCZSgiY3R4LmZpbGxTdHlsZSIsICInIzAwODAwMCciKTsKK2N0eC5maWxsUmVjdCgwLCAwLCAx MCwgMTApOworaW1hZ2VEYXRhID0gY3R4LmdldEltYWdlRGF0YSgyLCAyLCAxLCAxKTsKK2ltZ2Rh dGEgPSBpbWFnZURhdGEuZGF0YTsKK3Nob3VsZEJlKCJpbWdkYXRhWzBdIiwgIjAiKTsKK3Nob3Vs ZEJlKCJpbWdkYXRhWzFdIiwgIjEyOCIpOworc2hvdWxkQmUoImltZ2RhdGFbMl0iLCAiMCIpOwor c2hvdWxkQmUoImltZ2RhdGFbM10iLCAiMjU1Iik7CisKK3ZhciBzdWNjZXNzZnVsbHlQYXJzZWQg PSB0cnVlOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCAzNTdjMDQ0Li5lNDNjZmJhIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEwLTA5LTI4ICBBbmRy ZWFzIEtsaW5nICA8YW5kcmVhcy5rbGluZ0Bub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBUZXh0IGRyYXdpbmcgdGFpbnRzIEdy YXBoaWNzQ29udGV4dCdzIFFQYWludGVyOjpwZW4oKQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY3NDQKKworICAgICAgICBUZXN0OiBmYXN0L2NhbnZh cy9jYW52YXMtc3R5bGUtaW50YWN0LWFmdGVyLXRleHQuaHRtbAorCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvcXQvRm9udFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmRyYXdUZXh0Q29t bW9uKTogTWFrZSBzdXJlIHRoZSBRUGFpbnRlcidzIHBlbiBpcworICAgICAgICByZXN0b3JlZCBh ZnRlciBmaWxsaW5nIGFuZC9vciBzdHJva2luZyB0ZXh0LgorCiAyMDEwLTA5LTI4ICBKaWEgUHUg IDxqcHVAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCmRp ZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRRdC5jcHAgYi9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRRdC5jcHAKaW5kZXggZGI5ZDdlOC4uMDE0Zjkz YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250UXQuY3BwCisr KyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udFF0LmNwcApAQCAtMjA2LDEyICsy MDYsMTMgQEAgc3RhdGljIHZvaWQgZHJhd1RleHRDb21tb24oR3JhcGhpY3NDb250ZXh0KiBjdHgs IGNvbnN0IFRleHRSdW4mIHJ1biwgY29uc3QgRmxvYXQKICAgICBpZiAoY3R4LT50ZXh0RHJhd2lu Z01vZGUoKSAmIGNUZXh0U3Ryb2tlKSB7CiAgICAgICAgIFFQYWludGVyUGF0aCBwYXRoOwogICAg ICAgICBwYXRoLmFkZFRleHQocHQsIGZvbnQsIHN0cmluZyk7Ci0gICAgICAgIHAtPnNldFBlbih0 ZXh0U3Ryb2tlUGVuKTsKLSAgICAgICAgcC0+c3Ryb2tlUGF0aChwYXRoLCBwLT5wZW4oKSk7Cisg ICAgICAgIHAtPnN0cm9rZVBhdGgocGF0aCwgdGV4dFN0cm9rZVBlbik7CiAgICAgfQogICAgIGlm IChjdHgtPnRleHREcmF3aW5nTW9kZSgpICYgY1RleHRGaWxsKSB7CisgICAgICAgIFFQZW4gb2xk UGVuID0gcC0+cGVuKCk7CiAgICAgICAgIHAtPnNldFBlbih0ZXh0RmlsbFBlbik7CiAgICAgICAg IHAtPmRyYXdUZXh0KHB0LCBzdHJpbmcsIGZsYWdzLCBydW4ucGFkZGluZygpKTsKKyAgICAgICAg cC0+c2V0UGVuKG9sZFBlbik7CiAgICAgfQogfQogCg==