third_party/WebKit/Source/platform/fonts/SimpleFontData.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/platform/fonts/SimpleFontData.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/platform/fonts/FontPlatformData.h ('k') | third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/fonts/SimpleFontData.h

diff --git a/third_party/WebKit/Source/platform/fonts/SimpleFontData.h b/third_party/WebKit/Source/platform/fonts/SimpleFontData.h

index 94d75bebf34099b4fd7a7559f3a894459cf0f323..eed56b4949fdd47ac01104d7db51188da61be3b7 100644

--- a/third_party/WebKit/Source/platform/fonts/SimpleFontData.h

+++ b/third_party/WebKit/Source/platform/fonts/SimpleFontData.h

@@ -83,10 +83,10 @@ public:

bool isTextOrientationFallback() const { return m_isTextOrientationFallback; }

bool isTextOrientationFallbackOf(const SimpleFontData*) const;

- FontMetrics& fontMetrics() { return m_fontMetrics; }

- const FontMetrics& fontMetrics() const { return m_fontMetrics; }

- float sizePerUnit() const { return platformData().size() / (fontMetrics().unitsPerEm() ? fontMetrics().unitsPerEm() : 1); }

- float internalLeading() const { return fontMetrics().floatHeight() - platformData().size(); }

+ FontMetrics& getFontMetrics() { return m_fontMetrics; }

+ const FontMetrics& getFontMetrics() const { return m_fontMetrics; }

+ float sizePerUnit() const { return platformData().size() / (getFontMetrics().unitsPerEm() ? getFontMetrics().unitsPerEm() : 1); }

+ float internalLeading() const { return getFontMetrics().floatHeight() - platformData().size(); }

float maxCharWidth() const { return m_maxCharWidth; }

void setMaxCharWidth(float maxCharWidth) { m_maxCharWidth = maxCharWidth; }