103088 2012-11-22 13:02:46 -0800 Remove SVGShadowText 2012-11-22 14:48:25 -0800 1 1 1 Unclassified WebKit SVG 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned d-r fmalita ojan pdr schenney webkit.review.bot zimmermann oldest_to_newest 774086 0 koivisto 2012-11-22 13:02:46 -0800 SVGShadowText subclass has little functionality beyond the plain Text. Remove it for simplicity. 774095 1 175709 koivisto 2012-11-22 14:03:17 -0800 Created attachment 175709 patch 774097 2 175709 rniwa 2012-11-22 14:17:29 -0800 Comment on attachment 175709 patch View in context: https://bugs.webkit.org/attachment.cgi?id=175709&action=review > Source/WebCore/dom/Text.cpp:242 > +static bool isSVGShadowText(Text* text) I would add inline if I were you. > Source/WebCore/dom/Text.cpp:248 > +static bool isSVGText(Text* text) Ditto. > Source/WebCore/svg/SVGTRefElement.cpp:162 > root->firstChild()->setTextContent(textContent, ASSERT_NO_EXCEPTION); We should probably assert that firstChild is a Text node. 774109 3 koivisto 2012-11-22 14:48:25 -0800 http://trac.webkit.org/changeset/135544 175709 2012-11-22 14:03:17 -0800 2012-11-22 14:17:29 -0800 patch eliminate-svgshadowtext-2.patch text/plain 5629 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNTUzNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDEyLTExLTIyICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgU1ZHU2hhZG93VGV4 dCBjbGFzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTAzMDg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UmVtb3ZlIFNWR1NoYWRvd1RleHQgY2xhc3MgYW5kIG1lcmdlIHRoZSBsaXR0bGUgZnVuY3Rpb25h bGl0eSBpdCBoYXMgdG8gVGV4dC4KKworICAgICAgICAqIGRvbS9UZXh0LmNwcDoKKyAgICAgICAg KFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6aXNTVkdTaGFkb3dUZXh0KToKKyAgICAgICAg CisgICAgICAgICAgICBGaWd1cmUgb3V0IGlmIHdlIGFyZSBhIFNWR1NoYWRvd1RleHQgZnJvbSB0 aGUgY29udGV4dC4KKworICAgICAgICAoV2ViQ29yZTo6aXNTVkdUZXh0KToKKyAgICAgICAgKFdl YkNvcmU6OlRleHQ6OmNyZWF0ZVJlbmRlcmVyKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHQ6OnJl Y2FsY1RleHRTdHlsZSk6CisgICAgICAgIAorICAgICAgICAgICAgRmFjdG9yIFNWRyBzcGVjaWFs IGNhc2UgdGVzdGluZyB0byBmdW5jdGlvbnMuCisKKyAgICAgICAgKiBkb20vVGV4dC5oOgorICAg ICAgICAoVGV4dCk6CisKKyAgICAgICAgICAgIEdldCByaWQgb2YgdGhlIG5vdyB1bm5lY2Vzc2Fy eSB3aWxsUmVjYWxjVGV4dFN0eWxlIG1lY2hhbmlzbS4KKworICAgICAgICAqIHN2Zy9TVkdUUmVm RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlNWR1RS ZWZFbGVtZW50Ojp1cGRhdGVSZWZlcmVuY2VkVGV4dCk6CisKIDIwMTItMTEtMjIgIFBhbiBEZW5n ICA8cGFuLmRlbmdAaW50ZWwuY29tPgogCiAgICAgICAgIFtXZWIgSW5zcGVjdG9yXUNvZGUgU3R5 bGUgY2hhbmdlcyBpbiBUaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmpzLgpJbmRleDogU291cmNl L1dlYkNvcmUvZG9tL1RleHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9U ZXh0LmNwcAkocmV2aXNpb24gMTM1NTI5KQorKysgU291cmNlL1dlYkNvcmUvZG9tL1RleHQuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yMzgsMTEgKzIzOCwyNCBAQCBib29sIFRleHQ6OnJlbmRlcmVy SXNOZWVkZWQoY29uc3QgTm9kZVJlCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKKyNpZiBFTkFCTEUo U1ZHKQorc3RhdGljIGJvb2wgaXNTVkdTaGFkb3dUZXh0KFRleHQqIHRleHQpCit7CisgICAgTm9k ZSogcGFyZW50Tm9kZSA9IHRleHQtPnBhcmVudE5vZGUoKTsKKyAgICByZXR1cm4gcGFyZW50Tm9k ZS0+aXNTaGFkb3dSb290KCkgJiYgdG9TaGFkb3dSb290KHBhcmVudE5vZGUpLT5ob3N0KCktPmhh c1RhZ05hbWUoU1ZHTmFtZXM6OnRyZWZUYWcpOworfQorCitzdGF0aWMgYm9vbCBpc1NWR1RleHQo VGV4dCogdGV4dCkKK3sKKyAgICBOb2RlKiBwYXJlbnRPckhvc3ROb2RlID0gdGV4dC0+cGFyZW50 T3JIb3N0Tm9kZSgpOworICAgIHJldHVybiBwYXJlbnRPckhvc3ROb2RlLT5pc1NWR0VsZW1lbnQo KSAmJiAhcGFyZW50T3JIb3N0Tm9kZS0+aGFzVGFnTmFtZShTVkdOYW1lczo6Zm9yZWlnbk9iamVj dFRhZyk7Cit9CisjZW5kaWYKKwogUmVuZGVyT2JqZWN0KiBUZXh0OjpjcmVhdGVSZW5kZXJlcihS ZW5kZXJBcmVuYSogYXJlbmEsIFJlbmRlclN0eWxlKiBzdHlsZSkKIHsKICNpZiBFTkFCTEUoU1ZH KQotICAgIE5vZGUqIHBhcmVudE9ySG9zdCA9IHBhcmVudE9ySG9zdE5vZGUoKTsKLSAgICBpZiAo cGFyZW50T3JIb3N0LT5pc1NWR0VsZW1lbnQoKSAmJiAhcGFyZW50T3JIb3N0LT5oYXNUYWdOYW1l KFNWR05hbWVzOjpmb3JlaWduT2JqZWN0VGFnKSkKKyAgICBpZiAoaXNTVkdUZXh0KHRoaXMpIHx8 IGlzU1ZHU2hhZG93VGV4dCh0aGlzKSkKICAgICAgICAgcmV0dXJuIG5ldyAoYXJlbmEpIFJlbmRl clNWR0lubGluZVRleHQodGhpcywgZGF0YUltcGwoKSk7CiAjZW5kaWYKIApAQCAtMjYwLDE1ICsy NzMsMTggQEAgdm9pZCBUZXh0OjphdHRhY2goKQogCiB2b2lkIFRleHQ6OnJlY2FsY1RleHRTdHls ZShTdHlsZUNoYW5nZSBjaGFuZ2UpCiB7Ci0gICAgaWYgKGhhc0N1c3RvbUNhbGxiYWNrcygpKQot ICAgICAgICB3aWxsUmVjYWxjVGV4dFN0eWxlKGNoYW5nZSk7Ci0KICAgICBSZW5kZXJPYmplY3Qq IHJlbmRlcmVyID0gdGhpcy0+cmVuZGVyZXIoKTsKIAogICAgIC8vIFRoZSBvbmx5IHRpbWUgd2Ug aGF2ZSBhIHJlbmRlcmVyIGFuZCBvdXIgcGFyZW50IGRvZXNuJ3QgaXMgaWYgb3VyIHBhcmVudAog ICAgIC8vIGlzIGEgc2hhZG93IHJvb3QuCi0gICAgaWYgKGNoYW5nZSAhPSBOb0NoYW5nZSAmJiBy ZW5kZXJlciAmJiAhcGFyZW50Tm9kZSgpLT5pc1NoYWRvd1Jvb3QoKSkKLSAgICAgICAgcmVuZGVy ZXItPnNldFN0eWxlKHBhcmVudE5vZGUoKS0+cmVuZGVyZXIoKS0+c3R5bGUoKSk7CisgICAgaWYg KGNoYW5nZSAhPSBOb0NoYW5nZSAmJiByZW5kZXJlcikgeworICAgICAgICBpZiAoIXBhcmVudE5v ZGUoKS0+aXNTaGFkb3dSb290KCkpCisgICAgICAgICAgICByZW5kZXJlci0+c2V0U3R5bGUocGFy ZW50Tm9kZSgpLT5yZW5kZXJlcigpLT5zdHlsZSgpKTsKKyNpZiBFTkFCTEUoU1ZHKQorICAgICAg ICBlbHNlIGlmIChpc1NWR1NoYWRvd1RleHQodGhpcykpCisgICAgICAgICAgICByZW5kZXJlci0+ c2V0U3R5bGUodG9TaGFkb3dSb290KHBhcmVudE5vZGUoKSktPmhvc3QoKS0+cmVuZGVyZXIoKS0+ c3R5bGUoKSk7CisjZW5kaWYKKyAgICB9CiAKICAgICBpZiAobmVlZHNTdHlsZVJlY2FsYygpKSB7 CiAgICAgICAgIGlmIChyZW5kZXJlcikgewpAQCAtMzAzLDExICszMTksNiBAQCBQYXNzUmVmUHRy PFRleHQ+IFRleHQ6OmNyZWF0ZVdpdGhMZW5ndGhMCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAot dm9pZCBUZXh0Ojp3aWxsUmVjYWxjVGV4dFN0eWxlKFN0eWxlQ2hhbmdlKQotewotICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOwotfQotCiAjaWZuZGVmIE5ERUJVRwogdm9pZCBUZXh0Ojpmb3JtYXRG b3JEZWJ1Z2dlcihjaGFyICpidWZmZXIsIHVuc2lnbmVkIGxlbmd0aCkgY29uc3QKIHsKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2RvbS9UZXh0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv ZG9tL1RleHQuaAkocmV2aXNpb24gMTM1NTI5KQorKysgU291cmNlL1dlYkNvcmUvZG9tL1RleHQu aAkod29ya2luZyBjb3B5KQpAQCAtNTQsOCArNTQsNiBAQCBwcm90ZWN0ZWQ6CiAgICAgewogICAg IH0KIAotICAgIHZpcnR1YWwgdm9pZCB3aWxsUmVjYWxjVGV4dFN0eWxlKFN0eWxlQ2hhbmdlKTsK LQogcHJpdmF0ZToKICAgICB2aXJ0dWFsIFN0cmluZyBub2RlTmFtZSgpIGNvbnN0OwogICAgIHZp cnR1YWwgTm9kZVR5cGUgbm9kZVR5cGUoKSBjb25zdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3N2 Zy9TVkdUUmVmRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvc3ZnL1NW R1RSZWZFbGVtZW50LmNwcAkocmV2aXNpb24gMTM1NTI5KQorKysgU291cmNlL1dlYkNvcmUvc3Zn L1NWR1RSZWZFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTMwLDM1ICsxMzAsNiBAQCB2 b2lkIFNWR1RSZWZUYXJnZXRFdmVudExpc3RlbmVyOjpoYW5kbGVFCiAgICAgICAgIG1fdHJlZkVs ZW1lbnQtPmRldGFjaFRhcmdldCgpOwogfQogCi1jbGFzcyBTVkdTaGFkb3dUZXh0IDogcHVibGlj IFRleHQgewotcHVibGljOgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPFNWR1NoYWRvd1RleHQ+IGNy ZWF0ZShEb2N1bWVudCogZG9jdW1lbnQsIGNvbnN0IFN0cmluZyYgZGF0YSkKLSAgICB7Ci0gICAg ICAgIHJldHVybiBhZG9wdFJlZihuZXcgU1ZHU2hhZG93VGV4dChkb2N1bWVudCwgZGF0YSkpOwot ICAgIH0KLXByaXZhdGU6Ci0gICAgU1ZHU2hhZG93VGV4dChEb2N1bWVudCogZG9jdW1lbnQsIGNv bnN0IFN0cmluZyYgZGF0YSkKLSAgICAgICAgOiBUZXh0KGRvY3VtZW50LCBkYXRhLCBDcmVhdGVU ZXh0KQotICAgIHsKLSAgICAgICAgc2V0SGFzQ3VzdG9tQ2FsbGJhY2tzKCk7Ci0gICAgfQotICAg IHZpcnR1YWwgUmVuZGVyT2JqZWN0KiBjcmVhdGVSZW5kZXJlcihSZW5kZXJBcmVuYSosIFJlbmRl clN0eWxlKik7Ci0gICAgdmlydHVhbCB2b2lkIHdpbGxSZWNhbGNUZXh0U3R5bGUoU3R5bGVDaGFu Z2UpOwotfTsKLQotUmVuZGVyT2JqZWN0KiBTVkdTaGFkb3dUZXh0OjpjcmVhdGVSZW5kZXJlcihS ZW5kZXJBcmVuYSogYXJlbmEsIFJlbmRlclN0eWxlKikKLXsKLSAgICByZXR1cm4gbmV3IChhcmVu YSkgUmVuZGVyU1ZHSW5saW5lVGV4dCh0aGlzLCBkYXRhSW1wbCgpKTsKLX0KLQotdm9pZCBTVkdT aGFkb3dUZXh0Ojp3aWxsUmVjYWxjVGV4dFN0eWxlKFN0eWxlQ2hhbmdlIGNoYW5nZSkKLXsKLSAg ICBpZiAoY2hhbmdlICE9IE5vQ2hhbmdlICYmIHBhcmVudE5vZGUoKS0+aXNTaGFkb3dSb290KCkp IHsKLSAgICAgICAgaWYgKHJlbmRlcmVyKCkpCi0gICAgICAgICAgICByZW5kZXJlcigpLT5zZXRT dHlsZSh0b1NoYWRvd1Jvb3QocGFyZW50Tm9kZSgpKS0+aG9zdCgpLT5yZW5kZXJlcigpLT5zdHls ZSgpKTsKLSAgICB9Ci19Ci0KIGlubGluZSBTVkdUUmVmRWxlbWVudDo6U1ZHVFJlZkVsZW1lbnQo Y29uc3QgUXVhbGlmaWVkTmFtZSYgdGFnTmFtZSwgRG9jdW1lbnQqIGRvY3VtZW50KQogICAgIDog U1ZHVGV4dFBvc2l0aW9uaW5nRWxlbWVudCh0YWdOYW1lLCBkb2N1bWVudCkKICAgICAsIG1fdGFy Z2V0TGlzdGVuZXIoU1ZHVFJlZlRhcmdldEV2ZW50TGlzdGVuZXI6OmNyZWF0ZSh0aGlzKSkKQEAg LTE4Niw3ICsxNTcsNyBAQCB2b2lkIFNWR1RSZWZFbGVtZW50Ojp1cGRhdGVSZWZlcmVuY2VkVGV4 CiAgICAgQVNTRVJUKHNoYWRvdygpKTsKICAgICBTaGFkb3dSb290KiByb290ID0gc2hhZG93KCkt Pm9sZGVzdFNoYWRvd1Jvb3QoKTsKICAgICBpZiAoIXJvb3QtPmZpcnN0Q2hpbGQoKSkKLSAgICAg ICAgcm9vdC0+YXBwZW5kQ2hpbGQoU1ZHU2hhZG93VGV4dDo6Y3JlYXRlKGRvY3VtZW50KCksIHRl eHRDb250ZW50KSwgQVNTRVJUX05PX0VYQ0VQVElPTik7CisgICAgICAgIHJvb3QtPmFwcGVuZENo aWxkKFRleHQ6OmNyZWF0ZShkb2N1bWVudCgpLCB0ZXh0Q29udGVudCksIEFTU0VSVF9OT19FWENF UFRJT04pOwogICAgIGVsc2UKICAgICAgICAgcm9vdC0+Zmlyc3RDaGlsZCgpLT5zZXRUZXh0Q29u dGVudCh0ZXh0Q29udGVudCwgQVNTRVJUX05PX0VYQ0VQVElPTik7CiB9Cg==