third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.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/modules/canvas2d/CanvasRenderingContext2DState.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/modules/canvas2d/CanvasRenderingContext2D.cpp ('k') | third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp

diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp

index 438a159f3daabc6c64b661a26776ce4eb54e773d..8ccb1c945ecc6ef6391d4e602671f2995c0e0b84 100644

--- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp

+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp

@@ -107,20 +107,20 @@ CanvasRenderingContext2DState::CanvasRenderingContext2DState(const CanvasRenderi

m_clipList = other.m_clipList;

}

if (m_realizedFont)

- static_cast<CSSFontSelector*>(m_font.fontSelector())->registerForInvalidationCallbacks(this);

+ static_cast<CSSFontSelector*>(m_font.getFontSelector())->registerForInvalidationCallbacks(this);

}

CanvasRenderingContext2DState::~CanvasRenderingContext2DState()

{

#if !ENABLE(OILPAN)

if (m_realizedFont)

- static_cast<CSSFontSelector*>(m_font.fontSelector())->unregisterForInvalidationCallbacks(this);

+ static_cast<CSSFontSelector*>(m_font.getFontSelector())->unregisterForInvalidationCallbacks(this);

#endif

}

void CanvasRenderingContext2DState::fontsNeedUpdate(CSSFontSelector* fontSelector)

{

- ASSERT_ARG(fontSelector, fontSelector == m_font.fontSelector());

+ ASSERT_ARG(fontSelector, fontSelector == m_font.getFontSelector());

ASSERT(m_realizedFont);

m_font.update(fontSelector);

@@ -264,7 +264,7 @@ void CanvasRenderingContext2DState::setFont(const Font& font, CSSFontSelector* s

{

#if !ENABLE(OILPAN)

if (m_realizedFont)

- static_cast<CSSFontSelector*>(m_font.fontSelector())->unregisterForInvalidationCallbacks(this);

+ static_cast<CSSFontSelector*>(m_font.getFontSelector())->unregisterForInvalidationCallbacks(this);

#endif

m_font = font;

m_font.update(selector);