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

Unified Diff: Source/core/layout/svg/line/SVGInlineTextBox.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/line/SVGInlineTextBox.h ('k') | Source/core/loader/FrameFetchContext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/svg/line/SVGInlineTextBox.cpp
diff --git a/Source/core/layout/svg/line/SVGInlineTextBox.cpp b/Source/core/layout/svg/line/SVGInlineTextBox.cpp
index c9246b37ef1844df8d3325d42652d9c9d985d9d7..654844c83a0ec105d46af77158d964fbde6a2d87 100644
--- a/Source/core/layout/svg/line/SVGInlineTextBox.cpp
+++ b/Source/core/layout/svg/line/SVGInlineTextBox.cpp
@@ -83,7 +83,7 @@ int SVGInlineTextBox::offsetForPositionInFragment(const SVGTextFragment& fragmen
float scalingFactor = textRenderer.scalingFactor();
ASSERT(scalingFactor);
- const LayoutStyle& style = textRenderer.styleRef();
+ const ComputedStyle& style = textRenderer.styleRef();
TextRun textRun = constructTextRun(style, fragment);
@@ -104,7 +104,7 @@ FloatWillBeLayoutUnit SVGInlineTextBox::positionForOffset(int) const
return 0;
}
-FloatRect SVGInlineTextBox::selectionRectForTextFragment(const SVGTextFragment& fragment, int startPosition, int endPosition, const LayoutStyle& style)
+FloatRect SVGInlineTextBox::selectionRectForTextFragment(const SVGTextFragment& fragment, int startPosition, int endPosition, const ComputedStyle& style)
{
ASSERT(startPosition < endPosition);
@@ -137,7 +137,7 @@ LayoutRect SVGInlineTextBox::localSelectionRect(int startPosition, int endPositi
if (startPosition >= endPosition)
return LayoutRect();
- const LayoutStyle& style = layoutObject().styleRef();
+ const ComputedStyle& style = layoutObject().styleRef();
AffineTransform fragmentTransform;
FloatRect selectionRect;
@@ -168,7 +168,7 @@ void SVGInlineTextBox::paint(const PaintInfo& paintInfo, const LayoutPoint& pain
SVGInlineTextBoxPainter(*this).paint(paintInfo, paintOffset);
}
-TextRun SVGInlineTextBox::constructTextRun(const LayoutStyle& style, const SVGTextFragment& fragment) const
+TextRun SVGInlineTextBox::constructTextRun(const ComputedStyle& style, const SVGTextFragment& fragment) const
{
LayoutText* text = &layoutObject();
@@ -227,12 +227,12 @@ bool SVGInlineTextBox::mapStartEndPositionsIntoFragmentCoordinates(const SVGText
return true;
}
-void SVGInlineTextBox::paintDocumentMarker(GraphicsContext*, const FloatPointWillBeLayoutPoint&, DocumentMarker*, const LayoutStyle&, const Font&, bool)
+void SVGInlineTextBox::paintDocumentMarker(GraphicsContext*, const FloatPointWillBeLayoutPoint&, DocumentMarker*, const ComputedStyle&, const Font&, bool)
{
// SVG does not have support for generic document markers (e.g., spellchecking, etc).
}
-void SVGInlineTextBox::paintTextMatchMarker(GraphicsContext* context, const FloatPointWillBeLayoutPoint& point, DocumentMarker* marker, const LayoutStyle& style, const Font& font)
+void SVGInlineTextBox::paintTextMatchMarker(GraphicsContext* context, const FloatPointWillBeLayoutPoint& point, DocumentMarker* marker, const ComputedStyle& style, const Font& font)
{
SVGInlineTextBoxPainter(*this).paintTextMatchMarker(context, point.toFloatPoint(), marker, style, font);
}
« no previous file with comments | « Source/core/layout/svg/line/SVGInlineTextBox.h ('k') | Source/core/loader/FrameFetchContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698