diff options
| author | Feng Qian <> | 2009-04-10 18:11:29 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-10 18:11:29 -0700 |
| commit | 8f72e70a9fd78eec56623b3a62e68f16b7b27e28 (patch) | |
| tree | 181bf9a400c30a1bf34ea6d72560e8d00111d549 /WebCore/rendering/SVGRenderTreeAsText.cpp | |
| parent | 7ed56f225e0ade046e1c2178977f72b2d896f196 (diff) | |
| download | external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.zip external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.gz external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.bz2 | |
AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
Diffstat (limited to 'WebCore/rendering/SVGRenderTreeAsText.cpp')
| -rw-r--r-- | WebCore/rendering/SVGRenderTreeAsText.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/WebCore/rendering/SVGRenderTreeAsText.cpp b/WebCore/rendering/SVGRenderTreeAsText.cpp index 74a8af9..1f97c47 100644 --- a/WebCore/rendering/SVGRenderTreeAsText.cpp +++ b/WebCore/rendering/SVGRenderTreeAsText.cpp @@ -432,7 +432,7 @@ static inline void writeSVGInlineTextBox(TextStream& ts, SVGInlineTextBox* textB ts << " override"; } - ts << ": " << quoteAndEscapeNonPrintables(String(textBox->textObject()->text()).substring(textBox->start() + range.startOffset, offset)) << "\n"; + ts << ": " << quoteAndEscapeNonPrintables(String(textBox->textRenderer()->text()).substring(textBox->start() + range.startOffset, offset)) << "\n"; j++; } @@ -459,8 +459,8 @@ void write(TextStream& ts, const RenderSVGContainer& container, int indent) writeIndent(ts, indent); ts << container.renderName(); - if (container.element()) { - String tagName = getTagName(static_cast<SVGStyledElement*>(container.element())); + if (container.node()) { + String tagName = getTagName(static_cast<SVGStyledElement*>(container.node())); if (!tagName.isEmpty()) ts << " {" << tagName << "}"; } @@ -476,8 +476,8 @@ void write(TextStream& ts, const RenderSVGRoot& root, int indent) writeIndent(ts, indent); ts << root.renderName(); - if (root.element()) { - String tagName = getTagName(static_cast<SVGStyledElement*>(root.element())); + if (root.node()) { + String tagName = getTagName(static_cast<SVGStyledElement*>(root.node())); if (!tagName.isEmpty()) ts << " {" << tagName << "}"; } @@ -493,8 +493,8 @@ void write(TextStream& ts, const RenderSVGText& text, int indent) writeIndent(ts, indent); ts << text.renderName(); - if (text.element()) { - String tagName = getTagName(static_cast<SVGStyledElement*>(text.element())); + if (text.node()) { + String tagName = getTagName(static_cast<SVGStyledElement*>(text.node())); if (!tagName.isEmpty()) ts << " {" << tagName << "}"; } @@ -510,8 +510,8 @@ void write(TextStream& ts, const RenderSVGInlineText& text, int indent) writeIndent(ts, indent); ts << text.renderName(); - if (text.element()) { - String tagName = getTagName(static_cast<SVGStyledElement*>(text.element())); + if (text.node()) { + String tagName = getTagName(static_cast<SVGStyledElement*>(text.node())); if (!tagName.isEmpty()) ts << " {" << tagName << "}"; } @@ -527,8 +527,8 @@ void write(TextStream& ts, const RenderPath& path, int indent) writeIndent(ts, indent); ts << path.renderName(); - if (path.element()) { - String tagName = getTagName(static_cast<SVGStyledElement*>(path.element())); + if (path.node()) { + String tagName = getTagName(static_cast<SVGStyledElement*>(path.node())); if (!tagName.isEmpty()) ts << " {" << tagName << "}"; } |