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

Unified Diff: Source/core/paint/SVGInlineTextBoxPainter.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/paint/SVGInlineTextBoxPainter.h ('k') | Source/core/paint/SVGPaintContext.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/paint/SVGInlineTextBoxPainter.cpp
diff --git a/Source/core/paint/SVGInlineTextBoxPainter.cpp b/Source/core/paint/SVGInlineTextBoxPainter.cpp
index 5c1e0f93552d7da8d83203768891ac7043b0e083..b398d67fc00eed439cf3c528480e9fcaec04a491 100644
--- a/Source/core/paint/SVGInlineTextBoxPainter.cpp
+++ b/Source/core/paint/SVGInlineTextBoxPainter.cpp
@@ -56,7 +56,7 @@ void SVGInlineTextBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoin
return;
LayoutObject& parentRenderer = m_svgInlineTextBox.parent()->layoutObject();
- const LayoutStyle& style = parentRenderer.styleRef();
+ const ComputedStyle& style = parentRenderer.styleRef();
{
DrawingRecorder recorder(paintInfo.context, m_svgInlineTextBox, DisplayItem::paintPhaseToDrawingType(paintInfo.phase), paintInfo.rect);
@@ -76,18 +76,18 @@ void SVGInlineTextBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoin
void SVGInlineTextBoxPainter::paintTextFragments(const PaintInfo& paintInfo, LayoutObject& parentRenderer)
{
- const LayoutStyle& style = parentRenderer.styleRef();
- const SVGLayoutStyle& svgStyle = style.svgStyle();
+ const ComputedStyle& style = parentRenderer.styleRef();
+ const SVGComputedStyle& svgStyle = style.svgStyle();
bool hasFill = svgStyle.hasFill();
bool hasVisibleStroke = svgStyle.hasVisibleStroke();
- const LayoutStyle* selectionStyle = &style;
+ const ComputedStyle* selectionStyle = &style;
bool shouldPaintSelection = this->shouldPaintSelection();
if (shouldPaintSelection) {
selectionStyle = parentRenderer.getCachedPseudoStyle(SELECTION);
if (selectionStyle) {
- const SVGLayoutStyle& svgSelectionStyle = selectionStyle->svgStyle();
+ const SVGComputedStyle& svgSelectionStyle = selectionStyle->svgStyle();
if (!hasFill)
hasFill = svgSelectionStyle.hasFill();
@@ -165,7 +165,7 @@ void SVGInlineTextBoxPainter::paintSelectionBackground(const PaintInfo& paintInf
if (!textShouldBePainted(textRenderer))
return;
- const LayoutStyle& style = m_svgInlineTextBox.parent()->layoutObject().styleRef();
+ const ComputedStyle& style = m_svgInlineTextBox.parent()->layoutObject().styleRef();
int startPosition, endPosition;
m_svgInlineTextBox.selectionStartEnd(startPosition, endPosition);
@@ -242,7 +242,7 @@ void SVGInlineTextBoxPainter::paintDecoration(const PaintInfo& paintInfo, TextDe
// Find out which render style defined the text-decoration, as its fill/stroke properties have to be used for drawing instead of ours.
LayoutObject* decorationRenderer = findLayoutObjectDefininingTextDecoration(m_svgInlineTextBox.parent());
- const LayoutStyle& decorationStyle = decorationRenderer->styleRef();
+ const ComputedStyle& decorationStyle = decorationRenderer->styleRef();
if (decorationStyle.visibility() == HIDDEN)
return;
@@ -262,7 +262,7 @@ void SVGInlineTextBoxPainter::paintDecoration(const PaintInfo& paintInfo, TextDe
Path path;
path.addRect(FloatRect(decorationOrigin, FloatSize(fragment.width, thickness / scalingFactor)));
- const SVGLayoutStyle& svgDecorationStyle = decorationStyle.svgStyle();
+ const SVGComputedStyle& svgDecorationStyle = decorationStyle.svgStyle();
for (int i = 0; i < 3; i++) {
switch (svgDecorationStyle.paintOrderType(i)) {
@@ -291,7 +291,7 @@ void SVGInlineTextBoxPainter::paintDecoration(const PaintInfo& paintInfo, TextDe
}
}
-void SVGInlineTextBoxPainter::paintTextWithShadows(const PaintInfo& paintInfo, const LayoutStyle& style,
+void SVGInlineTextBoxPainter::paintTextWithShadows(const PaintInfo& paintInfo, const ComputedStyle& style,
TextRun& textRun, const SVGTextFragment& fragment, int startPosition, int endPosition,
LayoutSVGResourceMode resourceMode)
{
@@ -349,8 +349,8 @@ void SVGInlineTextBoxPainter::paintTextWithShadows(const PaintInfo& paintInfo, c
context->drawText(scaledFont, textRunPaintInfo, textOrigin);
}
-void SVGInlineTextBoxPainter::paintText(const PaintInfo& paintInfo, const LayoutStyle& style,
- const LayoutStyle& selectionStyle, const SVGTextFragment& fragment,
+void SVGInlineTextBoxPainter::paintText(const PaintInfo& paintInfo, const ComputedStyle& style,
+ const ComputedStyle& selectionStyle, const SVGTextFragment& fragment,
LayoutSVGResourceMode resourceMode, bool shouldPaintSelection)
{
int startPosition = 0;
@@ -392,7 +392,7 @@ void SVGInlineTextBoxPainter::paintText(const PaintInfo& paintInfo, const Layout
paintTextWithShadows(paintInfo, style, textRun, fragment, endPosition, fragment.length, resourceMode);
}
-void SVGInlineTextBoxPainter::paintTextMatchMarker(GraphicsContext* context, const FloatPoint&, DocumentMarker* marker, const LayoutStyle& style, const Font& font)
+void SVGInlineTextBoxPainter::paintTextMatchMarker(GraphicsContext* context, const FloatPoint&, DocumentMarker* marker, const ComputedStyle& style, const Font& font)
{
// SVG is only interested in the TextMatch markers.
if (marker->type() != DocumentMarker::TextMatch)
« no previous file with comments | « Source/core/paint/SVGInlineTextBoxPainter.h ('k') | Source/core/paint/SVGPaintContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698