Show
Ignore:
Timestamp:
08/06/08 13:29:36 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35588

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/WebCore/page/AnimationController.h

    r243 r431  
    3030#define AnimationController_h 
    3131 
     32#include "CSSPropertyNames.h" 
     33 
    3234namespace WebCore { 
    3335 
    3436class AnimationControllerPrivate; 
     37class Document; 
    3538class Frame; 
    3639class RenderObject; 
    …… 
    4346    ~AnimationController(); 
    4447     
    45     void cancelImplicitAnimations(RenderObject*); 
    46     RenderStyle* updateImplicitAnimations(RenderObject*, RenderStyle* newStyle); 
     48    void cancelAnimations(RenderObject*); 
     49    RenderStyle* updateAnimations(RenderObject*, RenderStyle* newStyle); 
    4750     
    48     void suspendAnimations(); 
    49     void resumeAnimations(); 
     51    bool isAnimatingPropertyOnRenderer(RenderObject* obj, int property) const; 
     52     
     53    void suspendAnimations(Document* document); 
     54    void resumeAnimations(Document* document); 
     55    void updateAnimationTimer(); 
     56     
     57    void startUpdateRenderingDispatcher(); 
     58     
     59    void styleAvailable(); 
    5060     
    5161private: 
    5262    AnimationControllerPrivate* m_data; 
     63     
    5364}; 
    5465