Manage RequestAnimationFrameCallbacks with OwnPtrs instead of RefPtrs

Source/core/dom/ScriptedAnimationController.cpp

 /*
  * Copyright (C) 2011 Google 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 48 matching lines @@
 
 void ScriptedAnimationController::resume()
 {
     // It would be nice to put an ASSERT(m_suspendCount > 0) here, but in WK1 resume() can be called
     // even when suspend hasn't (if a tab was created in the background).
     if (m_suspendCount > 0)
         --m_suspendCount;
     scheduleAnimationIfNeeded();
 }
 
-ScriptedAnimationController::CallbackId ScriptedAnimationController::registerCallback(PassRefPtr<RequestAnimationFrameCallback> callback)
+ScriptedAnimationController::CallbackId ScriptedAnimationController::registerCallback(PassOwnPtr<RequestAnimationFrameCallback> callback)
 {
     ScriptedAnimationController::CallbackId id = ++m_nextCallbackId;
-    callback->m_firedOrCancelled = false;
+    callback->m_cancelled = false;
     callback->m_id = id;
     m_callbacks.append(callback);
     scheduleAnimationIfNeeded();
 
     InspectorInstrumentation::didRequestAnimationFrame(m_document, id);
 
     return id;
 }
 
 void ScriptedAnimationController::cancelCallback(CallbackId id)
 {
     for (size_t i = 0; i < m_callbacks.size(); ++i) {
         if (m_callbacks[i]->m_id == id) {
-            m_callbacks[i]->m_firedOrCancelled = true;
             InspectorInstrumentation::didCancelAnimationFrame(m_document, id);
             m_callbacks.remove(i);
             return;
         }
     }
+    for (size_t i = 0; i < m_callbacksToInvoke.size(); ++i) {
+        if (m_callbacksToInvoke[i]->m_id == id) {
+            InspectorInstrumentation::didCancelAnimationFrame(m_document, id);
+            m_callbacksToInvoke[i]->m_cancelled = true;
+            // will be removed at the end of executeCallbacks()
+            return;
+        }
+    }
 }
 
 void ScriptedAnimationController::dispatchEvents()
 {
     Vector<RefPtr<Event> > events;
     events.swap(m_eventQueue);
     m_perFrameEvents.clear();
 
     for (size_t i = 0; i < events.size(); ++i) {
         EventTarget* eventTarget = events[i]->target();
@@ skipping 11 matching lines @@
 {
     // dispatchEvents() runs script which can cause the document to be destroyed.
     if (!m_document)
         return;
 
     double highResNowMs = 1000.0 * m_document->loader()->timing()->monotonicTimeToZeroBasedDocumentTime(monotonicTimeNow);
     double legacyHighResNowMs = 1000.0 * m_document->loader()->timing()->monotonicTimeToPseudoWallTime(monotonicTimeNow);
 
     // First, generate a list of callbacks to consider.  Callbacks registered from this point
     // on are considered only for the "next" frame, not this one.
-    CallbackList callbacks(m_callbacks);
+    ASSERT(m_callbacksToInvoke.isEmpty());
+    m_callbacksToInvoke.swap(m_callbacks);
 
-    for (size_t i = 0; i < callbacks.size(); ++i) {
-        RequestAnimationFrameCallback* callback = callbacks[i].get();
-        if (!callback->m_firedOrCancelled) {
-            callback->m_firedOrCancelled = true;
+    for (size_t i = 0; i < m_callbacksToInvoke.size(); ++i) {
+        RequestAnimationFrameCallback* callback = m_callbacksToInvoke[i].get();
+        if (!callback->m_cancelled) {
             InspectorInstrumentationCookie cookie = InspectorInstrumentation::willFireAnimationFrame(m_document, callback->m_id);
             if (callback->m_useLegacyTimeBase)
                 callback->handleEvent(legacyHighResNowMs);
             else
                 callback->handleEvent(highResNowMs);
             InspectorInstrumentation::didFireAnimationFrame(cookie);
         }
     }
 
-    // Remove any callbacks we fired from the list of pending callbacks.
-    for (size_t i = 0; i < m_callbacks.size();) {
-        if (m_callbacks[i]->m_firedOrCancelled)
-            m_callbacks.remove(i);
-        else
-            ++i;
-    }
+    m_callbacksToInvoke.clear();
 }
 
 void ScriptedAnimationController::serviceScriptedAnimations(double monotonicTimeNow)
 {
     if (!m_callbacks.size() && !m_eventQueue.size())
         return;
 
     if (m_suspendCount)
         return;
 
@@ skipping 27 matching lines @@
         return;
 
     if (!m_callbacks.size() && !m_eventQueue.size())
         return;
 
     if (FrameView* frameView = m_document->view())
         frameView->scheduleAnimation();
 }
 
 }