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

Side by Side 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 void DOMTimer::disposeTimer() 92 void DOMTimer::disposeTimer()
93 { 93 {
94 m_action = nullptr; 94 m_action = nullptr;
95 m_userGestureToken = nullptr; 95 m_userGestureToken = nullptr;
96 stop(); 96 stop();
97 } 97 }
98 98
99 void DOMTimer::fired() 99 void DOMTimer::fired()
100 { 100 {
101 ExecutionContext* context = executionContext(); 101 ExecutionContext* context = getExecutionContext();
102 ASSERT(context); 102 ASSERT(context);
103 context->timers()->setTimerNestingLevel(m_nestingLevel); 103 context->timers()->setTimerNestingLevel(m_nestingLevel);
104 ASSERT(!context->activeDOMObjectsAreSuspended()); 104 ASSERT(!context->activeDOMObjectsAreSuspended());
105 // Only the first execution of a multi-shot timer should get an affirmative user gesture indicator. 105 // Only the first execution of a multi-shot timer should get an affirmative user gesture indicator.
106 UserGestureIndicator gestureIndicator(m_userGestureToken.release()); 106 UserGestureIndicator gestureIndicator(m_userGestureToken.release());
107 107
108 TRACE_EVENT1("devtools.timeline", "TimerFire", "data", InspectorTimerFireEve nt::data(context, m_timeoutID)); 108 TRACE_EVENT1("devtools.timeline", "TimerFire", "data", InspectorTimerFireEve nt::data(context, m_timeoutID));
109 InspectorInstrumentationCookie cookie = InspectorInstrumentation::willFireTi mer(context, m_timeoutID); 109 InspectorInstrumentationCookie cookie = InspectorInstrumentation::willFireTi mer(context, m_timeoutID);
110 110
111 // Simple case for non-one-shot timers. 111 // Simple case for non-one-shot timers.
(...skipping 18 matching lines...) Expand all
130 // for one-shot timers. 130 // for one-shot timers.
131 OwnPtrWillBeRawPtr<ScheduledAction> action = m_action.release(); 131 OwnPtrWillBeRawPtr<ScheduledAction> action = m_action.release();
132 context->timers()->removeTimeoutByID(m_timeoutID); 132 context->timers()->removeTimeoutByID(m_timeoutID);
133 133
134 action->execute(context); 134 action->execute(context);
135 135
136 InspectorInstrumentation::didFireTimer(cookie); 136 InspectorInstrumentation::didFireTimer(cookie);
137 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Update Counters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data( )); 137 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Update Counters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data( ));
138 138
139 // ExecutionContext might be already gone when we executed action->execute() . 139 // ExecutionContext might be already gone when we executed action->execute() .
140 if (executionContext()) 140 if (getExecutionContext())
141 executionContext()->timers()->setTimerNestingLevel(0); 141 getExecutionContext()->timers()->setTimerNestingLevel(0);
142 } 142 }
143 143
144 void DOMTimer::stop() 144 void DOMTimer::stop()
145 { 145 {
146 SuspendableTimer::stop(); 146 SuspendableTimer::stop();
147 // Need to release JS objects potentially protected by ScheduledAction 147 // Need to release JS objects potentially protected by ScheduledAction
148 // because they can form circular references back to the ExecutionContext 148 // because they can form circular references back to the ExecutionContext
149 // which will cause a memory leak. 149 // which will cause a memory leak.
150 m_action.clear(); 150 m_action.clear();
151 } 151 }
152 152
153 WebTaskRunner* DOMTimer::timerTaskRunner() const 153 WebTaskRunner* DOMTimer::timerTaskRunner() const
154 { 154 {
155 return executionContext()->timers()->timerTaskRunner(); 155 return getExecutionContext()->timers()->timerTaskRunner();
156 } 156 }
157 157
158 DEFINE_TRACE(DOMTimer) 158 DEFINE_TRACE(DOMTimer)
159 { 159 {
160 visitor->trace(m_action); 160 visitor->trace(m_action);
161 SuspendableTimer::trace(visitor); 161 SuspendableTimer::trace(visitor);
162 } 162 }
163 163
164 } // namespace blink 164 } // namespace blink
OLDNEW
« 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