Bug 49073 – Move resumeAnimations/suspendAnimations from Frame to AnimationController.

• Status: RESOLVED
• Resolution: FIXED
• Component: Layout and Rendering

[Chris Marrin]

Darin doesn't want to increase the API of Frame, so these should be moved to AnimationController.

[Chris Marrin]

Created attachment 73088 [details]
Patch

[Darin Adler]

Comment on attachment 73088 [details]
Patch

I think it would be cleaner to rename the existing function resumeAnimationsForThisFrameOnly or something like that, and have a new function with the loop in it, instead of using a magic value of 0 to mean "loop through subframes".

[Simon Fraser (smfr)]

Comment on attachment 73088 [details]
Patch

Right, Chris is going to add new methods to AnimationController.

[Chris Marrin]

Created attachment 73103 [details]
Patch

[Simon Fraser (smfr)]

Comment on attachment 73103 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=73103&action=review

> WebCore/page/animation/AnimationController.cpp:241
>      setBeginAnimationUpdateTime(cBeginAnimationUpdateTimeNotSet);
>      
>      RenderObjectAnimationMap::const_iterator animationsEnd = m_compositeAnimations.end();
>      for (RenderObjectAnimationMap::const_iterator it = m_compositeAnimations.begin(); it != animationsEnd; ++it) {
>          RenderObject* renderer = it->first;
> +        if (renderer->document() == m_frame->document()) {
> +            CompositeAnimation* compAnim = it->second.get();
> +            compAnim->suspendAnimations();
> +        }
> +    }

Too much copied code here. This should just do
suspendAnimationsForDocument(m_frame->document());

> WebCore/page/animation/AnimationController.cpp:261
> +    setBeginAnimationUpdateTime(cBeginAnimationUpdateTimeNotSet);
> +    
> +    RenderObjectAnimationMap::const_iterator animationsEnd = m_compositeAnimations.end();
> +    for (RenderObjectAnimationMap::const_iterator it = m_compositeAnimations.begin(); it != animationsEnd; ++it) {
> +        RenderObject* renderer = it->first;
> +        if (renderer->document() == m_frame->document()) {
> +            CompositeAnimation* compAnim = it->second.get();
> +            compAnim->resumeAnimations();
> +        }
> +    }

Same, just call resumeAnimationsForDocument(m_frame->document());

> WebCore/page/animation/AnimationController.cpp:311
> +    /*
> +    bool traverseSubframes = false;
> +    if (!document) {
> +        document = m_frame->document();
> +        traverseSubframes = true;
> +    }
> +    */
> +

Remove!

[Chris Marrin]

Created attachment 73110 [details]
Patch

[Simon Fraser (smfr)]

Comment on attachment 73110 [details]
Patch

So much nicer!

[Chris Marrin]

Committed r71451: <http://trac.webkit.org/changeset/71451>