Changeset 157056 in webkit for trunk/Source/WebCore/page/Page.cpp

Timestamp:

Oct 7, 2013, 1:27:16 PM (12 years ago)

Author:

[email protected]

Message:

Animated images are not restarted when page visibility changes
​https://bugs.webkit.org/show_bug.cgi?id=122464
<rdar://problem/14293474>

Reviewed by Simon Fraser.

Always kickstart animated images when the page visibility changes,
which can occur via window occlusion, and which is independent of in-window
state, which we were previously using to advance animation.

No new tests; attempts to make a test have resulted only in a flaky, timing-dependent test.

• page/Frame.cpp:

(WebCore::Frame::resumeActiveDOMObjectsAndAnimations):
Move this call to resumeAnimatingImages() up to Page.

• page/FrameView.cpp:

(WebCore::FrameView::setIsInWindow):
Move this call to resumeAnimatingImages() up to Page.

• WebCore.exp.in
• page/FrameView.h:
• page/Page.h:

Move resumeAnimatingImages() itself up to Page.

• page/Page.cpp:

(WebCore::Page::setIsInWindow):
Resume animated images when we move in-window.

(WebCore::Page::setVisibilityState):
Resume animated images when we become visible.
This is the one we were previously missing.

(WebCore::Page::resumeActiveDOMObjectsAndAnimations):
Resume animated images when we're told to.

(WebCore::Page::resumeAnimatingImages):
Kickstart any animated images in all frames.

File:

• trunk/Source/WebCore/page/Page.cpp (modified) (4 diffs)

trunk/Source/WebCore/page/Page.cpp

@@ -896 +896 @@
             frameView->setIsInWindow(isInWindow);
     }
+
+    if (isInWindow)
+        resumeAnimatingImages();
 }
 
@@ -1219 +1222 @@
 }
 
+void Page::resumeAnimatingImages()
+{
+    // Drawing models which cache painted content while out-of-window (WebKit2's composited drawing areas, etc.)
+    // require that we repaint animated images to kickstart the animation loop.
+
+    for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree().traverseNext())
+        CachedImage::resumeAnimatingImagesForLoader(frame->document()->cachedResourceLoader());
+}
+
 #if ENABLE(PAGE_VISIBILITY_API) || ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
 void Page::setVisibilityState(PageVisibilityState visibilityState, bool isInitialState)
@@ -1251 +1263 @@
         if (m_settings->hiddenPageCSSAnimationSuspensionEnabled())
             mainFrame().animation().resumeAnimations();
+        resumeAnimatingImages();
     }
 }
@@ -1434 +1447 @@
     for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext())
         frame->resumeActiveDOMObjectsAndAnimations();
+
+    resumeAnimatingImages();
 }