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

Unified Diff: third_party/WebKit/Source/core/frame/DOMTimer.cpp

Issue 2568103002: Revert of Eagerly dispose of ScheduledActions. (Closed)
Patch Set: Created 4 years 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/bindings/core/v8/ScriptSourceCode.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a6140804ca9f54ac1a5eb73cb73cc82aa0a5ac0c..f3cd7206b7826207d9a7198b07e43f128a53a349 100644
--- a/third_party/WebKit/Source/core/frame/DOMTimer.cpp
+++ b/third_party/WebKit/Source/core/frame/DOMTimer.cpp
@@ -107,10 +107,7 @@
startRepeating(intervalMilliseconds, BLINK_FROM_HERE);
}
-DOMTimer::~DOMTimer() {
- if (m_action)
- m_action->dispose();
-}
+DOMTimer::~DOMTimer() {}
void DOMTimer::stop() {
InspectorInstrumentation::asyncTaskCanceled(getExecutionContext(), this);
@@ -118,8 +115,6 @@
// Need to release JS objects potentially protected by ScheduledAction
// because they can form circular references back to the ExecutionContext
// which will cause a memory leak.
- if (m_action)
- m_action->dispose();
m_action = nullptr;
SuspendableTimer::stop();
}
@@ -177,8 +172,6 @@
executionContext->timers()->setTimerNestingLevel(0);
// Eagerly unregister as ExecutionContext observer.
clearContext();
- // Eagerly clear out |action|'s resources.
- action->dispose();
}
WebTaskRunner* DOMTimer::timerTaskRunner() const {
« no previous file with comments | « third_party/WebKit/Source/bindings/core/v8/ScriptSourceCode.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698