third_party/WebKit/Source/core/dom/ActiveDOMObject.cpp - Issue 1773813007: blink: Rename modules/ method 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/dom/ActiveDOMObject.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-modules: rebase-fixes 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/resolver/ScopedStyleResolver.cpp ('k') | third_party/WebKit/Source/core/dom/ContextLifecycleNotifier.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/ActiveDOMObject.cpp

diff --git a/third_party/WebKit/Source/core/dom/ActiveDOMObject.cpp b/third_party/WebKit/Source/core/dom/ActiveDOMObject.cpp

index c37ee771a6af7f1dee3bae271df13a0009266bcf..21e8468338d613a99eddeef06f93a9307275e827 100644

--- a/third_party/WebKit/Source/core/dom/ActiveDOMObject.cpp

+++ b/third_party/WebKit/Source/core/dom/ActiveDOMObject.cpp

@@ -52,9 +52,9 @@ ActiveDOMObject::~ActiveDOMObject()

ASSERT(m_suspendIfNeededCalled);

- // Oilpan: not valid to access executionContext() in the destructor.

+ // Oilpan: not valid to access getExecutionContext() in the destructor.

#if !ENABLE(OILPAN)

- ASSERT(!executionContext() || executionContext()->isContextThread());

+ ASSERT(!getExecutionContext() || getExecutionContext()->isContextThread());

#endif

}

@@ -64,7 +64,7 @@ void ActiveDOMObject::suspendIfNeeded()

ASSERT(!m_suspendIfNeededCalled);

m_suspendIfNeededCalled = true;

#endif

- if (ExecutionContext* context = executionContext())

+ if (ExecutionContext* context = getExecutionContext())

context->suspendActiveDOMObjectIfNeeded(this);

}