<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[163928] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163928">163928</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-02-11 18:55:22 -0800 (Tue, 11 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>GIF animations should be suspended when outside of viewport
https://bugs.webkit.org/show_bug.cgi?id=128632
Source/WebCore:
Reviewed by Andreas Kling.
Animations are driven by the paint cycle. Speculative tiles keep animations outside the actual viewport going.
Pause animations when they are outside the viewport by not painting them.
Test: fast/repaint/no-animation-outside-viewport.html
* loader/cache/CachedImage.cpp:
(WebCore::CachedImage::animationAdvanced):
Call animation specific newImageAnimationFrameAvailable instead of the generic notifyObservers.
* loader/cache/CachedImage.h:
Removed now unnecessary resumeAnimatingImagesForLoader mechanism.
Remove unnecessary shouldPauseAnimation. Pausing is now always done when by avoiding repaint.
* loader/cache/CachedImageClient.h:
(WebCore::CachedImageClient::newImageAnimationFrameAvailable):
* page/FrameView.cpp:
(WebCore::FrameView::scrollPositionChanged):
Check if we have image animations to resume when scroll position changes.
* page/Page.cpp:
(WebCore::Page::resumeAnimatingImages):
Use the same mechanism when resuming background tabs etc.
* platform/graphics/BitmapImage.cpp:
(WebCore::BitmapImage::internalAdvanceAnimation):
Remove the shouldPauseAnimation test, always rely on pausing on invalidation.
* platform/graphics/ImageObserver.h:
* rendering/RenderBoxModelObject.cpp:
* rendering/RenderElement.cpp:
(WebCore::RenderElement::RenderElement):
(WebCore::RenderElement::~RenderElement):
(WebCore::shouldRepaintForImageAnimation):
Factor the pausing conditions to a function. Test that the animation is withing the
visible rect.
(WebCore::RenderElement::newImageAnimationFrameAvailable):
Add renderer to the paused animation set if we don't continue the animation.
(WebCore::RenderElement::repaintForPausedImageAnimationsIfNeeded):
Resume the paused animations by triggering repaint.
* rendering/RenderElement.h:
(WebCore::RenderElement::setHasPausedImageAnimations):
(WebCore::RenderElement::hasPausedImageAnimations):
* rendering/RenderObject.cpp:
* rendering/RenderObject.h:
* rendering/RenderView.cpp:
(WebCore::RenderView::addRendererWithPausedImageAnimations):
(WebCore::RenderView::removeRendererWithPausedImageAnimations):
(WebCore::RenderView::resumePausedImageAnimationsIfNeeded):
* rendering/RenderView.h:
LayoutTests:
Reviewed by Andreas Kling.
* fast/repaint/no-animation-outside-viewport-expected.txt: Added.
* fast/repaint/no-animation-outside-viewport.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedImagecpp">trunk/Source/WebCore/loader/cache/CachedImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedImageh">trunk/Source/WebCore/loader/cache/CachedImage.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedImageClienth">trunk/Source/WebCore/loader/cache/CachedImageClient.h</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsBitmapImagecpp">trunk/Source/WebCore/platform/graphics/BitmapImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsImageObserverh">trunk/Source/WebCore/platform/graphics/ImageObserver.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastrepaintnoanimationoutsideviewportexpectedtxt">trunk/LayoutTests/fast/repaint/no-animation-outside-viewport-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastrepaintnoanimationoutsideviewporthtml">trunk/LayoutTests/fast/repaint/no-animation-outside-viewport.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163927 => 163928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-12 02:52:19 UTC (rev 163927)
+++ trunk/LayoutTests/ChangeLog 2014-02-12 02:55:22 UTC (rev 163928)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-02-11 Antti Koivisto <antti@apple.com>
+
+ GIF animations should be suspended when outside of viewport
+ https://bugs.webkit.org/show_bug.cgi?id=128632
+
+ Reviewed by Andreas Kling.
+
+ * fast/repaint/no-animation-outside-viewport-expected.txt: Added.
+ * fast/repaint/no-animation-outside-viewport.html: Added.
+
</ins><span class="cx"> 2014-02-11 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add failing test expectations to asynchronous spellchecking tests.
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintnoanimationoutsideviewportexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/repaint/no-animation-outside-viewport-expected.txt (0 => 163928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/no-animation-outside-viewport-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/repaint/no-animation-outside-viewport-expected.txt 2014-02-12 02:55:22 UTC (rev 163928)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Test that animated gif outside viewport does not trigger repaint.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS repaintRects is ""
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastrepaintnoanimationoutsideviewporthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/repaint/no-animation-outside-viewport.html (0 => 163928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/no-animation-outside-viewport.html (rev 0)
+++ trunk/LayoutTests/fast/repaint/no-animation-outside-viewport.html 2014-02-12 02:55:22 UTC (rev 163928)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<html>
+<head>
+<script>jsTestIsAsync = true;</script>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+ description("Test that animated gif outside viewport does not trigger repaint.");
+ function startTrackingRepaints()
+ {
+ document.body.offsetTop;
+ window.internals.startTrackingRepaints();
+ testRunner.display();
+ setTimeout(logRepaints, 200);
+ }
+
+ function logRepaints()
+ {
+ repaintRects = window.internals.repaintRectsAsText();
+ window.internals.stopTrackingRepaints();
+
+ shouldBeEqualToString("repaintRects", "");
+
+ finishJSTest();
+ }
+
+ function start() {
+ if (!window.testRunner || !window.internals)
+ return;
+
+ var img = new Image();
+ img.onload = startTrackingRepaints;
+ img.src = "resources/animated.gif";
+ }
+</script>
+</head>
+<body onload="start()">
+<div style="height:600px"></div>
+<img src="resources/animated.gif">
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163927 => 163928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-12 02:52:19 UTC (rev 163927)
+++ trunk/Source/WebCore/ChangeLog 2014-02-12 02:55:22 UTC (rev 163928)
</span><span class="lines">@@ -1,3 +1,72 @@
</span><ins>+2014-02-11 Antti Koivisto <antti@apple.com>
+
+ GIF animations should be suspended when outside of viewport
+ https://bugs.webkit.org/show_bug.cgi?id=128632
+
+ Reviewed by Andreas Kling.
+
+ Animations are driven by the paint cycle. Speculative tiles keep animations outside the actual viewport going.
+
+ Pause animations when they are outside the viewport by not painting them.
+
+ Test: fast/repaint/no-animation-outside-viewport.html
+
+ * loader/cache/CachedImage.cpp:
+ (WebCore::CachedImage::animationAdvanced):
+
+ Call animation specific newImageAnimationFrameAvailable instead of the generic notifyObservers.
+
+ * loader/cache/CachedImage.h:
+
+ Removed now unnecessary resumeAnimatingImagesForLoader mechanism.
+ Remove unnecessary shouldPauseAnimation. Pausing is now always done when by avoiding repaint.
+
+ * loader/cache/CachedImageClient.h:
+ (WebCore::CachedImageClient::newImageAnimationFrameAvailable):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::scrollPositionChanged):
+
+ Check if we have image animations to resume when scroll position changes.
+
+ * page/Page.cpp:
+ (WebCore::Page::resumeAnimatingImages):
+
+ Use the same mechanism when resuming background tabs etc.
+
+ * platform/graphics/BitmapImage.cpp:
+ (WebCore::BitmapImage::internalAdvanceAnimation):
+
+ Remove the shouldPauseAnimation test, always rely on pausing on invalidation.
+
+ * platform/graphics/ImageObserver.h:
+ * rendering/RenderBoxModelObject.cpp:
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::RenderElement):
+ (WebCore::RenderElement::~RenderElement):
+ (WebCore::shouldRepaintForImageAnimation):
+
+ Factor the pausing conditions to a function. Test that the animation is withing the
+ visible rect.
+
+ (WebCore::RenderElement::newImageAnimationFrameAvailable):
+
+ Add renderer to the paused animation set if we don't continue the animation.
+
+ (WebCore::RenderElement::repaintForPausedImageAnimationsIfNeeded):
+
+ Resume the paused animations by triggering repaint.
+
+ * rendering/RenderElement.h:
+ (WebCore::RenderElement::setHasPausedImageAnimations):
+ (WebCore::RenderElement::hasPausedImageAnimations):
+ * rendering/RenderObject.cpp:
+ * rendering/RenderObject.h:
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::addRendererWithPausedImageAnimations):
+ (WebCore::RenderView::removeRendererWithPausedImageAnimations):
+ (WebCore::RenderView::resumePausedImageAnimationsIfNeeded):
+ * rendering/RenderView.h:
+
</ins><span class="cx"> 2014-02-11 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused RenderNamedFlowThread::previousRendererForNode().
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (163927 => 163928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2014-02-12 02:52:19 UTC (rev 163927)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2014-02-12 02:55:22 UTC (rev 163928)
</span><span class="lines">@@ -499,25 +499,13 @@
</span><span class="cx"> CachedResource::didAccessDecodedData(timeStamp);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CachedImage::shouldPauseAnimation(const Image* image)
-{
- if (!image || image != m_image)
- return false;
-
- CachedResourceClientWalker<CachedImageClient> w(m_clients);
- while (CachedImageClient* c = w.next()) {
- if (c->willRenderImage(this))
- return false;
- }
-
- return true;
-}
-
</del><span class="cx"> void CachedImage::animationAdvanced(const Image* image)
</span><span class="cx"> {
</span><span class="cx"> if (!image || image != m_image)
</span><span class="cx"> return;
</span><del>- notifyObservers();
</del><ins>+ CachedResourceClientWalker<CachedImageClient> clientWalker(m_clients);
+ while (CachedImageClient* client = clientWalker.next())
+ client->newImageAnimationFrameAvailable(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedImage::changedInRect(const Image* image, const IntRect& rect)
</span><span class="lines">@@ -527,27 +515,6 @@
</span><span class="cx"> notifyObservers(&rect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedImage::resumeAnimatingImagesForLoader(CachedResourceLoader* loader)
-{
- const CachedResourceLoader::DocumentResourceMap& resources = loader->allCachedResources();
-
- for (CachedResourceLoader::DocumentResourceMap::const_iterator it = resources.begin(), end = resources.end(); it != end; ++it) {
- const CachedResourceHandle<CachedResource>& resource = it->value;
- if (!resource || !resource->isImage())
- continue;
- CachedImage* cachedImage = toCachedImage(resource.get());
- if (!cachedImage->hasImage())
- continue;
- Image* image = cachedImage->image();
- if (!image->isBitmapImage())
- continue;
- BitmapImage* bitmapImage = toBitmapImage(image);
- if (!bitmapImage->canAnimate())
- continue;
- cachedImage->animationAdvanced(bitmapImage);
- }
-}
-
</del><span class="cx"> bool CachedImage::currentFrameKnownToBeOpaque(const RenderElement* renderer)
</span><span class="cx"> {
</span><span class="cx"> Image* image = imageForRenderer(renderer);
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.h (163927 => 163928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImage.h 2014-02-12 02:52:19 UTC (rev 163927)
+++ trunk/Source/WebCore/loader/cache/CachedImage.h 2014-02-12 02:55:22 UTC (rev 163928)
</span><span class="lines">@@ -84,8 +84,6 @@
</span><span class="cx"> bool isManuallyCached() const { return m_isManuallyCached; }
</span><span class="cx"> virtual bool mustRevalidateDueToCacheHeaders(CachePolicy) const;
</span><span class="cx">
</span><del>- static void resumeAnimatingImagesForLoader(CachedResourceLoader*);
-
</del><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><span class="cx"> virtual bool canUseDiskImageCache() const override;
</span><span class="cx"> virtual void useDiskImageCache() override;
</span><span class="lines">@@ -128,7 +126,6 @@
</span><span class="cx"> virtual void decodedSizeChanged(const Image*, int delta) override;
</span><span class="cx"> virtual void didDraw(const Image*) override;
</span><span class="cx">
</span><del>- virtual bool shouldPauseAnimation(const Image*) override;
</del><span class="cx"> virtual void animationAdvanced(const Image*) override;
</span><span class="cx"> virtual void changedInRect(const Image*, const IntRect&) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImageClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImageClient.h (163927 => 163928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImageClient.h 2014-02-12 02:52:19 UTC (rev 163927)
+++ trunk/Source/WebCore/loader/cache/CachedImageClient.h 2014-02-12 02:55:22 UTC (rev 163928)
</span><span class="lines">@@ -36,15 +36,12 @@
</span><span class="cx"> static CachedResourceClientType expectedType() { return ImageType; }
</span><span class="cx"> virtual CachedResourceClientType resourceClientType() const override { return expectedType(); }
</span><span class="cx">
</span><del>- // Called whenever a frame of an image changes, either because we got more data from the network or
- // because we are animating. If not null, the IntRect is the changed rect of the image.
</del><ins>+ // Called whenever a frame of an image changes because we got more data from the network.
+ // If not null, the IntRect is the changed rect of the image.
</ins><span class="cx"> virtual void imageChanged(CachedImage*, const IntRect* = 0) { }
</span><span class="cx">
</span><del>- // Called to find out if this client wants to actually display the image. Used to tell when we
- // can halt animation. Content nodes that hold image refs for example would not render the image,
- // but RenderImages would (assuming they have visibility: visible and their render tree isn't hidden
- // e.g., in the b/f cache or in a background tab).
- virtual bool willRenderImage(CachedImage*) { return false; }
</del><ins>+ // Called when GIF animation progresses.
+ virtual void newImageAnimationFrameAvailable(CachedImage& image) { imageChanged(&image); }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (163927 => 163928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-02-12 02:52:19 UTC (rev 163927)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-02-12 02:55:22 UTC (rev 163928)
</span><span class="lines">@@ -1947,6 +1947,7 @@
</span><span class="cx"> sendWillRevealEdgeEventsIfNeeded(oldPosition, newPosition);
</span><span class="cx">
</span><span class="cx"> if (RenderView* renderView = this->renderView()) {
</span><ins>+ renderView->resumePausedImageAnimationsIfNeeded();
</ins><span class="cx"> if (renderView->usesCompositing())
</span><span class="cx"> renderView->compositor().frameViewDidScroll();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (163927 => 163928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2014-02-12 02:52:19 UTC (rev 163927)
+++ trunk/Source/WebCore/page/Page.cpp 2014-02-12 02:55:22 UTC (rev 163928)
</span><span class="lines">@@ -1144,8 +1144,10 @@
</span><span class="cx"> // Drawing models which cache painted content while out-of-window (WebKit2's composited drawing areas, etc.)
</span><span class="cx"> // require that we repaint animated images to kickstart the animation loop.
</span><span class="cx">
</span><del>- for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree().traverseNext())
- CachedImage::resumeAnimatingImagesForLoader(frame->document()->cachedResourceLoader());
</del><ins>+ for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree().traverseNext()) {
+ if (auto* renderView = frame->contentRenderer())
+ renderView->resumePausedImageAnimationsIfNeeded();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Page::setViewState(ViewState::Flags viewState)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsBitmapImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.cpp (163927 => 163928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/BitmapImage.cpp 2014-02-12 02:52:19 UTC (rev 163927)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.cpp 2014-02-12 02:55:22 UTC (rev 163928)
</span><span class="lines">@@ -709,13 +709,6 @@
</span><span class="cx"> // Stop the animation.
</span><span class="cx"> stopAnimation();
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
- // See if anyone is still paying attention to this animation. If not, we don't
- // advance and will remain suspended at the current frame until the animation is resumed.
- if (!skippingFrames && imageObserver()->shouldPauseAnimation(this))
- return false;
-#endif
-
</del><span class="cx"> ++m_currentFrame;
</span><span class="cx"> bool advancedAnimation = true;
</span><span class="cx"> bool destroyAll = false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsImageObserverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ImageObserver.h (163927 => 163928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ImageObserver.h 2014-02-12 02:52:19 UTC (rev 163927)
+++ trunk/Source/WebCore/platform/graphics/ImageObserver.h 2014-02-12 02:55:22 UTC (rev 163928)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> virtual void decodedSizeChanged(const Image*, int delta) = 0;
</span><span class="cx"> virtual void didDraw(const Image*) = 0;
</span><span class="cx">
</span><del>- virtual bool shouldPauseAnimation(const Image*) = 0;
</del><span class="cx"> virtual void animationAdvanced(const Image*) = 0;
</span><span class="cx">
</span><span class="cx"> virtual void changedInRect(const Image*, const IntRect&) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (163927 => 163928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-02-12 02:52:19 UTC (rev 163927)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-02-12 02:55:22 UTC (rev 163928)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "RenderBoxModelObject.h"
</span><span class="cx">
</span><span class="cx"> #include "Frame.h"
</span><ins>+#include "FrameView.h"
</ins><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "HTMLFrameOwnerElement.h"
</span><span class="cx"> #include "HTMLNames.h"
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (163927 => 163928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2014-02-12 02:52:19 UTC (rev 163927)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2014-02-12 02:55:22 UTC (rev 163928)
</span><span class="lines">@@ -69,6 +69,7 @@
</span><span class="cx"> , m_ancestorLineBoxDirty(false)
</span><span class="cx"> , m_hasInitializedStyle(false)
</span><span class="cx"> , m_renderInlineAlwaysCreatesLineBoxes(false)
</span><ins>+ , m_hasPausedImageAnimations(false)
</ins><span class="cx"> , m_firstChild(nullptr)
</span><span class="cx"> , m_lastChild(nullptr)
</span><span class="cx"> , m_style(std::move(style))
</span><span class="lines">@@ -81,6 +82,7 @@
</span><span class="cx"> , m_ancestorLineBoxDirty(false)
</span><span class="cx"> , m_hasInitializedStyle(false)
</span><span class="cx"> , m_renderInlineAlwaysCreatesLineBoxes(false)
</span><ins>+ , m_hasPausedImageAnimations(false)
</ins><span class="cx"> , m_firstChild(nullptr)
</span><span class="cx"> , m_lastChild(nullptr)
</span><span class="cx"> , m_style(std::move(style))
</span><span class="lines">@@ -119,6 +121,8 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+ if (m_hasPausedImageAnimations)
+ view().removeRendererWithPausedImageAnimations(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderPtr<RenderElement> RenderElement::createFor(Element& element, PassRef<RenderStyle> style)
</span><span class="lines">@@ -1275,6 +1279,47 @@
</span><span class="cx"> return borderImage && borderImage->canRender(this, style().effectiveZoom()) && borderImage->isLoaded();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool shouldRepaintForImageAnimation(const RenderElement& renderer, const IntRect& visibleRect)
+{
+ const Document& document = renderer.document();
+ if (document.inPageCache())
+ return false;
+ auto& frameView = renderer.view().frameView();
+ if (frameView.isOffscreen())
+ return false;
+#if PLATFORM(IOS)
+ if (frameView.timersPaused())
+ return false;
+#endif
+ if (document.activeDOMObjectsAreSuspended())
+ return false;
+ if (renderer.style().visibility() != VISIBLE)
+ return false;
+ if (!visibleRect.intersects(renderer.absoluteBoundingBoxRect()))
+ return false;
+
+ return true;
+}
+
+void RenderElement::newImageAnimationFrameAvailable(CachedImage& image)
+{
+ auto visibleRect = view().frameView().visibleContentRect();
+ if (!shouldRepaintForImageAnimation(*this, visibleRect)) {
+ view().addRendererWithPausedImageAnimations(*this);
+ return;
+ }
+ imageChanged(&image);
+}
+
+bool RenderElement::repaintForPausedImageAnimationsIfNeeded(const IntRect& visibleRect)
+{
+ ASSERT(m_hasPausedImageAnimations);
+ if (!shouldRepaintForImageAnimation(*this, visibleRect))
+ return false;
+ repaint();
+ return true;
+}
+
</ins><span class="cx"> RenderNamedFlowThread* RenderElement::renderNamedFlowThreadWrapper()
</span><span class="cx"> {
</span><span class="cx"> auto renderer = this;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (163927 => 163928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2014-02-12 02:52:19 UTC (rev 163927)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2014-02-12 02:55:22 UTC (rev 163928)
</span><span class="lines">@@ -141,6 +141,10 @@
</span><span class="cx"> bool hasBlendMode() const { return false; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ bool repaintForPausedImageAnimationsIfNeeded(const IntRect& visibleRect);
+ bool hasPausedImageAnimations() const { return m_hasPausedImageAnimations; }
+ void setHasPausedImageAnimations(bool b) { m_hasPausedImageAnimations = b; }
+
</ins><span class="cx"> RenderNamedFlowThread* renderNamedFlowThreadWrapper();
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="lines">@@ -200,12 +204,14 @@
</span><span class="cx"> StyleDifference adjustStyleDifference(StyleDifference, unsigned contextSensitiveProperties) const;
</span><span class="cx"> RenderStyle* cachedFirstLineStyle() const;
</span><span class="cx">
</span><ins>+ virtual void newImageAnimationFrameAvailable(CachedImage&) final override;
+
</ins><span class="cx"> unsigned m_baseTypeFlags : 6;
</span><span class="cx"> bool m_ancestorLineBoxDirty : 1;
</span><span class="cx"> bool m_hasInitializedStyle : 1;
</span><span class="cx">
</span><del>- // Specific to RenderInline.
</del><span class="cx"> bool m_renderInlineAlwaysCreatesLineBoxes : 1;
</span><ins>+ bool m_hasPausedImageAnimations : 1;
</ins><span class="cx">
</span><span class="cx"> RenderObject* m_firstChild;
</span><span class="cx"> RenderObject* m_lastChild;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (163927 => 163928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-02-12 02:52:19 UTC (rev 163927)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-02-12 02:55:22 UTC (rev 163928)
</span><span class="lines">@@ -2203,26 +2203,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-bool RenderObject::willRenderImage(CachedImage*)
-{
- // Without visibility we won't render (and therefore don't care about animation).
- if (style().visibility() != VISIBLE)
- return false;
-
-#if PLATFORM(IOS)
- if (document().frame()->timersPaused())
- return false;
-#else
- // We will not render a new image when Active DOM is suspended
- if (document().activeDOMObjectsAreSuspended())
- return false;
-#endif
-
- // If we're not in a window (i.e., we're dormant from being put in the b/f cache or in a background tab)
- // then we don't want to render either.
- return !document().inPageCache() && !document().view()->isOffscreen();
-}
-
</del><span class="cx"> int RenderObject::maximalOutlineSize(PaintPhase p) const
</span><span class="cx"> {
</span><span class="cx"> if (p != PaintPhaseOutline && p != PaintPhaseSelfOutline && p != PaintPhaseChildOutlines)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (163927 => 163928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2014-02-12 02:52:19 UTC (rev 163927)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2014-02-12 02:55:22 UTC (rev 163928)
</span><span class="lines">@@ -847,7 +847,6 @@
</span><span class="cx">
</span><span class="cx"> virtual void imageChanged(CachedImage*, const IntRect* = 0) override;
</span><span class="cx"> virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) { }
</span><del>- virtual bool willRenderImage(CachedImage*) override;
</del><span class="cx">
</span><span class="cx"> void selectionStartEnd(int& spos, int& epos) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (163927 => 163928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2014-02-12 02:52:19 UTC (rev 163927)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2014-02-12 02:55:22 UTC (rev 163928)
</span><span class="lines">@@ -1178,6 +1178,37 @@
</span><span class="cx"> return *m_imageQualityController;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderView::addRendererWithPausedImageAnimations(RenderElement& renderer)
+{
+ if (renderer.hasPausedImageAnimations()) {
+ ASSERT(m_renderersWithPausedImageAnimation.contains(&renderer));
+ return;
+ }
+ renderer.setHasPausedImageAnimations(true);
+ m_renderersWithPausedImageAnimation.add(&renderer);
+}
+
+void RenderView::removeRendererWithPausedImageAnimations(RenderElement& renderer)
+{
+ ASSERT(renderer.hasPausedImageAnimations());
+ ASSERT(m_renderersWithPausedImageAnimation.contains(&renderer));
+
+ renderer.setHasPausedImageAnimations(false);
+ m_renderersWithPausedImageAnimation.remove(&renderer);
+}
+
+void RenderView::resumePausedImageAnimationsIfNeeded()
+{
+ auto visibleRect = frameView().visibleContentRect();
+ Vector<RenderElement*, 10> toRemove;
+ for (auto* renderer : m_renderersWithPausedImageAnimation) {
+ if (renderer->repaintForPausedImageAnimationsIfNeeded(visibleRect))
+ toRemove.append(renderer);
+ }
+ for (auto& renderer : toRemove)
+ removeRendererWithPausedImageAnimations(*renderer);
+}
+
</ins><span class="cx"> RenderView::RepaintRegionAccumulator::RepaintRegionAccumulator(RenderView* view)
</span><span class="cx"> : m_rootView(view ? view->document().topDocument().renderView() : nullptr)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (163927 => 163928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2014-02-12 02:52:19 UTC (rev 163927)
+++ trunk/Source/WebCore/rendering/RenderView.h 2014-02-12 02:55:22 UTC (rev 163928)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "PODFreeListArena.h"
</span><span class="cx"> #include "Region.h"
</span><span class="cx"> #include "RenderBlockFlow.h"
</span><ins>+#include <wtf/HashSet.h>
</ins><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -219,6 +220,10 @@
</span><span class="cx"> void didCreateRenderer() { ++m_rendererCount; }
</span><span class="cx"> void didDestroyRenderer() { --m_rendererCount; }
</span><span class="cx">
</span><ins>+ void resumePausedImageAnimationsIfNeeded();
+ void addRendererWithPausedImageAnimations(RenderElement&);
+ void removeRendererWithPausedImageAnimations(RenderElement&);
+
</ins><span class="cx"> class RepaintRegionAccumulator {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(RepaintRegionAccumulator);
</span><span class="cx"> public:
</span><span class="lines">@@ -340,6 +345,8 @@
</span><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><span class="cx"> bool m_hasSoftwareFilters;
</span><span class="cx"> #endif
</span><ins>+
+ HashSet<RenderElement*> m_renderersWithPausedImageAnimation;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> RENDER_OBJECT_TYPE_CASTS(RenderView, isRenderView())
</span></span></pre>
</div>
</div>
</body>
</html>