Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(592)

Unified Diff: Source/core/rendering/svg/SVGTextLayoutEngine.cpp

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/svg/SVGTextLayoutEngine.cpp
diff --git a/Source/core/rendering/svg/SVGTextLayoutEngine.cpp b/Source/core/rendering/svg/SVGTextLayoutEngine.cpp
index 5051f6ceb3c5b65ea10fc8edad65c457c54182ba..1f9a8363c2aeb5e920dfa34d80208e579a0447cf 100644
--- a/Source/core/rendering/svg/SVGTextLayoutEngine.cpp
+++ b/Source/core/rendering/svg/SVGTextLayoutEngine.cpp
@@ -143,9 +143,9 @@ void SVGTextLayoutEngine::recordTextFragment(SVGInlineTextBox* textBox, const Ve
m_currentTextFragment = SVGTextFragment();
}
-bool SVGTextLayoutEngine::parentDefinesTextLength(RenderObject* parent) const
+bool SVGTextLayoutEngine::parentDefinesTextLength(LayoutObject* parent) const
{
- RenderObject* currentParent = parent;
+ LayoutObject* currentParent = parent;
while (currentParent) {
if (SVGTextContentElement* textContentElement = SVGTextContentElement::elementFromRenderer(currentParent)) {
SVGLengthContext lengthContext(textContentElement);
@@ -163,7 +163,7 @@ bool SVGTextLayoutEngine::parentDefinesTextLength(RenderObject* parent) const
return false;
}
-void SVGTextLayoutEngine::beginTextPathLayout(RenderObject* object, SVGTextLayoutEngine& lineLayout)
+void SVGTextLayoutEngine::beginTextPathLayout(LayoutObject* object, SVGTextLayoutEngine& lineLayout)
{
ASSERT(object);
@@ -430,7 +430,7 @@ void SVGTextLayoutEngine::layoutTextOnLineOrPath(SVGInlineTextBox* textBox, cons
SVGElement* lengthContext = toSVGElement(text.parent()->node());
- RenderObject* textParent = text.parent();
+ LayoutObject* textParent = text.parent();
bool definesTextLength = textParent ? parentDefinesTextLength(textParent) : false;
const SVGRenderStyle& svgStyle = style.svgStyle();
« no previous file with comments | « Source/core/rendering/svg/SVGTextLayoutEngine.h ('k') | Source/core/rendering/svg/SVGTextLayoutEngineBaseline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698