2011-01-19 James Robinson <jamesr@chromium.org>
authorjamesr@google.com <jamesr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 20 Jan 2011 03:52:42 +0000 (03:52 +0000)
committerjamesr@google.com <jamesr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 20 Jan 2011 03:52:42 +0000 (03:52 +0000)
        Unreviewed, rolling out r76194.
        http://trac.webkit.org/changeset/76194
        https://bugs.webkit.org/show_bug.cgi?id=51218

        Caused mysterious compile failure on the chromium win
        build.webkit.org bots

        * fast/animation/request-animation-frame-cancel-expected.txt: Removed.
        * fast/animation/request-animation-frame-cancel.html: Removed.
        * fast/animation/request-animation-frame-cancel2-expected.txt: Removed.
        * fast/animation/request-animation-frame-cancel2.html: Removed.
        * fast/animation/request-animation-frame-display-expected.txt: Removed.
        * fast/animation/request-animation-frame-display.html: Removed.
        * fast/animation/request-animation-frame-expected.txt: Removed.
        * fast/animation/request-animation-frame-within-callback-expected.txt: Removed.
        * fast/animation/request-animation-frame-within-callback.html: Removed.
        * fast/animation/request-animation-frame.html: Removed.
        * platform/chromium/test_expectations.txt:
        * platform/gtk/Skipped:
        * platform/mac/Skipped:
        * platform/qt/Skipped:
        * platform/win/Skipped:
2011-01-19  James Robinson  <jamesr@chromium.org>

        Unreviewed, rolling out r76194.
        http://trac.webkit.org/changeset/76194
        https://bugs.webkit.org/show_bug.cgi?id=51218

        Caused mysterious compile failure on the chromium win
        build.webkit.org bots

        * WebCore.gypi:
        * dom/Document.cpp:
        (WebCore::Document::Document):
        * dom/Document.h:
        * dom/RequestAnimationFrameCallback.h: Removed.
        * dom/RequestAnimationFrameCallback.idl: Removed.
        * loader/EmptyClients.h:
        * page/Chrome.cpp:
        * page/Chrome.h:
        * page/ChromeClient.h:
        * page/DOMWindow.cpp:
        * page/DOMWindow.h:
        * page/DOMWindow.idl:
        * page/FrameView.cpp:
        * page/FrameView.h:
        * platform/HostWindow.h:
2011-01-19  James Robinson  <jamesr@chromium.org>

        Unreviewed, rolling out r76194.
        http://trac.webkit.org/changeset/76194
        https://bugs.webkit.org/show_bug.cgi?id=51218

        Caused mysterious compile failure on the chromium win
        build.webkit.org bots

        * features.gypi:
        * public/WebWidget.h:
        * public/WebWidgetClient.h:
        * src/ChromeClientImpl.cpp:
        * src/ChromeClientImpl.h:
        * src/WebPopupMenuImpl.cpp:
        * src/WebPopupMenuImpl.h:
        * src/WebViewImpl.cpp:
        * src/WebViewImpl.h:
2011-01-19  James Robinson  <jamesr@chromium.org>

        Unreviewed, rolling out r76194.
        http://trac.webkit.org/changeset/76194
        https://bugs.webkit.org/show_bug.cgi?id=51218

        Caused mysterious compile failure on the chromium win
        build.webkit.org bots

        * DumpRenderTree/chromium/WebViewHost.cpp:
        (WebViewHost::paintInvalidatedRegion):
        * DumpRenderTree/chromium/WebViewHost.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@76198 268f45cc-cd09-0410-ab3c-d52691b4dbfc

45 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/animation/request-animation-frame-cancel-expected.txt [deleted file]
LayoutTests/fast/animation/request-animation-frame-cancel.html [deleted file]
LayoutTests/fast/animation/request-animation-frame-cancel2-expected.txt [deleted file]
LayoutTests/fast/animation/request-animation-frame-cancel2.html [deleted file]
LayoutTests/fast/animation/request-animation-frame-display-expected.txt [deleted file]
LayoutTests/fast/animation/request-animation-frame-display.html [deleted file]
LayoutTests/fast/animation/request-animation-frame-expected.txt [deleted file]
LayoutTests/fast/animation/request-animation-frame-within-callback-expected.txt [deleted file]
LayoutTests/fast/animation/request-animation-frame-within-callback.html [deleted file]
LayoutTests/fast/animation/request-animation-frame.html [deleted file]
LayoutTests/platform/chromium/test_expectations.txt
LayoutTests/platform/gtk/Skipped
LayoutTests/platform/mac/Skipped
LayoutTests/platform/qt/Skipped
LayoutTests/platform/win/Skipped
Source/WebCore/ChangeLog
Source/WebCore/WebCore.gypi
Source/WebCore/dom/Document.cpp
Source/WebCore/dom/Document.h
Source/WebCore/dom/RequestAnimationFrameCallback.h [deleted file]
Source/WebCore/dom/RequestAnimationFrameCallback.idl [deleted file]
Source/WebCore/loader/EmptyClients.h
Source/WebCore/page/Chrome.cpp
Source/WebCore/page/Chrome.h
Source/WebCore/page/ChromeClient.h
Source/WebCore/page/DOMWindow.cpp
Source/WebCore/page/DOMWindow.h
Source/WebCore/page/DOMWindow.idl
Source/WebCore/page/FrameView.cpp
Source/WebCore/page/FrameView.h
Source/WebCore/platform/HostWindow.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/features.gypi
Source/WebKit/chromium/public/WebWidget.h
Source/WebKit/chromium/public/WebWidgetClient.h
Source/WebKit/chromium/src/ChromeClientImpl.cpp
Source/WebKit/chromium/src/ChromeClientImpl.h
Source/WebKit/chromium/src/WebPopupMenuImpl.cpp
Source/WebKit/chromium/src/WebPopupMenuImpl.h
Source/WebKit/chromium/src/WebViewImpl.cpp
Source/WebKit/chromium/src/WebViewImpl.h
Tools/ChangeLog
Tools/DumpRenderTree/chromium/WebViewHost.cpp
Tools/DumpRenderTree/chromium/WebViewHost.h

index 02f913f..f9e9ae1 100644 (file)
@@ -1,5 +1,30 @@
 2011-01-19  James Robinson  <jamesr@chromium.org>
 
+        Unreviewed, rolling out r76194.
+        http://trac.webkit.org/changeset/76194
+        https://bugs.webkit.org/show_bug.cgi?id=51218
+
+        Caused mysterious compile failure on the chromium win
+        build.webkit.org bots
+
+        * fast/animation/request-animation-frame-cancel-expected.txt: Removed.
+        * fast/animation/request-animation-frame-cancel.html: Removed.
+        * fast/animation/request-animation-frame-cancel2-expected.txt: Removed.
+        * fast/animation/request-animation-frame-cancel2.html: Removed.
+        * fast/animation/request-animation-frame-display-expected.txt: Removed.
+        * fast/animation/request-animation-frame-display.html: Removed.
+        * fast/animation/request-animation-frame-expected.txt: Removed.
+        * fast/animation/request-animation-frame-within-callback-expected.txt: Removed.
+        * fast/animation/request-animation-frame-within-callback.html: Removed.
+        * fast/animation/request-animation-frame.html: Removed.
+        * platform/chromium/test_expectations.txt:
+        * platform/gtk/Skipped:
+        * platform/mac/Skipped:
+        * platform/qt/Skipped:
+        * platform/win/Skipped:
+
+2011-01-19  James Robinson  <jamesr@chromium.org>
+
         Reviewed by Darin Fisher.
 
         Implement mozilla's requestAnimationFrame API
diff --git a/LayoutTests/fast/animation/request-animation-frame-cancel-expected.txt b/LayoutTests/fast/animation/request-animation-frame-cancel-expected.txt
deleted file mode 100644 (file)
index 7ef22e9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-PASS
diff --git a/LayoutTests/fast/animation/request-animation-frame-cancel.html b/LayoutTests/fast/animation/request-animation-frame-cancel.html
deleted file mode 100644 (file)
index 4210f7b..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-<span id="e">PASS</span>
-<script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
-
-var e = document.getElementById("e");
-var id = window.webkitRequestAnimationFrame(function() {
-    e.innerHTML = "FAIL";
-}, e);
-
-window.webkitCancelRequestAnimationFrame(id);
-
-if (window.layoutTestController)
-    layoutTestController.display();
-</script>
diff --git a/LayoutTests/fast/animation/request-animation-frame-cancel2-expected.txt b/LayoutTests/fast/animation/request-animation-frame-cancel2-expected.txt
deleted file mode 100644 (file)
index 7ef22e9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-PASS
diff --git a/LayoutTests/fast/animation/request-animation-frame-cancel2.html b/LayoutTests/fast/animation/request-animation-frame-cancel2.html
deleted file mode 100644 (file)
index 4ac2e93..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-<span id="e">PASS</span>
-<script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
-
-var e = document.getElementById("e");
-var secondCallbackId;
-
-window.webkitRequestAnimationFrame(function() {
-    window.webkitCancelRequestAnimationFrame(secondCallbackId);
-}, e);
-
-secondCallbackId = window.webkitRequestAnimationFrame(function() {
-    e.innerHTML =  "FAIL";
-}, e);
-
-if (window.layoutTestController)
-    layoutTestController.display();
-</script>
diff --git a/LayoutTests/fast/animation/request-animation-frame-display-expected.txt b/LayoutTests/fast/animation/request-animation-frame-display-expected.txt
deleted file mode 100644 (file)
index 7ef22e9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-PASS
diff --git a/LayoutTests/fast/animation/request-animation-frame-display.html b/LayoutTests/fast/animation/request-animation-frame-display.html
deleted file mode 100644 (file)
index b822577..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-<span id="a" style="display:none"></span>
-<span id="b">FAIL</span>
-<script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
-
-var a = document.getElementById("a");
-window.webkitRequestAnimationFrame(function() {
-    b.innerHTML="PASS";
-}, a);
-
-var b = document.getElementById("b");
-window.webkitRequestAnimationFrame(function() {
-    a.style.display="";
-}, b);
-
-if (window.layoutTestController)
-    layoutTestController.display();
-</script>
-</html>
diff --git a/LayoutTests/fast/animation/request-animation-frame-expected.txt b/LayoutTests/fast/animation/request-animation-frame-expected.txt
deleted file mode 100644 (file)
index 7ef22e9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-PASS
diff --git a/LayoutTests/fast/animation/request-animation-frame-within-callback-expected.txt b/LayoutTests/fast/animation/request-animation-frame-within-callback-expected.txt
deleted file mode 100644 (file)
index 7ef22e9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-PASS
diff --git a/LayoutTests/fast/animation/request-animation-frame-within-callback.html b/LayoutTests/fast/animation/request-animation-frame-within-callback.html
deleted file mode 100644 (file)
index d5a366f..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
-<span id="e">FAIL</span>
-<script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
-
-var e = document.getElementById("e");
-var sameFrame;
-window.webkitRequestAnimationFrame(function() {
-    sameFrame = true;
-}, e);
-window.webkitRequestAnimationFrame(function() {
-    window.webkitRequestAnimationFrame(function() {
-        e.innerHTML = sameFrame ? "FAIL" : "PASS";
-    }, e);
-}, e);
-window.webkitRequestAnimationFrame(function() {
-    sameFrame = false;
-}, e);
-
-// This should fire the three already registered callbacks, but not the one dynamically registered.
-if (window.layoutTestController)
-    layoutTestController.display();
-// This should fire the dynamically registered callback.
-if (window.layoutTestController)
-    layoutTestController.display();
-</script>
diff --git a/LayoutTests/fast/animation/request-animation-frame.html b/LayoutTests/fast/animation/request-animation-frame.html
deleted file mode 100644 (file)
index 7d67a97..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<span id="e">FAIL</span>
-<script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
-
-var e = document.getElementById("e");
-window.webkitRequestAnimationFrame(function() {
-    e.innerHTML="PASS";
-}, e);
-if (window.layoutTestController)
-    layoutTestController.display();
-</script>
index adf5cf3..edd67bf 100644 (file)
@@ -3059,9 +3059,6 @@ BUGWK52061 DEBUG : transitions/change-values-during-transition.html = PASS TEXT
 BUGWK52061 DEBUG : transitions/interrupted-accelerated-transition.html = PASS TEXT
 BUGWK52061 DEBUG : transitions/transition-timing-function.html = PASS TEXT
 
-// These will fail on the canaries until a chromium-side features_overrides.gypi change lands
-BUG_JAMESR : fast/animation = TEXT
-
 // Failing since creation in http://trac.webkit.org/changeset/75308
 BUG_ABARTH : svg/text/caret-in-svg-text.xhtml = TEXT
 
@@ -3090,4 +3087,4 @@ BUGCR69736 : fast/js/js-continue-break-restrictions.html = TEXT
 BUGCR1 REBASELINE MAC : fast/events/offsetX-offsetY.html = TEXT
 
 // Waiting to rebaseline
-BUG_DGLAZKOV : fast/forms/slider-mouse-events.html = TEXT
+BUG_DGLAZKOV : fast/forms/slider-mouse-events.html = TEXT
\ No newline at end of file
index 74a94b0..68be9d6 100644 (file)
@@ -5588,9 +5588,6 @@ http/tests/inspector/console-websocket-error.html
 http/tests/xmlhttprequest/basic-auth-nouser.html
 http/tests/xmlhttprequest/basic-auth-nopassword.html
 
-# Requires requestAnimationFrame support
-fast/animation/
-
 # https://bugs.webkit.org/show_bug.cgi?id=52297
 editing/input/page-up-down-scrolls.html
 
index eea146b..524519b 100644 (file)
@@ -280,6 +280,3 @@ animations/stop-animation-on-suspend.html
 
 # DRT does not support toggling caret browsing on / off
 editing/selection/caret-mode-paragraph-keys-navigation.html
-
-# Requires requestAnimationFrame support
-fast/animation/
index 52ac69f..55368c0 100644 (file)
@@ -5087,9 +5087,6 @@ editing/selection/caret-bidi-first-and-last-letters.html
 # https://bugs.webkit.org/show_bug.cgi?id=52155
 fast/text/emphasis-avoid-ruby.html
 
-# Requires requestAnimationFrame support
-fast/animation/
-
 # https://bugs.webkit.org/show_bug.cgi?id=42578
 # [Qt] DRT sideeffect revealed by r63657 and r75305
 fast/tokenizer/flush-characters-in-document-write-evil.html
index 703bedc..a7456cb 100644 (file)
@@ -1115,6 +1115,5 @@ fast/loader/user-stylesheet-fast-path.html
 # DRT does not support toggling caret browsing on / off
 editing/selection/caret-mode-paragraph-keys-navigation.html
 
-# Requires requestAnimationFrame support
-fast/animation/
-
+# DRT does not obey addURLToRedirect
+http/tests/loading/cross-origin-XHR-willLoadRequest.html
index 9537fa6..7365cbc 100644 (file)
@@ -1,3 +1,29 @@
+2011-01-19  James Robinson  <jamesr@chromium.org>
+
+        Unreviewed, rolling out r76194.
+        http://trac.webkit.org/changeset/76194
+        https://bugs.webkit.org/show_bug.cgi?id=51218
+
+        Caused mysterious compile failure on the chromium win
+        build.webkit.org bots
+
+        * WebCore.gypi:
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        * dom/Document.h:
+        * dom/RequestAnimationFrameCallback.h: Removed.
+        * dom/RequestAnimationFrameCallback.idl: Removed.
+        * loader/EmptyClients.h:
+        * page/Chrome.cpp:
+        * page/Chrome.h:
+        * page/ChromeClient.h:
+        * page/DOMWindow.cpp:
+        * page/DOMWindow.h:
+        * page/DOMWindow.idl:
+        * page/FrameView.cpp:
+        * page/FrameView.h:
+        * platform/HostWindow.h:
+
 2011-01-19  Simon Fraser  <simon.fraser@apple.com>
 
         Reviewed by Sam Weinig.
index 018e068..d293614 100644 (file)
@@ -75,7 +75,6 @@
             'dom/ProgressEvent.idl',
             'dom/Range.idl',
             'dom/RangeException.idl',
-            'dom/RequestAnimationFrameCallback.idl',
             'dom/Text.idl',
             'dom/TextEvent.idl',
             'dom/Touch.idl',
             'dom/Range.h',
             'dom/RangeBoundaryPoint.h',
             'dom/RangeException.h',
-            'dom/RequestAnimationFrameCallback.h',
             'dom/RawDataDocumentParser.h',
             'dom/RegisteredEventListener.cpp',
             'dom/RegisteredEventListener.h',
index f69851b..ce05a09 100644 (file)
 #include "RenderFullScreen.h"
 #endif
 
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-#include "RequestAnimationFrameCallback.h"
-#endif
-
 using namespace std;
 using namespace WTF;
 using namespace Unicode;
@@ -428,9 +424,6 @@ Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML, con
     , m_loadEventDelayTimer(this, &Document::loadEventDelayTimerFired)
     , m_directionSetOnDocumentElement(false)
     , m_writingModeSetOnDocumentElement(false)
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-    , m_nextRequestAnimationFrameCallbackId(0)
-#endif
 {
     m_document = this;
 
@@ -4949,86 +4942,6 @@ void Document::loadEventDelayTimerFired(Timer<Document>*)
         frame()->loader()->checkCompleted();
 }
 
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-int Document::webkitRequestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback> callback, Element* e)
-{
-    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;
-}
-
-void Document::webkitCancelRequestAnimationFrame(int id)
-{
-    if (!m_requestAnimationFrameCallbacks)
-        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;
-        }
-    }
-}
-
-void Document::serviceScriptedAnimations()
-{
-    if (!m_requestAnimationFrameCallbacks)
-        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();
-}
-#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
 {
index c78ba5f..2cd26f9 100644 (file)
@@ -146,10 +146,6 @@ class Touch;
 class TouchList;
 #endif
 
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-class RequestAnimationFrameCallback;
-#endif
-
 typedef int ExceptionCode;
 
 class FormElementKey {
@@ -1076,12 +1072,6 @@ public:
 
     const DocumentTiming* timing() const { return &m_documentTiming; }
 
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-    int webkitRequestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback>, Element*);
-    void webkitCancelRequestAnimationFrame(int id);
-    void serviceScriptedAnimations();
-#endif
-
     bool mayCauseFlashOfUnstyledContent() const;
 
     void initDNSPrefetch();
@@ -1401,12 +1391,6 @@ private:
 
     DocumentTiming m_documentTiming;
     RefPtr<MediaQueryMatcher> m_mediaQueryMatcher;
-
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-    typedef Vector<RefPtr<RequestAnimationFrameCallback> > RequestAnimationFrameCallbackList;
-    OwnPtr<RequestAnimationFrameCallbackList> m_requestAnimationFrameCallbacks;
-    int m_nextRequestAnimationFrameCallbackId;
-#endif
 };
 
 inline bool Document::DocumentOrderedMap::contains(AtomicStringImpl* id) const
diff --git a/Source/WebCore/dom/RequestAnimationFrameCallback.h b/Source/WebCore/dom/RequestAnimationFrameCallback.h
deleted file mode 100644 (file)
index 819e495..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef RequestAnimationFrameCallback_h
-#define RequestAnimationFrameCallback_h
-
-#include "Element.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class RequestAnimationFrameCallback : public RefCounted<RequestAnimationFrameCallback> {
-public:
-    virtual ~RequestAnimationFrameCallback() { }
-    virtual bool handleEvent() = 0;
-
-    RefPtr<Element> m_element;
-    int m_id;
-    bool m_firedOrCancelled;
-};
-
-}
-
-#endif // RequestAnimationFrameCallback_h
-
diff --git a/Source/WebCore/dom/RequestAnimationFrameCallback.idl b/Source/WebCore/dom/RequestAnimationFrameCallback.idl
deleted file mode 100644 (file)
index 8d232e5..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2010 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:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-module core {
-    interface [
-        Callback=FunctionOnly,Conditional=REQUEST_ANIMATION_FRAME
-    ] RequestAnimationFrameCallback{
-        boolean handleEvent();
-    };
-}
index 5a6bda0..e4cefc5 100644 (file)
@@ -157,9 +157,6 @@ public:
 #if ENABLE(TILED_BACKING_STORE)
     virtual void delegatedScrollRequested(const IntSize&) { }
 #endif
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-    virtual void scheduleAnimation() { }
-#endif
 
     virtual IntPoint screenToWindow(const IntPoint& p) const { return p; }
     virtual IntRect windowToScreen(const IntRect& r) const { return r; }
index d96b6c9..0405408 100644 (file)
@@ -445,13 +445,6 @@ void Chrome::setCursor(const Cursor& cursor)
     m_client->setCursor(cursor);
 }
 
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-void Chrome::scheduleAnimation()
-{
-    m_client->scheduleAnimation();
-}
-#endif
-
 #if ENABLE(NOTIFICATIONS)
 NotificationPresenter* Chrome::notificationPresenter() const
 {
index 0afd807..93b8c4a 100644 (file)
@@ -78,9 +78,6 @@ namespace WebCore {
         virtual PlatformPageClient platformPageClient() const;
         virtual void scrollbarsModeDidChange() const;
         virtual void setCursor(const Cursor&);
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-        virtual void scheduleAnimation();
-#endif
 
         void scrollRectIntoView(const IntRect&) const;
 
index e348afb..67e1325 100644 (file)
@@ -151,9 +151,6 @@ namespace WebCore {
         virtual PlatformPageClient platformPageClient() const = 0;
         virtual void scrollbarsModeDidChange() const = 0;
         virtual void setCursor(const Cursor&) = 0;
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-        virtual void scheduleAnimation() = 0;
-#endif
         // End methods used by HostWindow.
 
         virtual void dispatchViewportDataDidChange(const ViewportArguments&) const { }
index f6ba6c9..77a7dbc 100644 (file)
 #include "LocalFileSystem.h"
 #endif
 
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-#include "RequestAnimationFrameCallback.h"
-#endif
-
 using std::min;
 using std::max;
 
@@ -1464,21 +1460,6 @@ void DOMWindow::clearInterval(int timeoutId)
     DOMTimer::removeById(context, timeoutId);
 }
 
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-int DOMWindow::webkitRequestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback> callback, Element* e)
-{
-    if (Document* d = document())
-        return d->webkitRequestAnimationFrame(callback, e);
-    return 0;
-}
-
-void DOMWindow::webkitCancelRequestAnimationFrame(int id)
-{
-    if (Document* d = document())
-        d->webkitCancelRequestAnimationFrame(id);
-}
-#endif
-
 bool DOMWindow::addEventListener(const AtomicString& eventType, PassRefPtr<EventListener> listener, bool useCapture)
 {
     if (!EventTarget::addEventListener(eventType, listener, useCapture))
index a1e4462..81931b5 100644 (file)
@@ -64,10 +64,6 @@ namespace WebCore {
     class StyleMedia;
     class WebKitPoint;
 
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-    class RequestAnimationFrameCallback;
-#endif
-
     struct WindowFeatures;
 
     typedef int ExceptionCode;
@@ -241,12 +237,6 @@ namespace WebCore {
         int setInterval(PassOwnPtr<ScheduledAction>, int timeout, ExceptionCode&);
         void clearInterval(int timeoutId);
 
-        // WebKit animation extensions
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-        int webkitRequestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback>, Element*);
-        void webkitCancelRequestAnimationFrame(int id);
-#endif
-
         // Events
         // EventTarget API
         virtual bool addEventListener(const AtomicString& eventType, PassRefPtr<EventListener>, bool useCapture);
index fb56a88..9b71cce 100644 (file)
@@ -235,12 +235,6 @@ module window {
         // [Custom] long setInterval(in DOMString code, in long timeout);
         void clearInterval(in long handle);
 
-#if defined(ENABLE_REQUEST_ANIMATION_FRAME)
-        // WebKit animation extensions
-        long webkitRequestAnimationFrame(in [Callback] RequestAnimationFrameCallback callback, in Element element);
-        void webkitCancelRequestAnimationFrame(in long id);
-#endif
-
         // Base64
         DOMString atob(in [ConvertNullToNullString] DOMString string)
             raises(DOMException);
index 6ed0daf..bcc8b9f 100644 (file)
@@ -342,14 +342,6 @@ void FrameView::setFrameRect(const IntRect& newRect)
 #endif
 }
 
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-void FrameView::scheduleAnimation()
-{
-    if (hostWindow())
-        hostWindow()->scheduleAnimation();
-}
-#endif
-
 void FrameView::setMarginWidth(int w)
 {
     // make it update the rendering area when set
@@ -1646,14 +1638,6 @@ void FrameView::unscheduleRelayout()
     m_delayedLayout = false;
 }
 
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-void FrameView::serviceScriptedAnimations()
-{
-    for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNext())
-        frame->document()->serviceScriptedAnimations();
-}
-#endif
-
 bool FrameView::isTransparent() const
 {
     return m_isTransparent;
index efe9769..be106ae 100644 (file)
@@ -62,9 +62,6 @@ public:
     
     virtual void invalidateRect(const IntRect&);
     virtual void setFrameRect(const IntRect&);
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-    void scheduleAnimation();
-#endif
 
     Frame* frame() const { return m_frame.get(); }
     void clearFrame();
@@ -100,10 +97,6 @@ public:
 
     bool needsFullRepaint() const { return m_doFullRepaint; }
 
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-    void serviceScriptedAnimations();
-#endif
-
 #if USE(ACCELERATED_COMPOSITING)
     void updateCompositingLayers();
     bool syncCompositingStateForThisFrame();
index 45c887b..7882d48 100644 (file)
@@ -66,10 +66,6 @@ public:
 
     // Request that the cursor change.
     virtual void setCursor(const Cursor&) = 0;
-
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-    virtual void scheduleAnimation() = 0;
-#endif
 };
 
 } // namespace WebCore
index 066b630..8bdcef3 100644 (file)
@@ -1,5 +1,24 @@
 2011-01-19  James Robinson  <jamesr@chromium.org>
 
+        Unreviewed, rolling out r76194.
+        http://trac.webkit.org/changeset/76194
+        https://bugs.webkit.org/show_bug.cgi?id=51218
+
+        Caused mysterious compile failure on the chromium win
+        build.webkit.org bots
+
+        * features.gypi:
+        * public/WebWidget.h:
+        * public/WebWidgetClient.h:
+        * src/ChromeClientImpl.cpp:
+        * src/ChromeClientImpl.h:
+        * src/WebPopupMenuImpl.cpp:
+        * src/WebPopupMenuImpl.h:
+        * src/WebViewImpl.cpp:
+        * src/WebViewImpl.h:
+
+2011-01-19  James Robinson  <jamesr@chromium.org>
+
         Reviewed by Darin Fisher.
 
         Implement mozilla's requestAnimationFrame API
index 7f4cda6..372cc5c 100644 (file)
@@ -69,7 +69,6 @@
         'ENABLE_OPENTYPE_SANITIZER=1',
         'ENABLE_ORIENTATION_EVENTS=0',
         'ENABLE_PROGRESS_TAG=1',
-        'ENABLE_REQUEST_ANIMATION_FRAME=1',
         'ENABLE_SHARED_WORKERS=1',
         'ENABLE_SVG=1',
         'ENABLE_SVG_ANIMATION=1',
index 36fbf31..ccad134 100644 (file)
@@ -56,10 +56,6 @@ public:
     // Called to resize the WebWidget.
     virtual void resize(const WebSize&) = 0;
 
-    // Called to update imperative animation state.  This should be called before
-    // paint, although the client can rate-limit these calls.
-    virtual void animate() = 0;
-
     // Called to layout the WebWidget.  This MUST be called before Paint,
     // and it may result in calls to WebWidgetClient::didInvalidateRect.
     virtual void layout() = 0;
index 85e4015..373426d 100644 (file)
@@ -56,9 +56,6 @@ public:
     // Called when a call to WebWidget::composite is required
     virtual void scheduleComposite() { }
 
-    // Called when a call to WebWidget::animate is required
-    virtual void scheduleAnimation() { }
-
     // Called when the widget acquires or loses focus, respectively.
     virtual void didFocus() { }
     virtual void didBlur() { }
index 99b98f0..826c3b8 100644 (file)
@@ -532,13 +532,6 @@ void ChromeClientImpl::invalidateContentsForSlowScroll(const IntRect& updateRect
     invalidateContentsAndWindow(updateRect, immediate);
 }
 
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-void ChromeClientImpl::scheduleAnimation()
-{
-    m_webView->client()->scheduleAnimation();
-}
-#endif
-
 void ChromeClientImpl::scroll(
     const IntSize& scrollDelta, const IntRect& scrollRect,
     const IntRect& clipRect)
index 07f7d1f..a093f09 100644 (file)
@@ -105,9 +105,6 @@ public:
     virtual void invalidateWindow(const WebCore::IntRect&, bool);
     virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool);
     virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool);
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-    virtual void scheduleAnimation();
-#endif
     virtual void scroll(
         const WebCore::IntSize& scrollDelta, const WebCore::IntRect& rectToScroll,
         const WebCore::IntRect& clipRect);
index a209e6a..63ebed8 100644 (file)
@@ -151,10 +151,6 @@ void WebPopupMenuImpl::resize(const WebSize& newSize)
     }
 }
 
-void WebPopupMenuImpl::animate()
-{
-}
-
 void WebPopupMenuImpl::layout()
 {
 }
@@ -303,10 +299,6 @@ void WebPopupMenuImpl::invalidateContentsForSlowScroll(const IntRect& updateRect
     invalidateContentsAndWindow(updateRect, immediate);
 }
 
-void WebPopupMenuImpl::scheduleAnimation()
-{
-}
-
 void WebPopupMenuImpl::scroll(const IntSize& scrollDelta,
                               const IntRect& scrollRect,
                               const IntRect& clipRect)
index 9bf14d5..b8ef7ba 100644 (file)
@@ -61,7 +61,6 @@ public:
     virtual void close();
     virtual WebSize size() { return m_size; }
     virtual void resize(const WebSize&);
-    virtual void animate();
     virtual void layout();
     virtual void paint(WebCanvas* canvas, const WebRect& rect);
     virtual void themeChanged();
@@ -106,7 +105,6 @@ public:
     virtual void invalidateWindow(const WebCore::IntRect&, bool);
     virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool);
     virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool);
-    virtual void scheduleAnimation();
     virtual void scroll(
         const WebCore::IntSize& scrollDelta, const WebCore::IntRect& scrollRect,
         const WebCore::IntRect& clipRect);
index e1756d2..41a0804 100644 (file)
@@ -972,18 +972,6 @@ void WebViewImpl::resize(const WebSize& newSize)
 #endif
 }
 
-void WebViewImpl::animate()
-{
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-    WebFrameImpl* webframe = mainFrameImpl();
-    if (webframe) {
-        FrameView* view = webframe->frameView();
-        if (view)
-            view->serviceScriptedAnimations();
-    }
-#endif
-}
-
 void WebViewImpl::layout()
 {
     WebFrameImpl* webframe = mainFrameImpl();
index d164a48..bc79ec1 100644 (file)
@@ -91,7 +91,6 @@ public:
     virtual void close();
     virtual WebSize size() { return m_size; }
     virtual void resize(const WebSize&);
-    virtual void animate();
     virtual void layout();
     virtual void paint(WebCanvas*, const WebRect&);
     virtual void themeChanged();
index 29303d2..67fb18a 100644 (file)
@@ -1,3 +1,16 @@
+2011-01-19  James Robinson  <jamesr@chromium.org>
+
+        Unreviewed, rolling out r76194.
+        http://trac.webkit.org/changeset/76194
+        https://bugs.webkit.org/show_bug.cgi?id=51218
+
+        Caused mysterious compile failure on the chromium win
+        build.webkit.org bots
+
+        * DumpRenderTree/chromium/WebViewHost.cpp:
+        (WebViewHost::paintInvalidatedRegion):
+        * DumpRenderTree/chromium/WebViewHost.h:
+
 2011-01-19  Dirk Pranke  <dpranke@chromium.org>
 
         Reviewed by Mihai Parparita.
index 18b107f..62df390 100644 (file)
@@ -624,19 +624,6 @@ void WebViewHost::scheduleComposite()
     didInvalidateRect(clientRect);
 }
 
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-static void invokeScheduleComposite(void* context)
-{
-    WebViewHost* wvh = static_cast<WebViewHost*>(context);
-    wvh->scheduleComposite();
-}
-
-void WebViewHost::scheduleAnimation()
-{
-    webkit_support::PostDelayedTask(invokeScheduleComposite, this, 0);
-}
-#endif
-
 void WebViewHost::didFocus()
 {
     m_shell->setFocus(webWidget(), true);
@@ -1451,9 +1438,6 @@ void WebViewHost::paintRect(const WebRect& rect)
 
 void WebViewHost::paintInvalidatedRegion()
 {
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-    webWidget()->animate();
-#endif
     webWidget()->layout();
     WebSize widgetSize = webWidget()->size();
     WebRect clientRect(0, 0, widgetSize.width, widgetSize.height);
index 83d21dc..0a36aec 100644 (file)
@@ -147,9 +147,6 @@ class WebViewHost : public WebKit::WebViewClient, public WebKit::WebFrameClient,
     virtual void didInvalidateRect(const WebKit::WebRect&);
     virtual void didScrollRect(int dx, int dy, const WebKit::WebRect&);
     virtual void scheduleComposite();
-#if ENABLE(REQUEST_ANIMATION_FRAME)
-    virtual void scheduleAnimation();
-#endif
     virtual void didFocus();
     virtual void didBlur();
     virtual void didChangeCursor(const WebKit::WebCursorInfo&);