Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(427)

Unified Diff: third_party/WebKit/Source/core/frame/DOMTimer.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
Index: third_party/WebKit/Source/core/frame/DOMTimer.cpp
diff --git a/third_party/WebKit/Source/core/frame/DOMTimer.cpp b/third_party/WebKit/Source/core/frame/DOMTimer.cpp
index 5914cd41d15ee6e4a3c0c1bad2dc53bf11c51895..513d725a2ca72a4721b84fe284276c933ae92c42 100644
--- a/third_party/WebKit/Source/core/frame/DOMTimer.cpp
+++ b/third_party/WebKit/Source/core/frame/DOMTimer.cpp
@@ -98,7 +98,7 @@ void DOMTimer::disposeTimer()
void DOMTimer::fired()
{
- ExecutionContext* context = executionContext();
+ ExecutionContext* context = getExecutionContext();
ASSERT(context);
context->timers()->setTimerNestingLevel(m_nestingLevel);
ASSERT(!context->activeDOMObjectsAreSuspended());
@@ -137,8 +137,8 @@ void DOMTimer::fired()
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data());
// ExecutionContext might be already gone when we executed action->execute().
- if (executionContext())
- executionContext()->timers()->setTimerNestingLevel(0);
+ if (getExecutionContext())
+ getExecutionContext()->timers()->setTimerNestingLevel(0);
}
void DOMTimer::stop()
@@ -152,7 +152,7 @@ void DOMTimer::stop()
WebTaskRunner* DOMTimer::timerTaskRunner() const
{
- return executionContext()->timers()->timerTaskRunner();
+ return getExecutionContext()->timers()->timerTaskRunner();
}
DEFINE_TRACE(DOMTimer)
« no previous file with comments | « third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp ('k') | third_party/WebKit/Source/core/frame/DOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698