20689 2008-09-06 12:04:52 -0700 [CAIRO] SVGPaintServerCairo clean up 2008-09-07 09:58:54 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC All RESOLVED DUPLICATE 20699 Cairo, Gtk P2 Normal --- 1 krit webkit-unassigned oldest_to_newest 90369 0 krit 2008-09-06 12:04:52 -0700 SVGPaintServerCairo clean up 90370 1 23217 krit 2008-09-06 12:10:02 -0700 Created attachment 23217 Cairo-Color-SVG Clean up of SVGPaintServerCairo to make it more platform-independent. As secondary effect colors on SVG texts work. SVGPaintServerSolid::setup() looks identical to the Cg part. 90411 2 krit 2008-09-07 09:58:54 -0700 *** This bug has been marked as a duplicate of 20699 *** 23217 2008-09-06 12:10:02 -0700 2008-09-07 09:58:31 -0700 Cairo-Color-SVG Cairo-Color-SVG.patch text/plain 5999 krit SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNjEzMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDgtMDktMDYgIERpcmsgU2NodWx6ZSAgPHZiczg1QGdteC5kZT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDbGVhbiB1 cCBvZiBTVkdQYWludFNlcnZlclNvbGlkIG9uIENhaXJvIHRvIG1ha2UgaXQKKyAgICAgICAgbW9y ZSBwbGF0Zm9ybS1pbmRlcGVuZGVudC4gQWxzbyBhZGRlZCBjb2xvciBzdXBwb3J0IGZvcgorICAg ICAgICBTVkcgdGV4dHMuCisKKyAgICAgICAgKiBzdmcvZ3JhcGhpY3MvU1ZHUGFpbnRTZXJ2ZXJT b2xpZC5oOgorICAgICAgICAqIHN2Zy9ncmFwaGljcy9jYWlyby9TVkdQYWludFNlcnZlclNvbGlk Q2Fpcm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6YXBwbHlTdHJva2VTdHlsZVRvQ29udGV4dCk6 CisgICAgICAgIChXZWJDb3JlOjpTVkdQYWludFNlcnZlclNvbGlkOjpzZXR1cCk6CisgICAgICAg IChXZWJDb3JlOjpTVkdQYWludFNlcnZlclNvbGlkOjpyZW5kZXJQYXRoKToKKwogMjAwOC0wOS0w NiAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IERhdmUgSHlhdHQuCkluZGV4OiBXZWJDb3JlL3N2Zy9ncmFwaGljcy9TVkdQYWludFNlcnZlclNv bGlkLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdmcvZ3JhcGhpY3MvU1ZHUGFpbnRTZXJ2ZXJT b2xpZC5oCShyZXZpc2lvbiAzNjExNSkKKysrIFdlYkNvcmUvc3ZnL2dyYXBoaWNzL1NWR1BhaW50 U2VydmVyU29saWQuaAkod29ya2luZyBjb3B5KQpAQCAtNDYsNiArNDYsOSBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgICAgIHZpcnR1YWwgVGV4dFN0cmVhbSYgZXh0ZXJuYWxSZXByZXNlbnRh dGlvbihUZXh0U3RyZWFtJikgY29uc3Q7CiAKICAgICAgICAgdmlydHVhbCBib29sIHNldHVwKEdy YXBoaWNzQ29udGV4dComLCBjb25zdCBSZW5kZXJPYmplY3QqLCBTVkdQYWludFRhcmdldFR5cGUs IGJvb2wgaXNQYWludGluZ1RleHQpIGNvbnN0OworI2lmIFBMQVRGT1JNKENBSVJPKQorICAgICAg ICB2aXJ0dWFsIHZvaWQgcmVuZGVyUGF0aChHcmFwaGljc0NvbnRleHQqJiwgY29uc3QgUmVuZGVy T2JqZWN0KiwgU1ZHUGFpbnRUYXJnZXRUeXBlKSBjb25zdDsKKyNlbmRpZgogCiAgICAgcHJpdmF0 ZToKICAgICAgICAgU1ZHUGFpbnRTZXJ2ZXJTb2xpZCgpOwpJbmRleDogV2ViQ29yZS9zdmcvZ3Jh cGhpY3MvY2Fpcm8vU1ZHUGFpbnRTZXJ2ZXJTb2xpZENhaXJvLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3N2Zy9ncmFwaGljcy9jYWlyby9TVkdQYWludFNlcnZlclNvbGlkQ2Fpcm8uY3BwCShy ZXZpc2lvbiAzNjExNSkKKysrIFdlYkNvcmUvc3ZnL2dyYXBoaWNzL2NhaXJvL1NWR1BhaW50U2Vy dmVyU29saWRDYWlyby5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw2IEBACiAvKgogICog Q29weXJpZ2h0IChDKSAyMDA3IEFscCBUb2tlciA8YWxwQGF0b2tlci5jb20+CisgKiBDb3B5cmln aHQgKEMpIDIwMDcgRGlyayBTY2h1bHplIDx2YnM4NUBnbXguZGU+CiAgKgogICogVGhpcyBsaWJy YXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICog bW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJs aWMKQEAgLTIyLDQ3ICsyMyw3NCBAQAogI2lmIEVOQUJMRShTVkcpCiAjaW5jbHVkZSAiU1ZHUGFp bnRTZXJ2ZXJTb2xpZC5oIgogCisjaW5jbHVkZSAiQ29sb3IuaCIKICNpbmNsdWRlICJHcmFwaGlj c0NvbnRleHQuaCIKICNpbmNsdWRlICJTVkdQYWludFNlcnZlci5oIgogI2luY2x1ZGUgIlJlbmRl clBhdGguaCIKKyNpbmNsdWRlIDx3dGYvT3duQXJyYXlQdHIuaD4KIAogbmFtZXNwYWNlIFdlYkNv cmUgewogCitzdGF0aWMgdm9pZCBhcHBseVN0cm9rZVN0eWxlVG9Db250ZXh0KEdyYXBoaWNzQ29u dGV4dCogY29udGV4dCwgUmVuZGVyU3R5bGUqIHN0eWxlLCBjb25zdCBSZW5kZXJPYmplY3QqIG9i amVjdCkKK3sKKyAgICBjb250ZXh0LT5zZXRTdHJva2VUaGlja25lc3MoU1ZHUmVuZGVyU3R5bGU6 OmNzc1ByaW1pdGl2ZVRvTGVuZ3RoKG9iamVjdCwgc3R5bGUtPnN2Z1N0eWxlKCktPnN0cm9rZVdp ZHRoKCksIDEuMCkpOworICAgIGNvbnRleHQtPnNldExpbmVDYXAoc3R5bGUtPnN2Z1N0eWxlKCkt PmNhcFN0eWxlKCkpOworICAgIGNvbnRleHQtPnNldExpbmVKb2luKHN0eWxlLT5zdmdTdHlsZSgp LT5qb2luU3R5bGUoKSk7CisgICAgaWYgKHN0eWxlLT5zdmdTdHlsZSgpLT5qb2luU3R5bGUoKSA9 PSBNaXRlckpvaW4pCisgICAgICAgIGNvbnRleHQtPnNldE1pdGVyTGltaXQoc3R5bGUtPnN2Z1N0 eWxlKCktPnN0cm9rZU1pdGVyTGltaXQoKSk7CisKKyAgICBjb25zdCBEYXNoQXJyYXkmIGRhc2hl cyA9IGRhc2hBcnJheUZyb21SZW5kZXJpbmdTdHlsZShvYmplY3QtPnN0eWxlKCkpOworICAgIE93 bkFycmF5UHRyPGRvdWJsZT4gZHNoKG5ldyBkb3VibGVbZGFzaGVzLnNpemUoKV0pOworICAgIGZv ciAoc2l6ZV90IGkgPSAwIDsgaSA8IGRhc2hlcy5zaXplKCkgOyBpKyspCisgICAgICAgIGRzaFtp XSA9IGRhc2hlc1tpXTsKKyAgICBkb3VibGUgZGFzaE9mZnNldCA9IFNWR1JlbmRlclN0eWxlOjpj c3NQcmltaXRpdmVUb0xlbmd0aChvYmplY3QsIHN0eWxlLT5zdmdTdHlsZSgpLT5zdHJva2VEYXNo T2Zmc2V0KCksIDAuMCk7CisgICAgY2Fpcm9fc2V0X2Rhc2goY29udGV4dC0+cGxhdGZvcm1Db250 ZXh0KCksIGRzaC5nZXQoKSwgZGFzaGVzLnNpemUoKSwgZGFzaE9mZnNldCk7Cit9CisKK3ZvaWQg U1ZHUGFpbnRTZXJ2ZXJTb2xpZDo6cmVuZGVyUGF0aChHcmFwaGljc0NvbnRleHQqJiBjb250ZXh0 LCBjb25zdCBSZW5kZXJPYmplY3QqIHBhdGgsIFNWR1BhaW50VGFyZ2V0VHlwZSB0eXBlKSBjb25z dAoreworICAgIGNvbnN0IFNWR1JlbmRlclN0eWxlKiBzdHlsZSA9IHBhdGgtPnN0eWxlKCktPnN2 Z1N0eWxlKCk7CisKKyAgICBjb250ZXh0LT5zZXRGaWxsUnVsZShzdHlsZS0+ZmlsbFJ1bGUoKSk7 CisKKyAgICBpZiAoKHR5cGUgJiBBcHBseVRvRmlsbFRhcmdldFR5cGUpICYmIHN0eWxlLT5oYXNG aWxsKCkpCisgICAgICAgIGNvbnRleHQtPmZpbGxQYXRoKCk7CisKKyAgICBpZiAoKHR5cGUgJiBB cHBseVRvU3Ryb2tlVGFyZ2V0VHlwZSkgJiYgc3R5bGUtPmhhc1N0cm9rZSgpKQorICAgICAgICBj b250ZXh0LT5zdHJva2VQYXRoKCk7Cit9CisKIGJvb2wgU1ZHUGFpbnRTZXJ2ZXJTb2xpZDo6c2V0 dXAoR3JhcGhpY3NDb250ZXh0KiYgY29udGV4dCwgY29uc3QgUmVuZGVyT2JqZWN0KiBvYmplY3Qs IFNWR1BhaW50VGFyZ2V0VHlwZSB0eXBlLCBib29sIGlzUGFpbnRpbmdUZXh0KSBjb25zdAogewot ICAgIC8vIFRPRE86IHNoYXJlIHRoaXMgY29kZSB3aXRoIG90aGVyIFBhaW50U2VydmVycwogCi0g ICAgY2Fpcm9fdCogY3IgPSBjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKTsKLSAgICBjb25zdCBT VkdSZW5kZXJTdHlsZSogc3R5bGUgPSBvYmplY3QtPnN0eWxlKCktPnN2Z1N0eWxlKCk7CisgICAg UmVuZGVyU3R5bGUqIHN0eWxlID0gb2JqZWN0ID8gb2JqZWN0LT5zdHlsZSgpIDogMDsKIAotICAg IGZsb2F0IHJlZCwgZ3JlZW4sIGJsdWUsIGFscGhhOwotICAgIGNvbG9yKCkuZ2V0UkdCQShyZWQs IGdyZWVuLCBibHVlLCBhbHBoYSk7CisgICAgaWYgKCh0eXBlICYgQXBwbHlUb0ZpbGxUYXJnZXRU eXBlKSAmJiAoIXN0eWxlIHx8IHN0eWxlLT5zdmdTdHlsZSgpLT5oYXNGaWxsKCkpKSB7CisgICAg ICAgIFJHQkEzMiByZ2JhID0gY29sb3IoKS5yZ2IoKTsKKyAgICAgICAgQVNTRVJUKCFjb2xvcigp Lmhhc0FscGhhKCkpOworICAgICAgICBpZiAoc3R5bGUpCisgICAgICAgICAgICByZ2JhID0gY29s b3JXaXRoT3ZlcnJpZGVBbHBoYShyZ2JhLCBzdHlsZS0+c3ZnU3R5bGUoKS0+ZmlsbE9wYWNpdHko KSk7CiAKLSAgICBpZiAoKHR5cGUgJiBBcHBseVRvRmlsbFRhcmdldFR5cGUpICYmIHN0eWxlLT5o YXNGaWxsKCkpIHsKLSAgICAgICAgYWxwaGEgPSBzdHlsZS0+ZmlsbE9wYWNpdHkoKTsKKyAgICAg ICAgY29udGV4dC0+c2V0RmlsbENvbG9yKHJnYmEpOwogCi0gICAgICAgIGNhaXJvX3NldF9maWxs X3J1bGUoY3IsIHN0eWxlLT5maWxsUnVsZSgpID09IFJVTEVfRVZFTk9ERCA/IENBSVJPX0ZJTExf UlVMRV9FVkVOX09ERCA6IENBSVJPX0ZJTExfUlVMRV9XSU5ESU5HKTsKKyAgICAgICAgaWYgKGlz UGFpbnRpbmdUZXh0KQorICAgICAgICAgICAgY29udGV4dC0+c2V0VGV4dERyYXdpbmdNb2RlKGNU ZXh0RmlsbCk7CiAgICAgfQogCi0gICAgaWYgKCh0eXBlICYgQXBwbHlUb1N0cm9rZVRhcmdldFR5 cGUpICYmIHN0eWxlLT5oYXNTdHJva2UoKSkgewotICAgICAgICBhbHBoYSA9IHN0eWxlLT5zdHJv a2VPcGFjaXR5KCk7CisgICAgaWYgKCh0eXBlICYgQXBwbHlUb1N0cm9rZVRhcmdldFR5cGUpICYm ICghc3R5bGUgfHwgc3R5bGUtPnN2Z1N0eWxlKCktPmhhc1N0cm9rZSgpKSkgeworICAgICAgICBS R0JBMzIgcmdiYSA9IGNvbG9yKCkucmdiKCk7CisgICAgICAgIEFTU0VSVCghY29sb3IoKS5oYXNB bHBoYSgpKTsKKyAgICAgICAgaWYgKHN0eWxlKQorICAgICAgICAgICAgcmdiYSA9IGNvbG9yV2l0 aE92ZXJyaWRlQWxwaGEocmdiYSwgc3R5bGUtPnN2Z1N0eWxlKCktPnN0cm9rZU9wYWNpdHkoKSk7 CiAKLSAgICAgICAgY2Fpcm9fc2V0X2xpbmVfd2lkdGgoY3IsIFNWR1JlbmRlclN0eWxlOjpjc3NQ cmltaXRpdmVUb0xlbmd0aChvYmplY3QsIHN0eWxlLT5zdHJva2VXaWR0aCgpLCAxLjApKTsKLSAg ICAgICAgY29udGV4dC0+c2V0TGluZUNhcChzdHlsZS0+Y2FwU3R5bGUoKSk7Ci0gICAgICAgIGNv bnRleHQtPnNldExpbmVKb2luKHN0eWxlLT5qb2luU3R5bGUoKSk7Ci0gICAgICAgIGlmIChzdHls ZS0+am9pblN0eWxlKCkgPT0gTWl0ZXJKb2luKQotICAgICAgICAgICAgY29udGV4dC0+c2V0TWl0 ZXJMaW1pdChzdHlsZS0+c3Ryb2tlTWl0ZXJMaW1pdCgpKTsKLQotICAgICAgICBjb25zdCBEYXNo QXJyYXkmIGRhc2hlcyA9IGRhc2hBcnJheUZyb21SZW5kZXJpbmdTdHlsZShvYmplY3QtPnN0eWxl KCkpOwotICAgICAgICBkb3VibGUqIGRzaCA9IG5ldyBkb3VibGVbZGFzaGVzLnNpemUoKV07Ci0g ICAgICAgIGZvciAodW5zaWduZWQgaSA9IDAgOyBpIDwgZGFzaGVzLnNpemUoKSA7IGkrKykKLSAg ICAgICAgICAgIGRzaFtpXSA9IGRhc2hlc1tpXTsKLSAgICAgICAgZG91YmxlIGRhc2hPZmZzZXQg PSBTVkdSZW5kZXJTdHlsZTo6Y3NzUHJpbWl0aXZlVG9MZW5ndGgob2JqZWN0LCBzdHlsZS0+c3Ry b2tlRGFzaE9mZnNldCgpLCAwLjApOwotICAgICAgICBjYWlyb19zZXRfZGFzaChjciwgZHNoLCBk YXNoZXMuc2l6ZSgpLCBkYXNoT2Zmc2V0KTsKLSAgICAgICAgZGVsZXRlW10gZHNoOwotICAgIH0K KyAgICAgICAgY29udGV4dC0+c2V0U3Ryb2tlQ29sb3IocmdiYSk7CisKKyAgICAgICAgaWYgKHN0 eWxlKQorICAgICAgICAgICAgYXBwbHlTdHJva2VTdHlsZVRvQ29udGV4dChjb250ZXh0LCBzdHls ZSwgb2JqZWN0KTsKIAotICAgIGNhaXJvX3NldF9zb3VyY2VfcmdiYShjciwgcmVkLCBncmVlbiwg Ymx1ZSwgYWxwaGEpOworICAgICAgICBpZiAoaXNQYWludGluZ1RleHQpCisgICAgICAgICAgICBj b250ZXh0LT5zZXRUZXh0RHJhd2luZ01vZGUoY1RleHRTdHJva2UpOworICAgIH0KIAogICAgIHJl dHVybiB0cnVlOwogfQo=