third_party/WebKit/Source/core/paint/EmbeddedObjectPainter.cpp - Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/paint/EmbeddedObjectPainter.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

« no previous file with comments | « third_party/WebKit/Source/core/paint/EllipsisBoxPainter.cpp ('k') | third_party/WebKit/Source/core/paint/FileUploadControlPainter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/paint/EmbeddedObjectPainter.cpp

diff --git a/third_party/WebKit/Source/core/paint/EmbeddedObjectPainter.cpp b/third_party/WebKit/Source/core/paint/EmbeddedObjectPainter.cpp

index 1991d67f35f280939ad58f34539e53f92fbe35f2..3b142e0ecc6e385ba5c6028f8bd7f07d95b7fda5 100644

--- a/third_party/WebKit/Source/core/paint/EmbeddedObjectPainter.cpp

+++ b/third_party/WebKit/Source/core/paint/EmbeddedObjectPainter.cpp

@@ -59,7 +59,7 @@ void EmbeddedObjectPainter::paintReplaced(const PaintInfo& paintInfo, const Layo

if (!font.primaryFont())

return;

TextRun textRun(m_layoutEmbeddedObject.unavailablePluginReplacementText());

- FloatSize textGeometry(font.width(textRun), font.fontMetrics().height());

+ FloatSize textGeometry(font.width(textRun), font.getFontMetrics().height());

LayoutRect backgroundRect(0, 0, textGeometry.width() + 2 * replacementTextRoundedRectLeftRightTextMargin, replacementTextRoundedRectHeight);

backgroundRect.move(contentRect.center() - backgroundRect.center());

@@ -75,7 +75,7 @@ void EmbeddedObjectPainter::paintReplaced(const PaintInfo& paintInfo, const Layo

TextRunPaintInfo runInfo(textRun);

runInfo.bounds = floatBackgroundRect;

context.setFillColor(scaleAlpha(Color::black, replacementTextTextOpacity));

- context.drawBidiText(font, runInfo, textRect.location() + FloatSize(0, font.fontMetrics().ascent()));

+ context.drawBidiText(font, runInfo, textRect.location() + FloatSize(0, font.getFontMetrics().ascent()));

}

} // namespace blink