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

Unified Diff: third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 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
Index: third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp b/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
index c8cf48ffd58fad04cb04c2af5017edfcd77c92d7..dbd05c821f295d171ebb16aab0ca8bdab26b7517 100644
--- a/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
@@ -29,7 +29,7 @@ static inline bool textShouldBePainted(const LayoutSVGInlineText& textLayoutObje
{
// Font::pixelSize(), returns FontDescription::computedPixelSize(), which returns "int(x + 0.5)".
// If the absolute font size on screen is below x=0.5, don't render anything.
- return textLayoutObject.scaledFont().fontDescription().computedPixelSize();
+ return textLayoutObject.scaledFont().getFontDescription().computedPixelSize();
}
bool SVGInlineTextBoxPainter::shouldPaintSelection(const PaintInfo& paintInfo) const
@@ -218,7 +218,7 @@ static inline float thicknessForDecoration(TextDecoration, const Font& font)
{
// FIXME: For SVG Fonts we need to use the attributes defined in the <font-face> if specified.
// Compatible with Batik/Presto
- return font.fontDescription().computedSize() / 20.0f;
+ return font.getFontDescription().computedSize() / 20.0f;
}
void SVGInlineTextBoxPainter::paintDecoration(const PaintInfo& paintInfo, TextDecoration decoration, const SVGTextFragment& fragment)
@@ -245,7 +245,7 @@ void SVGInlineTextBoxPainter::paintDecoration(const PaintInfo& paintInfo, TextDe
if (thickness <= 0)
return;
- float decorationOffset = baselineOffsetForDecoration(decoration, scaledFont.fontMetrics(), thickness);
+ float decorationOffset = baselineOffsetForDecoration(decoration, scaledFont.getFontMetrics(), thickness);
FloatPoint decorationOrigin(fragment.x, fragment.y - decorationOffset / scalingFactor);
Path path;
@@ -261,7 +261,7 @@ void SVGInlineTextBoxPainter::paintDecoration(const PaintInfo& paintInfo, TextDe
if (!SVGPaintContext::paintForLayoutObject(paintInfo, decorationStyle, *decorationLayoutObject, ApplyToFillMode, fillPaint))
break;
fillPaint.setAntiAlias(true);
- paintInfo.context.drawPath(path.skPath(), fillPaint);
+ paintInfo.context.drawPath(path.getSkPath(), fillPaint);
}
break;
case PT_STROKE:
@@ -275,7 +275,7 @@ void SVGInlineTextBoxPainter::paintDecoration(const PaintInfo& paintInfo, TextDe
if (svgDecorationStyle.vectorEffect() == VE_NON_SCALING_STROKE)
strokeData.setThickness(strokeData.thickness() / scalingFactor);
strokeData.setupPaint(&strokePaint);
- paintInfo.context.drawPath(path.skPath(), strokePaint);
+ paintInfo.context.drawPath(path.getSkPath(), strokePaint);
}
break;
case PT_MARKERS:
@@ -352,7 +352,7 @@ void SVGInlineTextBoxPainter::paintText(const PaintInfo& paintInfo, TextRun& tex
textRunPaintInfo.from = startPosition;
textRunPaintInfo.to = endPosition;
- float baseline = scaledFont.fontMetrics().floatAscent();
+ float baseline = scaledFont.getFontMetrics().floatAscent();
textRunPaintInfo.bounds = FloatRect(textOrigin.x(), textOrigin.y() - baseline,
textSize.width(), textSize.height());
« no previous file with comments | « third_party/WebKit/Source/core/paint/SVGImagePainter.cpp ('k') | third_party/WebKit/Source/core/paint/SVGMaskPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698