Changeset 75276 in webkit


Ignore:
Timestamp:
Jan 7, 2011 2:32:26 PM (13 years ago)
Author:
jamesr@google.com
Message:

2011-01-07 James Robinson <​jamesr@chromium.org>

Revert "Implement mozilla's animationTime property"
​https://bugs.webkit.org/show_bug.cgi?id=51952

This approach isn't quite right.

  • animations/animation-time-expected.txt: Removed.
  • animations/animation-time.html: Removed.
  • animations/script-tests/animation-time.js: Removed.
  • fast/dom/Window/window-properties-expected.txt:
  • fast/dom/Window/window-property-descriptors-expected.txt:
  • platform/gtk/fast/dom/Window/window-properties-expected.txt:
  • platform/gtk/fast/dom/Window/window-property-descriptors-expected.txt:
  • platform/qt/fast/dom/Window/window-properties-expected.txt:
  • platform/qt/fast/dom/Window/window-property-descriptors-expected.txt:
  • platform/win/fast/dom/Window/window-property-descriptors-expected.txt:

2011-01-07 James Robinson <​jamesr@chromium.org>

Revert "Implement mozilla's animationTime property"
​https://bugs.webkit.org/show_bug.cgi?id=51952

This approach isn't quite right.

  • DumpRenderTree/chromium/WebViewHost.cpp: (WebViewHost::paintInvalidatedRegion):

2011-01-07 James Robinson <​jamesr@chromium.org>

Revert "Implement mozilla's animationTime property"
​https://bugs.webkit.org/show_bug.cgi?id=51952

This approach isn't quite right.

  • Android.mk:
  • CMakeLists.txt:
  • GNUmakefile.am:
  • WebCore.exp.in:
  • WebCore.gypi:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • page/DOMWindow.cpp:
  • page/DOMWindow.h:
  • page/DOMWindow.idl:
  • page/Frame.cpp:
  • page/Frame.h:
  • page/Page.cpp: (WebCore::Page::Page):
  • page/Page.h:
  • page/animation/AnimationController.cpp: (WebCore::AnimationControllerPrivate::beginAnimationUpdateTime):
  • page/animation/AnimationTimeController.cpp: Removed.
  • page/animation/AnimationTimeController.h: Removed.

2011-01-07 James Robinson <​jamesr@chromium.org>

Revert "Implement mozilla's animationTime property"
​https://bugs.webkit.org/show_bug.cgi?id=51952

This approach isn't quite right.

  • public/WebWidget.h:
  • src/WebPopupMenuImpl.cpp:
  • src/WebPopupMenuImpl.h:
  • src/WebViewImpl.cpp:
  • src/WebViewImpl.h:

2011-01-07 James Robinson <​jamesr@chromium.org>

Revert "Implement mozilla's animationTime property"
​https://bugs.webkit.org/show_bug.cgi?id=51952

This approach isn't quite right.

  • WebView/WebHTMLView.mm: (-[WebHTMLView drawRect:]):
  • WebView/WebView.mm: (layerSyncRunLoopObserverCallBack):

2011-01-07 James Robinson <​jamesr@chromium.org>

Revert "Implement mozilla's animationTime property"
​https://bugs.webkit.org/show_bug.cgi?id=51952

This approach isn't quite right.

  • WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp: (WebKit::ChunkedUpdateDrawingArea::display): (WebKit::ChunkedUpdateDrawingArea::setSize):
  • WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::drawRect):
  • WebProcess/WebPage/mac/LayerBackedDrawingAreaMac.mm: (WebKit::LayerBackedDrawingArea::syncCompositingLayers):
Location:
trunk
Files:
5 deleted
40 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r75274 r75276  
     12011-01-07  James Robinson  <jamesr@chromium.org>
     2
     3        Revert "Implement mozilla's animationTime property"
     4        https://bugs.webkit.org/show_bug.cgi?id=51952
     5
     6        This approach isn't quite right.
     7
     8        * animations/animation-time-expected.txt: Removed.
     9        * animations/animation-time.html: Removed.
     10        * animations/script-tests/animation-time.js: Removed.
     11        * fast/dom/Window/window-properties-expected.txt:
     12        * fast/dom/Window/window-property-descriptors-expected.txt:
     13        * platform/gtk/fast/dom/Window/window-properties-expected.txt:
     14        * platform/gtk/fast/dom/Window/window-property-descriptors-expected.txt:
     15        * platform/qt/fast/dom/Window/window-properties-expected.txt:
     16        * platform/qt/fast/dom/Window/window-property-descriptors-expected.txt:
     17        * platform/win/fast/dom/Window/window-property-descriptors-expected.txt:
     18
    1192011-01-07  Stephen White  <senorblanco@chromium.org>
    220

  • trunk/LayoutTests/fast/dom/Window/window-properties-expected.txt

    r75176 r75276  
    24212421window.undefined [undefined]
    24222422window.unescape [function]
    2423 window.webkitAnimationTime [number]
    24242423window.webkitConvertPointFromNodeToPage [function]
    24252424window.webkitConvertPointFromPageToNode [function]

  • trunk/LayoutTests/fast/dom/Window/window-property-descriptors-expected.txt

    r75176 r75276  
    484484PASS typeof Object.getOwnPropertyDescriptor(window, 'undefined') is 'object'
    485485PASS typeof Object.getOwnPropertyDescriptor(window, 'unescape') is 'object'
    486 PASS typeof Object.getOwnPropertyDescriptor(window, 'webkitAnimationTime') is 'object'
    487486PASS typeof Object.getOwnPropertyDescriptor(window, 'window') is 'object'
    488487PASS typeof Object.getOwnPropertyDescriptor(window, 'windowPropertyNames') is 'object'

  • trunk/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt

    r75176 r75276  
    23752375window.undefined [undefined]
    23762376window.unescape [function]
    2377 window.webkitAnimationTime [number]
    23782377window.webkitConvertPointFromNodeToPage [function]
    23792378window.webkitConvertPointFromPageToNode [function]

  • trunk/LayoutTests/platform/gtk/fast/dom/Window/window-property-descriptors-expected.txt

    r75176 r75276  
    482482PASS typeof Object.getOwnPropertyDescriptor(window, 'undefined') is 'object'
    483483PASS typeof Object.getOwnPropertyDescriptor(window, 'unescape') is 'object'
    484 PASS typeof Object.getOwnPropertyDescriptor(window, 'webkitAnimationTime') is 'object'
    485484PASS typeof Object.getOwnPropertyDescriptor(window, 'window') is 'object'
    486485PASS typeof Object.getOwnPropertyDescriptor(window, 'windowPropertyNames') is 'object'

  • trunk/LayoutTests/platform/qt/fast/dom/Window/window-properties-expected.txt

    r75176 r75276  
    23932393window.undefined [undefined]
    23942394window.unescape [function]
    2395 window.webkitAnimationTime [number]
    23962395window.webkitConvertPointFromNodeToPage [function]
    23972396window.webkitConvertPointFromPageToNode [function]

  • trunk/LayoutTests/platform/qt/fast/dom/Window/window-property-descriptors-expected.txt

    r75200 r75276  
    479479PASS typeof Object.getOwnPropertyDescriptor(window, 'undefined') is 'object'
    480480PASS typeof Object.getOwnPropertyDescriptor(window, 'unescape') is 'object'
    481 PASS typeof Object.getOwnPropertyDescriptor(window, 'webkitAnimationTime') is 'object'
    482481PASS typeof Object.getOwnPropertyDescriptor(window, 'webkitNotifications') is 'object'
    483482PASS typeof Object.getOwnPropertyDescriptor(window, 'window') is 'object'

  • trunk/LayoutTests/platform/win/fast/dom/Window/window-property-descriptors-expected.txt

    r75258 r75276  
    482482PASS typeof Object.getOwnPropertyDescriptor(window, 'undefined') is 'object'
    483483PASS typeof Object.getOwnPropertyDescriptor(window, 'unescape') is 'object'
    484 PASS typeof Object.getOwnPropertyDescriptor(window, 'webkitAnimationTime') is 'object'
    485484PASS typeof Object.getOwnPropertyDescriptor(window, 'window') is 'object'
    486485PASS typeof Object.getOwnPropertyDescriptor(window, 'windowPropertyNames') is 'object'

  • trunk/Tools/ChangeLog

    r75244 r75276  
     12011-01-07  James Robinson  <jamesr@chromium.org>
     2
     3        Revert "Implement mozilla's animationTime property"
     4        https://bugs.webkit.org/show_bug.cgi?id=51952
     5
     6        This approach isn't quite right.
     7
     8        * DumpRenderTree/chromium/WebViewHost.cpp:
     9        (WebViewHost::paintInvalidatedRegion):
     10
    1112011-01-07  Adam Roben  <aroben@apple.com>
    212

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

    r75169 r75276  
    14831483    }
    14841484    ASSERT(m_paintRect.isEmpty());
    1485     webWidget()->clearCurrentAnimationTime();
    14861485}
    14871486

  • trunk/WebCore/Android.mk

    r75169 r75276  
    447447        page/animation/AnimationBase.cpp \
    448448        page/animation/AnimationController.cpp \
    449         page/animation/AnimationTimeController.cpp \
    450449        page/animation/CompositeAnimation.cpp \
    451450        page/animation/ImplicitAnimation.cpp \

  • trunk/WebCore/CMakeLists.txt

    r75271 r75276  
    12801280    page/animation/AnimationBase.cpp
    12811281    page/animation/AnimationController.cpp
    1282     page/animation/AnimationTimeController.cpp
    12831282    page/animation/CompositeAnimation.cpp
    12841283    page/animation/ImplicitAnimation.cpp

  • trunk/WebCore/ChangeLog

    r75273 r75276  
     12011-01-07  James Robinson  <jamesr@chromium.org>
     2
     3        Revert "Implement mozilla's animationTime property"
     4        https://bugs.webkit.org/show_bug.cgi?id=51952
     5
     6        This approach isn't quite right.
     7
     8        * Android.mk:
     9        * CMakeLists.txt:
     10        * GNUmakefile.am:
     11        * WebCore.exp.in:
     12        * WebCore.gypi:
     13        * WebCore.pro:
     14        * WebCore.vcproj/WebCore.vcproj:
     15        * WebCore.xcodeproj/project.pbxproj:
     16        * page/DOMWindow.cpp:
     17        * page/DOMWindow.h:
     18        * page/DOMWindow.idl:
     19        * page/Frame.cpp:
     20        * page/Frame.h:
     21        * page/Page.cpp:
     22        (WebCore::Page::Page):
     23        * page/Page.h:
     24        * page/animation/AnimationController.cpp:
     25        (WebCore::AnimationControllerPrivate::beginAnimationUpdateTime):
     26        * page/animation/AnimationTimeController.cpp: Removed.
     27        * page/animation/AnimationTimeController.h: Removed.
     28
    1292011-01-07  Jan Erik Hanssen  <jhanssen@sencha.com>
    230

  • trunk/WebCore/GNUmakefile.am

    r75271 r75276  
    21542154        WebCore/page/animation/AnimationController.h \
    21552155        WebCore/page/animation/AnimationControllerPrivate.h \
    2156         WebCore/page/animation/AnimationTimeController.cpp \
    2157         WebCore/page/animation/AnimationTimeController.h \
    21582156        WebCore/page/animation/CompositeAnimation.cpp \
    21592157        WebCore/page/animation/CompositeAnimation.h \

  • trunk/WebCore/WebCore.exp.in

    r75265 r75276  
    520520__ZN7WebCore22createFragmentFromTextEPNS_5RangeERKN3WTF6StringE
    521521__ZN7WebCore22externalRepresentationEPNS_5FrameEj
    522 __ZN7WebCore23AnimationTimeController25clearCurrentAnimationTimeEv
    523522__ZN7WebCore23AuthenticationChallengeC1ERKNS_15ProtectionSpaceERKNS_10CredentialEjRKNS_16ResourceResponseERKNS_13ResourceErrorE
    524523__ZN7WebCore23ReplaceSelectionCommandC1EPNS_8DocumentEN3WTF10PassRefPtrINS_16DocumentFragmentEEEbbbbbNS_10EditActionE

  • trunk/WebCore/WebCore.gypi

    r75271 r75276  
    22242224            'page/animation/AnimationController.h',
    22252225            'page/animation/AnimationControllerPrivate.h',
    2226             'page/animation/AnimationTimeController.cpp',
    2227             'page/animation/AnimationTimeController.h',
    22282226            'page/animation/CompositeAnimation.cpp',
    22292227            'page/animation/CompositeAnimation.h',

  • trunk/WebCore/WebCore.pro

    r75271 r75276  
    11141114    page/animation/AnimationBase.cpp \
    11151115    page/animation/AnimationController.cpp \
    1116     page/animation/AnimationTimeController.cpp \
    11171116    page/animation/CompositeAnimation.cpp \
    11181117    page/animation/ImplicitAnimation.cpp \

  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r75262 r75276  
    2424324243                        </File>
    2424424244                        <File
    24245                                 RelativePath="..\page\animation\AnimationTimeController.cpp"
    24246                                 >
    24247                         </File>
    24248                         <File
    24249                                 RelativePath="..\page\animation\AnimationTimeController.h"
    24250                                 >
    24251                         </File>
    24252                         <File
    2425324245                                RelativePath="..\page\BarInfo.cpp"
    2425424246                                >

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r75271 r75276  
    911911                3888F6EE128C9889000CA8E0 /* InspectorFileSystemAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3888F6EC128C9889000CA8E0 /* InspectorFileSystemAgent.cpp */; };
    912912                3888F6EF128C9889000CA8E0 /* InspectorFileSystemAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 3888F6ED128C9889000CA8E0 /* InspectorFileSystemAgent.h */; };
    913                 38DF1B3512D5284200F0477E /* AnimationTimeController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38DF1B3312D5284200F0477E /* AnimationTimeController.cpp */; };
    914                 38DF1B3612D5284200F0477E /* AnimationTimeController.h in Headers */ = {isa = PBXBuildFile; fileRef = 38DF1B3412D5284200F0477E /* AnimationTimeController.h */; settings = {ATTRIBUTES = (Private, ); }; };
    915913                3AC648B2129E146500C3EB25 /* EditingBoundary.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AC648B1129E146500C3EB25 /* EditingBoundary.h */; settings = {ATTRIBUTES = (Private, ); }; };
    916914                41002CCD0F66EDEF009E660D /* ScriptFunctionCall.h in Headers */ = {isa = PBXBuildFile; fileRef = 41002CCB0F66EDEF009E660D /* ScriptFunctionCall.h */; };
    … …  
    72367234                3888F6EC128C9889000CA8E0 /* InspectorFileSystemAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFileSystemAgent.cpp; sourceTree = "<group>"; };
    72377235                3888F6ED128C9889000CA8E0 /* InspectorFileSystemAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFileSystemAgent.h; sourceTree = "<group>"; };
    7238                 38DF1B3312D5284200F0477E /* AnimationTimeController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AnimationTimeController.cpp; path = animation/AnimationTimeController.cpp; sourceTree = "<group>"; };
    7239                 38DF1B3412D5284200F0477E /* AnimationTimeController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AnimationTimeController.h; path = animation/AnimationTimeController.h; sourceTree = "<group>"; };
    72407236                3AC648B1129E146500C3EB25 /* EditingBoundary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingBoundary.h; sourceTree = "<group>"; };
    72417237                41002CCB0F66EDEF009E660D /* ScriptFunctionCall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptFunctionCall.h; sourceTree = "<group>"; };
    … …  
    1303913035                                316FE10A0E6E1DA700BF6088 /* AnimationController.h */,
    1304013036                                0F15DA890F3AAEE70000CE47 /* AnimationControllerPrivate.h */,
    13041                                 38DF1B3312D5284200F0477E /* AnimationTimeController.cpp */,
    13042                                 38DF1B3412D5284200F0477E /* AnimationTimeController.h */,
    1304313037                                316FE10B0E6E1DA700BF6088 /* CompositeAnimation.cpp */,
    1304413038                                316FE10C0E6E1DA700BF6088 /* CompositeAnimation.h */,
    … …  
    1933419328                                316FE1140E6E1DA700BF6088 /* AnimationController.h in Headers */,
    1933519329                                0F15DA8A0F3AAEE70000CE47 /* AnimationControllerPrivate.h in Headers */,
    19336                                 38DF1B3612D5284200F0477E /* AnimationTimeController.h in Headers */,
    1933719330                                49E912AD0EFAC906009D0CAF /* AnimationList.h in Headers */,
    1933819331                                93309DD7099E64920056E581 /* AppendNodeCommand.h in Headers */,
    … …  
    2262322616                                316FE1110E6E1DA700BF6088 /* AnimationBase.cpp in Sources */,
    2262422617                                316FE1130E6E1DA700BF6088 /* AnimationController.cpp in Sources */,
    22625                                 38DF1B3512D5284200F0477E /* AnimationTimeController.cpp in Sources */,
    2262622618                                49E912AC0EFAC906009D0CAF /* AnimationList.cpp in Sources */,
    2262722619                                93309DD6099E64920056E581 /* AppendNodeCommand.cpp in Sources */,

  • trunk/WebCore/page/DOMWindow.cpp

    r75200 r75276  
    14651465}
    14661466
    1467 DOMTimeStamp DOMWindow::webkitAnimationTime()
    1468 {
    1469     if (Frame* f = frame())
    1470         return convertSecondsToDOMTimeStamp(f->currentAnimationTime());
    1471     return convertSecondsToDOMTimeStamp(currentTime());
    1472 }
    1473 
    14741467bool DOMWindow::addEventListener(const AtomicString& eventType, PassRefPtr<EventListener> listener, bool useCapture)
    14751468{

  • trunk/WebCore/page/DOMWindow.h

    r75200 r75276  
    2828#define DOMWindow_h
    2929
    30 #include "DOMTimeStamp.h"
    3130#include "KURL.h"
    3231#include "MessagePort.h"
    … …  
    238237        int setInterval(PassOwnPtr<ScheduledAction>, int timeout, ExceptionCode&);
    239238        void clearInterval(int timeoutId);
    240 
    241         // WebKit animation extensions
    242         DOMTimeStamp webkitAnimationTime();
    243239
    244240        // Events

  • trunk/WebCore/page/DOMWindow.idl

    r75200 r75276  
    235235        // [Custom] long setInterval(in DOMString code, in long timeout);
    236236        void clearInterval(in long handle);
    237 
    238         // WebKit animation extensions
    239         readonly attribute DOMTimeStamp webkitAnimationTime;
    240237
    241238        // Base64

  • trunk/WebCore/page/Frame.cpp

    r75217 r75276  
    3030#include "Frame.h"
    3131
    32 #include "AnimationTimeController.h"
    3332#include "ApplyStyleCommand.h"
    3433#include "CSSComputedStyleDeclaration.h"
    … …  
    8584#include "npruntime_impl.h"
    8685#include "visible_units.h"
    87 #include <wtf/CurrentTime.h>
    8886#include <wtf/RefCountedLeakCounter.h>
    8987#include <wtf/StdLibExtras.h>
    … …  
    769767}
    770768
    771 double Frame::currentAnimationTime()
    772 {
    773     if (Page* p = page())
    774         return p->animationTime()->currentAnimationTime();
    775     return currentTime();
    776 }
    777 
    778 
    779769String Frame::documentTypeString() const
    780770{

  • trunk/WebCore/page/Frame.h

    r75217 r75276  
    118118        void transferChildFrameToNewDocument();
    119119
    120         double currentAnimationTime();
    121 
    122120    // ======== All public functions below this point are candidates to move out of Frame into another class. ========
    123121

  • trunk/WebCore/page/Page.cpp

    r75217 r75276  
    2121#include "Page.h"
    2222
    23 #include "AnimationTimeController.h"
    2423#include "BackForwardController.h"
    2524#include "BackForwardList.h"
    … …  
    158157    , m_progress(adoptPtr(new ProgressTracker))
    159158    , m_backForwardController(adoptPtr(new BackForwardController(this, pageClients.backForwardClient)))
    160     , m_animationTimeController(AnimationTimeController::create())
    161159    , m_theme(RenderTheme::themeForPage(this))
    162160    , m_editorClient(pageClients.editorClient)

  • trunk/WebCore/page/Page.h

    r75169 r75276  
    4040namespace WebCore {
    4141
    42     class AnimationTimeController;
    4342    class BackForwardController;
    4443    class BackForwardList;
    … …  
    184183        ProgressTracker* progress() const { return m_progress.get(); }
    185184        BackForwardController* backForward() const { return m_backForwardController.get(); }
    186         AnimationTimeController* animationTime() const { return m_animationTimeController.get(); }
    187185
    188186        enum ViewMode {
    … …  
    330328       
    331329        OwnPtr<BackForwardController> m_backForwardController;
    332         OwnPtr<AnimationTimeController> m_animationTimeController;
    333330        RefPtr<Frame> m_mainFrame;
    334331
    … …  
    384381#endif
    385382
    386         double m_currentAnimationTime;
    387 
    388383        ViewMode m_viewMode;
    389384

  • trunk/WebCore/page/animation/AnimationController.cpp

    r75262 r75276  
    318318    if (m_beginAnimationUpdateTime == cBeginAnimationUpdateTimeNotSet)
    319319        m_beginAnimationUpdateTime = m_frame->currentAnimationTime();
    320 
    321320    return m_beginAnimationUpdateTime;
    322321}

  • trunk/WebKit/chromium/ChangeLog

    r75214 r75276  
     12011-01-07  James Robinson  <jamesr@chromium.org>
     2
     3        Revert "Implement mozilla's animationTime property"
     4        https://bugs.webkit.org/show_bug.cgi?id=51952
     5
     6        This approach isn't quite right.
     7
     8        * public/WebWidget.h:
     9        * src/WebPopupMenuImpl.cpp:
     10        * src/WebPopupMenuImpl.h:
     11        * src/WebViewImpl.cpp:
     12        * src/WebViewImpl.h:
     13
    1142011-01-05  Zhenyao Mo  <zmo@google.com>
    215

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

    r75169 r75276  
    5656    // Called to resize the WebWidget.
    5757    virtual void resize(const WebSize&) = 0;
    58 
    59     // Called to indicate that this widget has been rendered and the widget
    60     // no longer needs to store the animation time.
    61     virtual void clearCurrentAnimationTime() = 0;
    6258
    6359    // Called to layout the WebWidget.  This MUST be called before Paint,

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

    r75169 r75276  
    152152}
    153153
    154 void WebPopupMenuImpl::clearCurrentAnimationTime()
    155 {
    156 }
    157 
    158154void WebPopupMenuImpl::layout()
    159155{

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

    r75169 r75276  
    6262    virtual WebSize size() { return m_size; }
    6363    virtual void resize(const WebSize&);
    64     virtual void clearCurrentAnimationTime();
    6564    virtual void layout();
    6665    virtual void paint(WebCanvas* canvas, const WebRect& rect);

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

    r75169 r75276  
    3232#include "WebViewImpl.h"
    3333
    34 #include "AnimationTimeController.h"
    3534#include "AutoFillPopupMenuClient.h"
    3635#include "AXObjectCache.h"
    … …  
    979978}
    980979
    981 void WebViewImpl::clearCurrentAnimationTime()
    982 {
    983     WebFrameImpl* webframe = mainFrameImpl();
    984     if (webframe)
    985         webframe->frame()->page()->animationTime()->clearCurrentAnimationTime();
    986 }
    987 
    988980void WebViewImpl::layout()
    989981{

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

    r75169 r75276  
    9393    virtual WebSize size() { return m_size; }
    9494    virtual void resize(const WebSize&);
    95     virtual void clearCurrentAnimationTime();
    9695    virtual void layout();
    9796    virtual void paint(WebCanvas*, const WebRect&);

  • trunk/WebKit/mac/ChangeLog

    r75265 r75276  
     12011-01-07  James Robinson  <jamesr@chromium.org>
     2
     3        Revert "Implement mozilla's animationTime property"
     4        https://bugs.webkit.org/show_bug.cgi?id=51952
     5
     6        This approach isn't quite right.
     7
     8        * WebView/WebHTMLView.mm:
     9        (-[WebHTMLView drawRect:]):
     10        * WebView/WebView.mm:
     11        (layerSyncRunLoopObserverCallBack):
     12
    1132011-01-06  Gavin Barraclough  <barraclough@apple.com>
    214

  • trunk/WebKit/mac/WebView/WebHTMLView.mm

    r75169 r75276  
    7676#import <AppKit/NSAccessibility.h>
    7777#import <ApplicationServices/ApplicationServices.h>
    78 #import <WebCore/AnimationTimeController.h>
    7978#import <WebCore/CSSMutableStyleDeclaration.h>
    8079#import <WebCore/CachedImage.h>
    … …  
    35073506#endif
    35083507
    3509     Frame* frame = [webView _mainCoreFrame];
    3510     if (frame && frame->page())
    3511         frame->page()->animationTime()->clearCurrentAnimationTime();
    3512 
    35133508    if (webView)
    35143509        CallUIDelegate(webView, @selector(webView:didDrawFrame:), [self _frame]);

  • trunk/WebKit/mac/WebView/WebView.mm

    r75169 r75276  
    111111#import <WebCore/AbstractDatabase.h>
    112112#import <WebCore/ApplicationCacheStorage.h>
    113 #import <WebCore/AnimationTimeController.h>
    114113#import <WebCore/BackForwardListImpl.h>
    115114#import <WebCore/MemoryCache.h>
    … …  
    59595958        [webView _viewWillDrawInternal];
    59605959    }
    5961 
    5962     Frame* frame = [webView _mainCoreFrame];
    5963     if (frame && frame->page())
    5964         frame->page()->animationTime()->clearCurrentAnimationTime();
    59655960}
    59665961

  • trunk/WebKit2/ChangeLog

    r75272 r75276  
     12011-01-07  James Robinson  <jamesr@chromium.org>
     2
     3        Revert "Implement mozilla's animationTime property"
     4        https://bugs.webkit.org/show_bug.cgi?id=51952
     5
     6        This approach isn't quite right.
     7
     8        * WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp:
     9        (WebKit::ChunkedUpdateDrawingArea::display):
     10        (WebKit::ChunkedUpdateDrawingArea::setSize):
     11        * WebProcess/WebPage/WebPage.cpp:
     12        (WebKit::WebPage::drawRect):
     13        * WebProcess/WebPage/mac/LayerBackedDrawingAreaMac.mm:
     14        (WebKit::LayerBackedDrawingArea::syncCompositingLayers):
     15
    1162011-01-07 Amruth Raj  <amruthraj@motorola.com> and Ravi Phaneendra Kasibhatla  <ravi.kasibhatla@motorola.com>
    217

  • trunk/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp

    r75169 r75276  
    3333#include "WebPage.h"
    3434#include "WebProcess.h"
    35 #include <WebCore/AnimationTimeController.h>
    36 #include <WebCore/Page.h>
    3735
    3836using namespace WebCore;
    … …  
    9391
    9492    WebProcess::shared().connection()->send(DrawingAreaProxyLegacyMessage::Update, m_webPage->pageID(), CoreIPC::In(updateChunk));
    95    
    96     m_webPage->corePage()->animationTime()->clearCurrentAnimationTime();
    9793
    9894    m_isWaitingForUpdate = true;
    … …  
    148144
    149145    WebProcess::shared().connection()->send(DrawingAreaProxyLegacyMessage::DidSetSize, m_webPage->pageID(), CoreIPC::In(updateChunk));
    150     m_webPage->corePage()->animationTime()->clearCurrentAnimationTime();
    151146}
    152147

  • trunk/WebKit2/WebProcess/WebPage/WebPage.cpp

    r75253 r75276  
    6464#include "WebProcessProxyMessages.h"
    6565#include <WebCore/AbstractDatabase.h>
    66 #include <WebCore/AnimationTimeController.h>
    6766#include <WebCore/ArchiveResource.h>
    6867#include <WebCore/Chrome.h>
    … …  
    526525        graphicsContext.restore();
    527526    }
    528    
    529     m_page->animationTime()->clearCurrentAnimationTime();
    530527}
    531528

  • trunk/WebKit2/WebProcess/WebPage/mac/LayerBackedDrawingAreaMac.mm

    r75169 r75276  
    3232#include "WebPage.h"
    3333#include "WebProcess.h"
    34 #include <WebCore/AnimationTimeController.h>
    3534#include <WebCore/Frame.h>
    3635#include <WebCore/FrameView.h>
    … …  
    123122   
    124123    }
    125 
    126     m_webPage->corePage()->animationTime()->clearCurrentAnimationTime();
    127124}
    128125
Note: See TracChangeset for help on using the changeset viewer.