third_party/WebKit/Source/core/layout/LayoutTextCombine.h - 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/layout/LayoutTextCombine.h

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/layout/LayoutText.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutTextCombine.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutTextCombine.h

diff --git a/third_party/WebKit/Source/core/layout/LayoutTextCombine.h b/third_party/WebKit/Source/core/layout/LayoutTextCombine.h

index e704b4c5263d40ad4ad928bd2cc71eafb3ce8607..dd852fb3d1d4e1065bc76156e5353ad585b3612d 100644

--- a/third_party/WebKit/Source/core/layout/LayoutTextCombine.h

+++ b/third_party/WebKit/Source/core/layout/LayoutTextCombine.h

@@ -35,7 +35,7 @@ public:

void updateFont();

bool isCombined() const { return m_isCombined; }

- float combinedTextWidth(const Font& font) const { return font.fontDescription().computedSize(); }

+ float combinedTextWidth(const Font& font) const { return font.getFontDescription().computedSize(); }

const Font& originalFont() const { return parent()->style()->font(); }

void transformToInlineCoordinates(GraphicsContext&, const LayoutRect& boxRect, bool clip = false) const;

LayoutUnit inlineWidthForLayout() const;