Changeset 172854 in webkit

Timestamp:

Aug 21, 2014, 10:38:50 PM (11 years ago)

Author:

Antti Koivisto

Message:

Animated GIFs scrolled out of view still cause titlebar blur to update, on tumblr.com page
​https://bugs.webkit.org/show_bug.cgi?id=136139

Reviewed by Simon Fraser.

Source/WebCore:

The mechanism for pausing GIF images outside the viewport did not work for subframes.

Test: fast/repaint/no-animation-outside-viewport-subframe.html

• WebCore.exp.in:
• page/FrameView.cpp:

(WebCore::FrameView::scrollPositionChanged):
(WebCore::FrameView::resumeVisibleImageAnimationsIncludingSubframes):

Add a function for resuming animations as needed in all subframes.
This is used after scrolling instead of calling the RenderView function directly.

• page/FrameView.h:
• page/Page.cpp:

(WebCore::Page::resumeAnimatingImages):

• rendering/RenderElement.cpp:

(WebCore::RenderElement::newImageAnimationFrameAvailable):

Determine the overall visible rect so that it is correct in subframes too.

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::scrollTo):

• rendering/RenderView.cpp:

(WebCore::RenderView::resumePausedImageAnimationsIfNeeded):

LayoutTests:

• fast/repaint/no-animation-outside-viewport-subframe-expected.txt: Added.
• fast/repaint/no-animation-outside-viewport-subframe.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/repaint/no-animation-outside-viewport-subframe-expected.txt (added)
• LayoutTests/fast/repaint/no-animation-outside-viewport-subframe.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.exp.in (modified) (2 diffs)
• Source/WebCore/page/FrameView.cpp (modified) (1 diff)
• Source/WebCore/page/FrameView.h (modified) (1 diff)
• Source/WebCore/page/Page.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderElement.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderView.cpp (modified) (1 diff)
• Source/WebKit/mac/WebView/WebView.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog ¶

@@ +1 @@
+2014-08-21  Antti Koivisto  <antti@apple.com>
+
+        Animated GIFs scrolled out of view still cause titlebar blur to update, on tumblr.com page
+        https://bugs.webkit.org/show_bug.cgi?id=136139
+
+        Reviewed by Simon Fraser.
+
+        * fast/repaint/no-animation-outside-viewport-subframe-expected.txt: Added.
+        * fast/repaint/no-animation-outside-viewport-subframe.html: Added.
+
 2014-08-21  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2014-08-21  Antti Koivisto  <antti@apple.com>
+
+        Animated GIFs scrolled out of view still cause titlebar blur to update, on tumblr.com page
+        https://bugs.webkit.org/show_bug.cgi?id=136139
+
+        Reviewed by Simon Fraser.
+
+        The mechanism for pausing GIF images outside the viewport did not work for subframes.
+
+        Test: fast/repaint/no-animation-outside-viewport-subframe.html
+
+        * WebCore.exp.in:
+        * page/FrameView.cpp:
+        (WebCore::FrameView::scrollPositionChanged):
+        (WebCore::FrameView::resumeVisibleImageAnimationsIncludingSubframes):
+
+            Add a function for resuming animations as needed in all subframes.
+            This is used after scrolling instead of calling the RenderView function directly.
+
+        * page/FrameView.h:
+        * page/Page.cpp:
+        (WebCore::Page::resumeAnimatingImages):
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::newImageAnimationFrameAvailable):
+
+            Determine the overall visible rect so that it is correct in subframes too.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::scrollTo):
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::resumePausedImageAnimationsIfNeeded):
+
 2014-08-21  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/WebCore.exp.in ¶

@@ -2528 +2528 @@
 _WebUIApplicationWillEnterForegroundNotification
 _WebUIApplicationWillResignActiveNotification
-__ZN7WebCore10RenderView35resumePausedImageAnimationsIfNeededEv
 __ZN7WebCore10ScrollView15setScrollOffsetERKNS_8IntPointE
 __ZN7WebCore10ScrollView21setExposedContentRectERKNS_9FloatRectE
@@ -2753 +2752 @@
 __ZN7WebCore9FrameView33rectForViewportConstrainedObjectsERKNS_10LayoutRectERKNS_10LayoutSizeEfbNS_30ScrollBehaviorForFixedElementsE
 __ZN7WebCore9FrameView36scheduleLayerFlushAllowingThrottlingEv
+__ZN7WebCore9FrameView46resumeVisibleImageAnimationsIncludingSubframesEv
 __ZN7WebCore9PageGroup17removeVisitedLinkERKNS_3URLE
 __ZNK7WebCore10FloatPointcv7CGPointEv

trunk/Source/WebCore/page/FrameView.cpp ¶

@@ -2085 +2085 @@
 
     if (RenderView* renderView = this->renderView()) {
-        renderView->resumePausedImageAnimationsIfNeeded();
         if (renderView->usesCompositing())
             renderView->compositor().frameViewDidScroll();
+    }
+
+    resumeVisibleImageAnimationsIncludingSubframes();
+}
+
+void FrameView::resumeVisibleImageAnimationsIncludingSubframes()
+{
+    // A change in scroll position may affect image visibility in subframes.
+    for (auto* frame = m_frame.get(); frame; frame = frame->tree().traverseNext(m_frame.get())) {
+        if (auto* renderView = frame->contentRenderer())
+            renderView->resumePausedImageAnimationsIfNeeded();
     }
 }

trunk/Source/WebCore/page/FrameView.h ¶

@@ -244 +244 @@
     void delayedScrollEventTimerFired(Timer<FrameView>&);
 
+    void resumeVisibleImageAnimationsIncludingSubframes();
+
     // This is different than visibleContentRect() in that it ignores negative (or overly positive)
     // offsets from rubber-banding, and it takes zooming into account. 

trunk/Source/WebCore/page/Page.cpp ¶

@@ -1204 +1204 @@
     // 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()) {
-        if (auto* renderView = frame->contentRenderer())
-            renderView->resumePausedImageAnimationsIfNeeded();
-    }
+    if (FrameView* view = mainFrame().view())
+        view->resumeVisibleImageAnimationsIncludingSubframes();
 }
 

trunk/Source/WebCore/rendering/RenderElement.cpp ¶

@@ -1311 +1311 @@
 void RenderElement::newImageAnimationFrameAvailable(CachedImage& image)
 {
-    auto visibleRect = view().frameView().visibleContentRect();
+    auto& frameView = view().frameView();
+    auto visibleRect = frameView.windowToContents(frameView.windowClipRect());
     if (!shouldRepaintForImageAnimation(*this, visibleRect)) {
         view().addRendererWithPausedImageAnimations(*this);

trunk/Source/WebCore/rendering/RenderLayer.cpp ¶

@@ -2322 +2322 @@
         frame.loader().client().didChangeScrollOffset();
 
-    renderer().view().resumePausedImageAnimationsIfNeeded();
+    view.frameView().resumeVisibleImageAnimationsIncludingSubframes();
 }
 

trunk/Source/WebCore/rendering/RenderView.cpp ¶

@@ -1362 +1362 @@
 void RenderView::resumePausedImageAnimationsIfNeeded()
 {
-    auto visibleRect = frameView().visibleContentRect();
+    auto visibleRect = frameView().windowToContents(frameView().windowClipRect());
     Vector<RenderElement*, 10> toRemove;
     for (auto* renderer : m_renderersWithPausedImageAnimation) {

trunk/Source/WebKit/mac/WebView/WebView.mm ¶

@@ -1574 +1574 @@
     [self setDefersCallbacks:NO];
     [[self mainFrame] setTimeoutsPaused:NO];
-    FrameView* view = [self _mainCoreFrame]->view();
-    if (view && view->renderView())
-        view->renderView()->resumePausedImageAnimationsIfNeeded();
+    if (FrameView* view = [self _mainCoreFrame]->view())
+        view->resumeVisibleImageAnimationsIncludingSubframes();
 }