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

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

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

index 7eac4f8f3ff5ff09237a3153b6ef21879180ae92..66c66ab5fd0d381b075f4ac99c04f116a600f0fc 100644

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

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

@@ -74,7 +74,7 @@ public:

bool loadingCustomFonts() const;

bool shouldSkipDrawing() const;

- FontSelector* fontSelector() const { return m_fontSelector.get(); }

+ FontSelector* getFontSelector() const { return m_fontSelector.get(); }

// FIXME: It should be possible to combine fontSelectorVersion and generation.

unsigned fontSelectorVersion() const { return m_fontSelectorVersion; }

unsigned generation() const { return m_generation; }

@@ -86,8 +86,8 @@ public:

m_shapeCache = FontCache::fontCache()->getShapeCache(key)->weakPtr();

}

ASSERT(m_shapeCache);

- if (fontSelector())

- m_shapeCache->clearIfVersionChanged(fontSelector()->version());

+ if (getFontSelector())

+ m_shapeCache->clearIfVersionChanged(getFontSelector()->version());

return m_shapeCache.get();

}