Changeset 76198 in webkit


Ignore:
Timestamp:
Jan 19, 2011 7:52:42 PM (13 years ago)
Author:
jamesr@google.com
Message:

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>

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:
Location:
trunk
Files:
12 deleted
33 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r76194 r76198  
     12011-01-19  James Robinson  <jamesr@chromium.org>
     2
     3        Unreviewed, rolling out r76194.
     4        http://trac.webkit.org/changeset/76194
     5        https://bugs.webkit.org/show_bug.cgi?id=51218
     6
     7        Caused mysterious compile failure on the chromium win
     8        build.webkit.org bots
     9
     10        * fast/animation/request-animation-frame-cancel-expected.txt: Removed.
     11        * fast/animation/request-animation-frame-cancel.html: Removed.
     12        * fast/animation/request-animation-frame-cancel2-expected.txt: Removed.
     13        * fast/animation/request-animation-frame-cancel2.html: Removed.
     14        * fast/animation/request-animation-frame-display-expected.txt: Removed.
     15        * fast/animation/request-animation-frame-display.html: Removed.
     16        * fast/animation/request-animation-frame-expected.txt: Removed.
     17        * fast/animation/request-animation-frame-within-callback-expected.txt: Removed.
     18        * fast/animation/request-animation-frame-within-callback.html: Removed.
     19        * fast/animation/request-animation-frame.html: Removed.
     20        * platform/chromium/test_expectations.txt:
     21        * platform/gtk/Skipped:
     22        * platform/mac/Skipped:
     23        * platform/qt/Skipped:
     24        * platform/win/Skipped:
     25
    1262011-01-19  James Robinson  <jamesr@chromium.org>
    227

  • trunk/LayoutTests/platform/chromium/test_expectations.txt

    r76194 r76198  
    30603060BUGWK52061 DEBUG : transitions/transition-timing-function.html = PASS TEXT
    30613061
    3062 // These will fail on the canaries until a chromium-side features_overrides.gypi change lands
    3063 BUG_JAMESR : fast/animation = TEXT
    3064 
    30653062// Failing since creation in http://trac.webkit.org/changeset/75308
    30663063BUG_ABARTH : svg/text/caret-in-svg-text.xhtml = TEXT

  • trunk/LayoutTests/platform/gtk/Skipped

    r76194 r76198  
    55895589http/tests/xmlhttprequest/basic-auth-nopassword.html
    55905590
    5591 # Requires requestAnimationFrame support
    5592 fast/animation/
    5593 
    55945591# https://bugs.webkit.org/show_bug.cgi?id=52297
    55955592editing/input/page-up-down-scrolls.html

  • trunk/LayoutTests/platform/mac/Skipped

    r76194 r76198  
    281281# DRT does not support toggling caret browsing on / off
    282282editing/selection/caret-mode-paragraph-keys-navigation.html
    283 
    284 # Requires requestAnimationFrame support
    285 fast/animation/

  • trunk/LayoutTests/platform/qt/Skipped

    r76194 r76198  
    50885088fast/text/emphasis-avoid-ruby.html
    50895089
    5090 # Requires requestAnimationFrame support
    5091 fast/animation/
    5092 
    50935090# https://bugs.webkit.org/show_bug.cgi?id=42578
    50945091# [Qt] DRT sideeffect revealed by r63657 and r75305

  • trunk/LayoutTests/platform/win/Skipped

    r76194 r76198  
    11161116editing/selection/caret-mode-paragraph-keys-navigation.html
    11171117
    1118 # Requires requestAnimationFrame support
    1119 fast/animation/
    1120 
     1118# DRT does not obey addURLToRedirect
     1119http/tests/loading/cross-origin-XHR-willLoadRequest.html

  • trunk/Source/WebCore/ChangeLog

    r76196 r76198  
     12011-01-19  James Robinson  <jamesr@chromium.org>
     2
     3        Unreviewed, rolling out r76194.
     4        http://trac.webkit.org/changeset/76194
     5        https://bugs.webkit.org/show_bug.cgi?id=51218
     6
     7        Caused mysterious compile failure on the chromium win
     8        build.webkit.org bots
     9
     10        * WebCore.gypi:
     11        * dom/Document.cpp:
     12        (WebCore::Document::Document):
     13        * dom/Document.h:
     14        * dom/RequestAnimationFrameCallback.h: Removed.
     15        * dom/RequestAnimationFrameCallback.idl: Removed.
     16        * loader/EmptyClients.h:
     17        * page/Chrome.cpp:
     18        * page/Chrome.h:
     19        * page/ChromeClient.h:
     20        * page/DOMWindow.cpp:
     21        * page/DOMWindow.h:
     22        * page/DOMWindow.idl:
     23        * page/FrameView.cpp:
     24        * page/FrameView.h:
     25        * platform/HostWindow.h:
     26
    1272011-01-19  Simon Fraser  <simon.fraser@apple.com>
    228

  • trunk/Source/WebCore/WebCore.gypi

    r76194 r76198  
    7676            'dom/Range.idl',
    7777            'dom/RangeException.idl',
    78             'dom/RequestAnimationFrameCallback.idl',
    7978            'dom/Text.idl',
    8079            'dom/TextEvent.idl',
    … …  
    13171316            'dom/RangeBoundaryPoint.h',
    13181317            'dom/RangeException.h',
    1319             'dom/RequestAnimationFrameCallback.h',
    13201318            'dom/RawDataDocumentParser.h',
    13211319            'dom/RegisteredEventListener.cpp',

  • trunk/Source/WebCore/dom/Document.cpp

    r76194 r76198  
    207207#endif
    208208
    209 #if ENABLE(REQUEST_ANIMATION_FRAME)
    210 #include "RequestAnimationFrameCallback.h"
    211 #endif
    212 
    213209using namespace std;
    214210using namespace WTF;
    … …  
    429425    , m_directionSetOnDocumentElement(false)
    430426    , m_writingModeSetOnDocumentElement(false)
    431 #if ENABLE(REQUEST_ANIMATION_FRAME)
    432     , m_nextRequestAnimationFrameCallbackId(0)
    433 #endif
    434427{
    435428    m_document = this;
    … …  
    49504943}
    49514944
    4952 #if ENABLE(REQUEST_ANIMATION_FRAME)
    4953 int Document::webkitRequestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback> callback, Element* e)
    4954 {
    4955     if (!m_requestAnimationFrameCallbacks)
    4956         m_requestAnimationFrameCallbacks = new RequestAnimationFrameCallbackList;
    4957     int id = m_nextRequestAnimationFrameCallbackId++;
    4958     callback->m_firedOrCancelled = false;
    4959     callback->m_id = id;
    4960     callback->m_element = e;
    4961     m_requestAnimationFrameCallbacks->append(callback);
    4962     if (FrameView* v = view())
    4963         v->scheduleAnimation();
    4964     return id;
    4965 }
    4966 
    4967 void Document::webkitCancelRequestAnimationFrame(int id)
    4968 {
    4969     if (!m_requestAnimationFrameCallbacks)
    4970         return;
    4971     for (size_t i = 0; i < m_requestAnimationFrameCallbacks->size(); ++i) {
    4972         if (m_requestAnimationFrameCallbacks->at(i)->m_id == id) {
    4973             m_requestAnimationFrameCallbacks->at(i)->m_firedOrCancelled = true;
    4974             m_requestAnimationFrameCallbacks->remove(i);
    4975             return;
    4976         }
    4977     }
    4978 }
    4979 
    4980 void Document::serviceScriptedAnimations()
    4981 {
    4982     if (!m_requestAnimationFrameCallbacks)
    4983         return;
    4984     // We want to run the callback for all elements in the document that have registered
    4985     // for a callback and that are visible.  Running the callbacks can cause new callbacks
    4986     // to be registered, existing callbacks to be cancelled, and elements to gain or lose
    4987     // visibility so this code has to iterate carefully.
    4988 
    4989     // FIXME: Currently, this code doesn't do any visibility tests beyond checking display:
    4990 
    4991     // First, generate a list of callbacks to consider.  Callbacks registered from this point
    4992     // on are considered only for the "next" frame, not this one.
    4993     RequestAnimationFrameCallbackList callbacks(*m_requestAnimationFrameCallbacks);
    4994 
    4995     // Firing the callback may cause the visibility of other elements to change.  To avoid
    4996     // missing any callbacks, we keep iterating through the list of candiate callbacks and firing
    4997     // them until nothing new becomes visible.
    4998     bool firedCallback;
    4999     do {
    5000         firedCallback = false;
    5001         // A previous iteration may have invalidated style (or layout).  Update styles for each iteration
    5002         // for now since all we check is the existence of a renderer.
    5003         updateStyleIfNeeded();
    5004         for (size_t i = 0; i < callbacks.size(); ++i) {
    5005             RequestAnimationFrameCallback* callback = callbacks[i].get();
    5006             if (!callback->m_firedOrCancelled && (!callback->m_element || callback->m_element->renderer())) {
    5007                 callback->m_firedOrCancelled = true;
    5008                 callback->handleEvent();
    5009                 firedCallback = true;
    5010                 callbacks.remove(i);
    5011                 break;
    5012             }
    5013         }
    5014     } while (firedCallback);
    5015 
    5016     // Remove any callbacks we fired from the list of pending callbacks.
    5017     for (size_t i = 0; i < m_requestAnimationFrameCallbacks->size();) {
    5018         if (m_requestAnimationFrameCallbacks->at(i)->m_firedOrCancelled)
    5019             m_requestAnimationFrameCallbacks->remove(i);
    5020         else
    5021             ++i;
    5022     }
    5023 
    5024     // In most cases we expect this list to be empty, so no need to keep around the vector's inline buffer.
    5025     if (!m_requestAnimationFrameCallbacks->size())
    5026         m_requestAnimationFrameCallbacks.clear();
    5027     else if (FrameView* v = view())
    5028         v->scheduleAnimation();
    5029 }
    5030 #endif
    5031 
    50324945#if ENABLE(TOUCH_EVENTS)
    50334946PassRefPtr<Touch> Document::createTouch(DOMWindow* window, EventTarget* target, int identifier, int pageX, int pageY, int screenX, int screenY, ExceptionCode&) const

  • trunk/Source/WebCore/dom/Document.h

    r76194 r76198  
    147147#endif
    148148
    149 #if ENABLE(REQUEST_ANIMATION_FRAME)
    150 class RequestAnimationFrameCallback;
    151 #endif
    152 
    153149typedef int ExceptionCode;
    154150
    … …  
    10771073    const DocumentTiming* timing() const { return &m_documentTiming; }
    10781074
    1079 #if ENABLE(REQUEST_ANIMATION_FRAME)
    1080     int webkitRequestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback>, Element*);
    1081     void webkitCancelRequestAnimationFrame(int id);
    1082     void serviceScriptedAnimations();
    1083 #endif
    1084 
    10851075    bool mayCauseFlashOfUnstyledContent() const;
    10861076
    … …  
    14021392    DocumentTiming m_documentTiming;
    14031393    RefPtr<MediaQueryMatcher> m_mediaQueryMatcher;
    1404 
    1405 #if ENABLE(REQUEST_ANIMATION_FRAME)
    1406     typedef Vector<RefPtr<RequestAnimationFrameCallback> > RequestAnimationFrameCallbackList;
    1407     OwnPtr<RequestAnimationFrameCallbackList> m_requestAnimationFrameCallbacks;
    1408     int m_nextRequestAnimationFrameCallbackId;
    1409 #endif
    14101394};
    14111395

  • trunk/Source/WebCore/loader/EmptyClients.h

    r76194 r76198  
    158158    virtual void delegatedScrollRequested(const IntSize&) { }
    159159#endif
    160 #if ENABLE(REQUEST_ANIMATION_FRAME)
    161     virtual void scheduleAnimation() { }
    162 #endif
    163160
    164161    virtual IntPoint screenToWindow(const IntPoint& p) const { return p; }

  • trunk/Source/WebCore/page/Chrome.cpp

    r76194 r76198  
    446446}
    447447
    448 #if ENABLE(REQUEST_ANIMATION_FRAME)
    449 void Chrome::scheduleAnimation()
    450 {
    451     m_client->scheduleAnimation();
    452 }
    453 #endif
    454 
    455448#if ENABLE(NOTIFICATIONS)
    456449NotificationPresenter* Chrome::notificationPresenter() const

  • trunk/Source/WebCore/page/Chrome.h

    r76194 r76198  
    7979        virtual void scrollbarsModeDidChange() const;
    8080        virtual void setCursor(const Cursor&);
    81 #if ENABLE(REQUEST_ANIMATION_FRAME)
    82         virtual void scheduleAnimation();
    83 #endif
    8481
    8582        void scrollRectIntoView(const IntRect&) const;

  • trunk/Source/WebCore/page/ChromeClient.h

    r76194 r76198  
    152152        virtual void scrollbarsModeDidChange() const = 0;
    153153        virtual void setCursor(const Cursor&) = 0;
    154 #if ENABLE(REQUEST_ANIMATION_FRAME)
    155         virtual void scheduleAnimation() = 0;
    156 #endif
    157154        // End methods used by HostWindow.
    158155

  • trunk/Source/WebCore/page/DOMWindow.cpp

    r76194 r76198  
    106106#endif
    107107
    108 #if ENABLE(REQUEST_ANIMATION_FRAME)
    109 #include "RequestAnimationFrameCallback.h"
    110 #endif
    111 
    112108using std::min;
    113109using std::max;
    … …  
    14651461}
    14661462
    1467 #if ENABLE(REQUEST_ANIMATION_FRAME)
    1468 int DOMWindow::webkitRequestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback> callback, Element* e)
    1469 {
    1470     if (Document* d = document())
    1471         return d->webkitRequestAnimationFrame(callback, e);
    1472     return 0;
    1473 }
    1474 
    1475 void DOMWindow::webkitCancelRequestAnimationFrame(int id)
    1476 {
    1477     if (Document* d = document())
    1478         d->webkitCancelRequestAnimationFrame(id);
    1479 }
    1480 #endif
    1481 
    14821463bool DOMWindow::addEventListener(const AtomicString& eventType, PassRefPtr<EventListener> listener, bool useCapture)
    14831464{

  • trunk/Source/WebCore/page/DOMWindow.h

    r76194 r76198  
    6565    class WebKitPoint;
    6666
    67 #if ENABLE(REQUEST_ANIMATION_FRAME)
    68     class RequestAnimationFrameCallback;
    69 #endif
    70 
    7167    struct WindowFeatures;
    7268
    … …  
    241237        int setInterval(PassOwnPtr<ScheduledAction>, int timeout, ExceptionCode&);
    242238        void clearInterval(int timeoutId);
    243 
    244         // WebKit animation extensions
    245 #if ENABLE(REQUEST_ANIMATION_FRAME)
    246         int webkitRequestAnimationFrame(PassRefPtr<RequestAnimationFrameCallback>, Element*);
    247         void webkitCancelRequestAnimationFrame(int id);
    248 #endif
    249239
    250240        // Events

  • trunk/Source/WebCore/page/DOMWindow.idl

    r76194 r76198  
    235235        // [Custom] long setInterval(in DOMString code, in long timeout);
    236236        void clearInterval(in long handle);
    237 
    238 #if defined(ENABLE_REQUEST_ANIMATION_FRAME)
    239         // WebKit animation extensions
    240         long webkitRequestAnimationFrame(in [Callback] RequestAnimationFrameCallback callback, in Element element);
    241         void webkitCancelRequestAnimationFrame(in long id);
    242 #endif
    243237
    244238        // Base64

  • trunk/Source/WebCore/page/FrameView.cpp

    r76196 r76198  
    343343}
    344344
    345 #if ENABLE(REQUEST_ANIMATION_FRAME)
    346 void FrameView::scheduleAnimation()
    347 {
    348     if (hostWindow())
    349         hostWindow()->scheduleAnimation();
    350 }
    351 #endif
    352 
    353345void FrameView::setMarginWidth(int w)
    354346{
    … …  
    16471639}
    16481640
    1649 #if ENABLE(REQUEST_ANIMATION_FRAME)
    1650 void FrameView::serviceScriptedAnimations()
    1651 {
    1652     for (Frame* frame = m_frame.get(); frame; frame = frame->tree()->traverseNext())
    1653         frame->document()->serviceScriptedAnimations();
    1654 }
    1655 #endif
    1656 
    16571641bool FrameView::isTransparent() const
    16581642{

  • trunk/Source/WebCore/page/FrameView.h

    r76196 r76198  
    6363    virtual void invalidateRect(const IntRect&);
    6464    virtual void setFrameRect(const IntRect&);
    65 #if ENABLE(REQUEST_ANIMATION_FRAME)
    66     void scheduleAnimation();
    67 #endif
    6865
    6966    Frame* frame() const { return m_frame.get(); }
    … …  
    10097
    10198    bool needsFullRepaint() const { return m_doFullRepaint; }
    102 
    103 #if ENABLE(REQUEST_ANIMATION_FRAME)
    104     void serviceScriptedAnimations();
    105 #endif
    10699
    107100#if USE(ACCELERATED_COMPOSITING)

  • trunk/Source/WebCore/platform/HostWindow.h

    r76194 r76198  
    6767    // Request that the cursor change.
    6868    virtual void setCursor(const Cursor&) = 0;
    69 
    70 #if ENABLE(REQUEST_ANIMATION_FRAME)
    71     virtual void scheduleAnimation() = 0;
    72 #endif
    7369};
    7470

  • trunk/Source/WebKit/chromium/ChangeLog

    r76194 r76198  
     12011-01-19  James Robinson  <jamesr@chromium.org>
     2
     3        Unreviewed, rolling out r76194.
     4        http://trac.webkit.org/changeset/76194
     5        https://bugs.webkit.org/show_bug.cgi?id=51218
     6
     7        Caused mysterious compile failure on the chromium win
     8        build.webkit.org bots
     9
     10        * features.gypi:
     11        * public/WebWidget.h:
     12        * public/WebWidgetClient.h:
     13        * src/ChromeClientImpl.cpp:
     14        * src/ChromeClientImpl.h:
     15        * src/WebPopupMenuImpl.cpp:
     16        * src/WebPopupMenuImpl.h:
     17        * src/WebViewImpl.cpp:
     18        * src/WebViewImpl.h:
     19
    1202011-01-19  James Robinson  <jamesr@chromium.org>
    221

  • trunk/Source/WebKit/chromium/features.gypi

    r76194 r76198  
    7070        'ENABLE_ORIENTATION_EVENTS=0',
    7171        'ENABLE_PROGRESS_TAG=1',
    72         'ENABLE_REQUEST_ANIMATION_FRAME=1',
    7372        'ENABLE_SHARED_WORKERS=1',
    7473        'ENABLE_SVG=1',

  • trunk/Source/WebKit/chromium/public/WebWidget.h

    r76194 r76198  
    5656    // Called to resize the WebWidget.
    5757    virtual void resize(const WebSize&) = 0;
    58 
    59     // Called to update imperative animation state.  This should be called before
    60     // paint, although the client can rate-limit these calls.
    61     virtual void animate() = 0;
    6258
    6359    // Called to layout the WebWidget.  This MUST be called before Paint,

  • trunk/Source/WebKit/chromium/public/WebWidgetClient.h

    r76194 r76198  
    5757    virtual void scheduleComposite() { }
    5858
    59     // Called when a call to WebWidget::animate is required
    60     virtual void scheduleAnimation() { }
    61 
    6259    // Called when the widget acquires or loses focus, respectively.
    6360    virtual void didFocus() { }

  • trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp

    r76194 r76198  
    533533}
    534534
    535 #if ENABLE(REQUEST_ANIMATION_FRAME)
    536 void ChromeClientImpl::scheduleAnimation()
    537 {
    538     m_webView->client()->scheduleAnimation();
    539 }
    540 #endif
    541 
    542535void ChromeClientImpl::scroll(
    543536    const IntSize& scrollDelta, const IntRect& scrollRect,

  • trunk/Source/WebKit/chromium/src/ChromeClientImpl.h

    r76194 r76198  
    106106    virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool);
    107107    virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool);
    108 #if ENABLE(REQUEST_ANIMATION_FRAME)
    109     virtual void scheduleAnimation();
    110 #endif
    111108    virtual void scroll(
    112109        const WebCore::IntSize& scrollDelta, const WebCore::IntRect& rectToScroll,

  • trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp

    r76194 r76198  
    152152}
    153153
    154 void WebPopupMenuImpl::animate()
    155 {
    156 }
    157 
    158154void WebPopupMenuImpl::layout()
    159155{
    … …  
    304300}
    305301
    306 void WebPopupMenuImpl::scheduleAnimation()
    307 {
    308 }
    309 
    310302void WebPopupMenuImpl::scroll(const IntSize& scrollDelta,
    311303                              const IntRect& scrollRect,

  • trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.h

    r76194 r76198  
    6262    virtual WebSize size() { return m_size; }
    6363    virtual void resize(const WebSize&);
    64     virtual void animate();
    6564    virtual void layout();
    6665    virtual void paint(WebCanvas* canvas, const WebRect& rect);
    … …  
    107106    virtual void invalidateContentsAndWindow(const WebCore::IntRect&, bool);
    108107    virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&, bool);
    109     virtual void scheduleAnimation();
    110108    virtual void scroll(
    111109        const WebCore::IntSize& scrollDelta, const WebCore::IntRect& scrollRect,

  • trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

    r76194 r76198  
    973973}
    974974
    975 void WebViewImpl::animate()
    976 {
    977 #if ENABLE(REQUEST_ANIMATION_FRAME)
    978     WebFrameImpl* webframe = mainFrameImpl();
    979     if (webframe) {
    980         FrameView* view = webframe->frameView();
    981         if (view)
    982             view->serviceScriptedAnimations();
    983     }
    984 #endif
    985 }
    986 
    987975void WebViewImpl::layout()
    988976{

  • trunk/Source/WebKit/chromium/src/WebViewImpl.h

    r76194 r76198  
    9292    virtual WebSize size() { return m_size; }
    9393    virtual void resize(const WebSize&);
    94     virtual void animate();
    9594    virtual void layout();
    9695    virtual void paint(WebCanvas*, const WebRect&);

  • trunk/Tools/ChangeLog

    r76195 r76198  
     12011-01-19  James Robinson  <jamesr@chromium.org>
     2
     3        Unreviewed, rolling out r76194.
     4        http://trac.webkit.org/changeset/76194
     5        https://bugs.webkit.org/show_bug.cgi?id=51218
     6
     7        Caused mysterious compile failure on the chromium win
     8        build.webkit.org bots
     9
     10        * DumpRenderTree/chromium/WebViewHost.cpp:
     11        (WebViewHost::paintInvalidatedRegion):
     12        * DumpRenderTree/chromium/WebViewHost.h:
     13
    1142011-01-19  Dirk Pranke  <dpranke@chromium.org>
    215

  • trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

    r76194 r76198  
    625625}
    626626
    627 #if ENABLE(REQUEST_ANIMATION_FRAME)
    628 static void invokeScheduleComposite(void* context)
    629 {
    630     WebViewHost* wvh = static_cast<WebViewHost*>(context);
    631     wvh->scheduleComposite();
    632 }
    633 
    634 void WebViewHost::scheduleAnimation()
    635 {
    636     webkit_support::PostDelayedTask(invokeScheduleComposite, this, 0);
    637 }
    638 #endif
    639 
    640627void WebViewHost::didFocus()
    641628{
    … …  
    14521439void WebViewHost::paintInvalidatedRegion()
    14531440{
    1454 #if ENABLE(REQUEST_ANIMATION_FRAME)
    1455     webWidget()->animate();
    1456 #endif
    14571441    webWidget()->layout();
    14581442    WebSize widgetSize = webWidget()->size();

  • trunk/Tools/DumpRenderTree/chromium/WebViewHost.h

    r76194 r76198  
    148148    virtual void didScrollRect(int dx, int dy, const WebKit::WebRect&);
    149149    virtual void scheduleComposite();
    150 #if ENABLE(REQUEST_ANIMATION_FRAME)
    151     virtual void scheduleAnimation();
    152 #endif
    153150    virtual void didFocus();
    154151    virtual void didBlur();
Note: See TracChangeset for help on using the changeset viewer.