Eagerly dispose of ScheduledActions (reland.)

third_party/WebKit/Source/core/frame/DOMTimer.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 89 matching lines @@
       std::max(oneMillisecond, interval * oneMillisecond);
   if (intervalMilliseconds < minimumInterval &&
       m_nestingLevel >= maxTimerNestingLevel)
     intervalMilliseconds = minimumInterval;
   if (singleShot)
     startOneShot(intervalMilliseconds, BLINK_FROM_HERE);
   else
     startRepeating(intervalMilliseconds, BLINK_FROM_HERE);
 }
 
-DOMTimer::~DOMTimer() {}
+DOMTimer::~DOMTimer() {
+  if (m_action)
+    m_action->dispose();
+}
 
 void DOMTimer::stop() {
   InspectorInstrumentation::asyncTaskCanceled(getExecutionContext(), this);
   m_userGestureToken = nullptr;
   // 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();
 }
 
 void DOMTimer::contextDestroyed() {
   stop();
 }
 
 void DOMTimer::fired() {
   ExecutionContext* context = getExecutionContext();
@@ skipping 37 matching lines @@
                        InspectorUpdateCountersEvent::data());
 
   // ExecutionContext might be already gone when we executed action->execute().
   ExecutionContext* executionContext = getExecutionContext();
   if (!executionContext)
     return;
 
   executionContext->timers()->setTimerNestingLevel(0);
   // Eagerly unregister as ExecutionContext observer.
   clearContext();
+  // Eagerly clear out |action|'s resources.
+  action->dispose();
 }
 
 WebTaskRunner* DOMTimer::timerTaskRunner() const {
   return getExecutionContext()->timers()->timerTaskRunner();
 }
 
 DEFINE_TRACE(DOMTimer) {
   visitor->trace(m_action);
   SuspendableTimer::trace(visitor);
 }
 
 }  // namespace blink