diff options
author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/svg/SVGStyledElement.cpp | |
parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/svg/SVGStyledElement.cpp')
-rw-r--r-- | Source/WebCore/svg/SVGStyledElement.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/svg/SVGStyledElement.cpp b/Source/WebCore/svg/SVGStyledElement.cpp index 5740b05..79e1633 100644 --- a/Source/WebCore/svg/SVGStyledElement.cpp +++ b/Source/WebCore/svg/SVGStyledElement.cpp @@ -81,13 +81,13 @@ String SVGStyledElement::title() const // Walk up the tree, to find out whether we're inside a <use> shadow tree, to find the right title. Node* parent = const_cast<SVGStyledElement*>(this); while (parent) { - if (!parent->isShadowRoot()) { + if (!parent->isSVGShadowRoot()) { parent = parent->parentNodeGuaranteedHostFree(); continue; } // Get the <use> element. - Element* shadowParent = parent->shadowHost(); + Element* shadowParent = parent->svgShadowHost(); if (shadowParent && shadowParent->isSVGElement() && shadowParent->hasTagName(SVGNames::useTag)) { SVGUseElement* useElement = static_cast<SVGUseElement*>(shadowParent); // If the <use> title is not empty we found the title to use. |