Merge 78648 - 2011-02-15 James Robinson <jamesr@chromium.org>...

Source/WebCore/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
@@ skipping 191 matching lines @@
 #if ENABLE(XHTMLMP)
 #include "HTMLNoScriptElement.h"
 #endif
 
 #if ENABLE(FULLSCREEN_API)
 #include "RenderFullScreen.h"
 #endif
 
 #if ENABLE(REQUEST_ANIMATION_FRAME)
 #include "RequestAnimationFrameCallback.h"
+#include "ScriptedAnimationController.h"
 #endif
 
 using namespace std;
 using namespace WTF;
 using namespace Unicode;
 
 namespace WebCore {
 
 using namespace HTMLNames;
 
@@ skipping 200 matching lines @@
 #if ENABLE(FULLSCREEN_API)
     , m_isFullScreen(0)
     , m_areKeysEnabledInFullScreen(0)
     , m_fullScreenRenderer(0)
     , m_fullScreenChangeDelayTimer(this, &Document::fullScreenChangeDelayTimerFired)
 #endif
     , m_loadEventDelayCount(0)
     , m_loadEventDelayTimer(this, &Document::loadEventDelayTimerFired)
     , m_directionSetOnDocumentElement(false)
     , m_writingModeSetOnDocumentElement(false)
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-    , m_nextRequestAnimationFrameCallbackId(0)
-#endif
 {
     m_document = this;
 
     m_pageGroupUserSheetCacheValid = false;
 
     m_printing = false;
     m_paginatedForScreen = false;
 
     m_ignoreAutofocus = false;
 
@@ skipping 4280 matching lines @@
         context->task->performTask(document);
 
     delete context;
 }
 
 void Document::postTask(PassOwnPtr<Task> task)
 {
     callOnMainThread(performTask, new PerformTaskContext(m_weakReference, task));
 }
 
+void Document::suspendScriptedAnimationControllerCallbacks()
+{
+#if ENABLE(REQUEST_ANIMATION_FRAME)
+    if (m_scriptedAnimationController)
+        m_scriptedAnimationController->suspend();
+#endif
+}
+
+void Document::resumeScriptedAnimationControllerCallbacks()
+{
+#if ENABLE(REQUEST_ANIMATION_FRAME)
+    if (m_scriptedAnimationController)
+        m_scriptedAnimationController->resume();
+#endif
+}
+
 Element* Document::findAnchor(const String& name)
 {
     if (name.isEmpty())
         return 0;
     if (Element* element = getElementById(name))
         return element;
     for (Node* node = this; node; node = node->traverseNextNode()) {
         if (node->hasTagName(aTag)) {
             HTMLAnchorElement* anchor = static_cast<HTMLAnchorElement*>(node);
             if (inQuirksMode()) {
@@ skipping 210 matching lines @@
         m_loadEventDelayTimer.startOneShot(0);
 }
 
 void Document::loadEventDelayTimerFired(Timer<Document>*)
 {
     if (frame())
         frame()->loader()->checkCompleted();
 }
 
 #if ENABLE(REQUEST_ANIMATION_FRAME)
-int Document::webkitRequestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback> callback, Element* e)
+int Document::webkitRequestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback> callback, Element* animationElement)
 {
-    if (!m_requestAnimationFrameCallbacks)
-        m_requestAnimationFrameCallbacks = new RequestAnimationFrameCallbackList;
-    int id = m_nextRequestAnimationFrameCallbackId++;
-    callback->m_firedOrCancelled = false;
-    callback->m_id = id;
-    callback->m_element = e;
-    m_requestAnimationFrameCallbacks->append(callback);
-    if (FrameView* v = view())
-        v->scheduleAnimation();
-    return id;
+    if (!m_scriptedAnimationController)
+        m_scriptedAnimationController = ScriptedAnimationController::create(this);
+
+    return m_scriptedAnimationController->registerCallback(callback, animationElement);
 }
 
 void Document::webkitCancelRequestAnimationFrame(int id)
 {
-    if (!m_requestAnimationFrameCallbacks)
+    if (!m_scriptedAnimationController)
         return;
-    for (size_t i = 0; i < m_requestAnimationFrameCallbacks->size(); ++i) {
-        if (m_requestAnimationFrameCallbacks->at(i)->m_id == id) {
-            m_requestAnimationFrameCallbacks->at(i)->m_firedOrCancelled = true;
-            m_requestAnimationFrameCallbacks->remove(i);
-            return;
-        }
-    }
+    m_scriptedAnimationController->cancelCallback(id);
 }
 
 void Document::serviceScriptedAnimations()
 {
-    if (!m_requestAnimationFrameCallbacks)
+    if (!m_scriptedAnimationController)
         return;
-    // We want to run the callback for all elements in the document that have registered
-    // for a callback and that are visible.  Running the callbacks can cause new callbacks
-    // to be registered, existing callbacks to be cancelled, and elements to gain or lose
-    // visibility so this code has to iterate carefully.
-
-    // FIXME: Currently, this code doesn't do any visibility tests beyond checking display:
-
-    // First, generate a list of callbacks to consider.  Callbacks registered from this point
-    // on are considered only for the "next" frame, not this one.
-    RequestAnimationFrameCallbackList callbacks(*m_requestAnimationFrameCallbacks);
-
-    // Firing the callback may cause the visibility of other elements to change.  To avoid
-    // missing any callbacks, we keep iterating through the list of candiate callbacks and firing
-    // them until nothing new becomes visible.
-    bool firedCallback;
-    do {
-        firedCallback = false;
-        // A previous iteration may have invalidated style (or layout).  Update styles for each iteration
-        // for now since all we check is the existence of a renderer.
-        updateStyleIfNeeded();
-        for (size_t i = 0; i < callbacks.size(); ++i) {
-            RequestAnimationFrameCallback* callback = callbacks[i].get();
-            if (!callback->m_firedOrCancelled && (!callback->m_element || callback->m_element->renderer())) {
-                callback->m_firedOrCancelled = true;
-                callback->handleEvent();
-                firedCallback = true;
-                callbacks.remove(i);
-                break;
-            }
-        }
-    } while (firedCallback);
-
-    // Remove any callbacks we fired from the list of pending callbacks.
-    for (size_t i = 0; i < m_requestAnimationFrameCallbacks->size();) {
-        if (m_requestAnimationFrameCallbacks->at(i)->m_firedOrCancelled)
-            m_requestAnimationFrameCallbacks->remove(i);
-        else
-            ++i;
-    }
-
-    // In most cases we expect this list to be empty, so no need to keep around the vector's inline buffer.
-    if (!m_requestAnimationFrameCallbacks->size())
-        m_requestAnimationFrameCallbacks.clear();
-    else if (FrameView* v = view())
-        v->scheduleAnimation();
+    m_scriptedAnimationController->serviceScriptedAnimations(time);
 }
 #endif
 
 #if ENABLE(TOUCH_EVENTS)
 PassRefPtr<Touch> Document::createTouch(DOMWindow* window, EventTarget* target, int identifier, int pageX, int pageY, int screenX, int screenY, ExceptionCode&) const
 {
     // FIXME: It's not clear from the documentation at
     // http://developer.apple.com/library/safari/#documentation/UserExperience/Reference/DocumentAdditionsReference/DocumentAdditions/DocumentAdditions.html
     // when this method should throw and nor is it by inspection of iOS behavior. It would be nice to verify any cases where it throws under iOS
     // and implement them here. See https://bugs.webkit.org/show_bug.cgi?id=47819
@@ skipping 32 matching lines @@
     // This functions is used for checking such possibility of FOUCs.
     // Note that the implementation considers only empty or <head> only contents as a FOUC cause
     // rather than missing <body>, because non-HTML document like SVG and arbitrary XML from foreign namespace 
     // should be painted even if there is no <body>.
     if (didLayoutWithPendingStylesheets())
         return true;
     return !hasHeadSibling(this);
 }
 
 } // namespace WebCore