Revert of RequestIdleCallback: Avoid retaining ScriptedIdleTaskController while a cancelled...

third_party/WebKit/Source/core/dom/ScriptedIdleTaskController.cpp

Index: third_party/WebKit/Source/core/dom/ScriptedIdleTaskController.cpp
diff --git a/third_party/WebKit/Source/core/dom/ScriptedIdleTaskController.cpp b/third_party/WebKit/Source/core/dom/ScriptedIdleTaskController.cpp
index 6dab32ec421119e75941da464502d0fa3709a0db..b0bdb09aeb8c4f3fada72a03476c28700fc39e66 100644
--- a/third_party/WebKit/Source/core/dom/ScriptedIdleTaskController.cpp
+++ b/third_party/WebKit/Source/core/dom/ScriptedIdleTaskController.cpp
@@ -34,21 +34,12 @@
     static void idleTaskFired(PassRefPtr<IdleRequestCallbackWrapper> callbackWrapper, double deadlineSeconds)
     {
         // TODO(rmcilroy): Implement clamping of deadline in some form.
-        if (ScriptedIdleTaskController* controller = callbackWrapper->controller())
-            controller->callbackFired(callbackWrapper->id(), deadlineSeconds, IdleDeadline::CallbackType::CalledWhenIdle);
-        callbackWrapper->cancel();
+        callbackWrapper->controller()->callbackFired(callbackWrapper->id(), deadlineSeconds, IdleDeadline::CallbackType::CalledWhenIdle);
     }
 
     static void timeoutFired(PassRefPtr<IdleRequestCallbackWrapper> callbackWrapper)
     {
-        if (ScriptedIdleTaskController* controller = callbackWrapper->controller())
-            controller->callbackFired(callbackWrapper->id(), monotonicallyIncreasingTime(), IdleDeadline::CallbackType::CalledByTimeout);
-        callbackWrapper->cancel();
-    }
-
-    void cancel()
-    {
-        m_controller = nullptr;
+        callbackWrapper->controller()->callbackFired(callbackWrapper->id(), monotonicallyIncreasingTime(), IdleDeadline::CallbackType::CalledByTimeout);
     }
 
     ScriptedIdleTaskController::CallbackId id() const { return m_id; }