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

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

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 9 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
« no previous file with comments | « Source/core/layout/svg/SVGTextLayoutEngine.h ('k') | Source/core/layout/svg/SVGTextLayoutEngineBaseline.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/svg/SVGTextLayoutEngine.cpp
diff --git a/Source/core/layout/svg/SVGTextLayoutEngine.cpp b/Source/core/layout/svg/SVGTextLayoutEngine.cpp
index 1cc13fb742e36c5ae033fa9173f2b1bfba52a599..7df1f265651d83b7a6f4a6f3d3a083e8200c59e1 100644
--- a/Source/core/layout/svg/SVGTextLayoutEngine.cpp
+++ b/Source/core/layout/svg/SVGTextLayoutEngine.cpp
@@ -245,7 +245,7 @@ void SVGTextLayoutEngine::layoutInlineTextBox(SVGInlineTextBox* textBox)
ASSERT(text.parent()->node());
ASSERT(text.parent()->node()->isSVGElement());
- const LayoutStyle& style = text.styleRef();
+ const ComputedStyle& style = text.styleRef();
textBox->clearTextFragments();
m_isVerticalText = style.svgStyle().isVerticalWritingMode();
@@ -422,7 +422,7 @@ void SVGTextLayoutEngine::advanceToNextVisualCharacter(const SVGTextMetrics& vis
m_visualCharacterOffset += visualMetrics.length();
}
-void SVGTextLayoutEngine::layoutTextOnLineOrPath(SVGInlineTextBox* textBox, const LayoutSVGInlineText& text, const LayoutStyle& style)
+void SVGTextLayoutEngine::layoutTextOnLineOrPath(SVGInlineTextBox* textBox, const LayoutSVGInlineText& text, const ComputedStyle& style)
{
if (m_inPathLayout && !m_textPathCalculator)
return;
@@ -430,7 +430,7 @@ void SVGTextLayoutEngine::layoutTextOnLineOrPath(SVGInlineTextBox* textBox, cons
LayoutObject* textParent = text.parent();
bool definesTextLength = textParent ? parentDefinesTextLength(textParent) : false;
- const SVGLayoutStyle& svgStyle = style.svgStyle();
+ const SVGComputedStyle& svgStyle = style.svgStyle();
m_visualMetricsListOffset = 0;
m_visualCharacterOffset = 0;
« no previous file with comments | « Source/core/layout/svg/SVGTextLayoutEngine.h ('k') | Source/core/layout/svg/SVGTextLayoutEngineBaseline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698