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

Index: third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp

diff --git a/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp b/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp

index a137fa6c335c363f09a980beed35e378bf4d95d4..f34b0ea19ac82159af6cfc063ceffb2302588a4e 100644

--- a/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp

+++ b/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp

@@ -56,15 +56,15 @@ float CSSToLengthConversionData::FontSizes::ex() const

// FIXME: We have a bug right now where the zoom will be applied twice to EX units.

// We really need to compute EX using fontMetrics for the original specifiedSize and not use

// our actual constructed layoutObject font.

- if (!m_font->fontMetrics().hasXHeight())

+ if (!m_font->getFontMetrics().hasXHeight())

return m_em / 2.0f;

- return m_font->fontMetrics().xHeight();

+ return m_font->getFontMetrics().xHeight();

}

float CSSToLengthConversionData::FontSizes::ch() const

{

ASSERT(m_font);

- return m_font->fontMetrics().zeroWidth();

+ return m_font->getFontMetrics().zeroWidth();

}

CSSToLengthConversionData::ViewportSize::ViewportSize(const LayoutView* layoutView)