Changeset 110262 in webkit


Ignore:
Timestamp:
Mar 8, 2012 9:55:07 PM (12 years ago)
Author:
Simon Fraser
Message:

Unreviewed, rolling out r108616.
http://trac.webkit.org/changeset/108616
https://bugs.webkit.org/show_bug.cgi?id=80676

breaks animation on Safari welcome page (Requested by smfr on
#webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-03-08

  • page/animation/AnimationController.cpp:

(WebCore::AnimationController::updateAnimations):

  • page/animation/AnimationControllerPrivate.h:

(AnimationControllerPrivate):

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r110261 r110262  
     12012-03-08  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r108616.
     4        http://trac.webkit.org/changeset/108616
     5        https://bugs.webkit.org/show_bug.cgi?id=80676
     6
     7        breaks animation on Safari welcome page (Requested by smfr on
     8        #webkit).
     9
     10        * page/animation/AnimationController.cpp:
     11        (WebCore::AnimationController::updateAnimations):
     12        * page/animation/AnimationControllerPrivate.h:
     13        (AnimationControllerPrivate):
     14
    1152012-03-08  Benjamin Poulain  <benjamin@webkit.org>
    216
  • trunk/Source/WebCore/page/animation/AnimationController.cpp

    r108616 r110262  
    116116}
    117117
    118 void AnimationControllerPrivate::updateAnimationTimerForRenderer(RenderObject* renderer)
    119 {
    120     double timeToNextService = 0;
    121 
    122     RefPtr<CompositeAnimation> compAnim = m_compositeAnimations.get(renderer);
    123     if (!compAnim->suspended() && compAnim->hasAnimations())
    124         timeToNextService = compAnim->timeToNextService();
    125 
    126     if (m_animationTimer.isActive())
    127         m_animationTimer.stop();
    128     m_animationTimer.startOneShot(timeToNextService);
    129 }
    130 
    131118void AnimationControllerPrivate::updateAnimationTimer(SetChanged callSetChanged/* = DoNotCallSetChanged*/)
    132119{
     
    531518
    532519    if (renderer->parent() || newStyle->animations() || (oldStyle && oldStyle->animations())) {
    533         m_data->updateAnimationTimerForRenderer(renderer);
     520        m_data->updateAnimationTimer();
    534521#if ENABLE(REQUEST_ANIMATION_FRAME)
    535522        if (FrameView* view = renderer->document()->view())
  • trunk/Source/WebCore/page/animation/AnimationControllerPrivate.h

    r108616 r110262  
    109109
    110110    PassRefPtr<WebKitAnimationList> animationsForRenderer(RenderObject*) const;
    111 
    112     void updateAnimationTimerForRenderer(RenderObject*);
    113111   
    114112private:
Note: See TracChangeset for help on using the changeset viewer.