<!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>[179126] branches/safari-600.1.4.15-branch</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/179126">179126</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-01-26 11:38:48 -0800 (Mon, 26 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172854">r172854</a>. rdar://problem/19432691</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchLayoutTestsChangeLog">branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreWebCoreexpin">branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorepageFrameViewcpp">branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorepageFrameViewh">branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorepagePagecpp">branches/safari-600.1.4.15-branch/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorerenderingRenderElementcpp">branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorerenderingRenderLayercpp">branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorerenderingRenderViewcpp">branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebKitmacChangeLog">branches/safari-600.1.4.15-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebKitmacWebViewWebViewmm">branches/safari-600.1.4.15-branch/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchLayoutTestsfastrepaintnoanimationoutsideviewportsubframeexpectedtxt">branches/safari-600.1.4.15-branch/LayoutTests/fast/repaint/no-animation-outside-viewport-subframe-expected.txt</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfastrepaintnoanimationoutsideviewportsubframehtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/repaint/no-animation-outside-viewport-subframe.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog (179125 => 179126)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-01-26 18:33:47 UTC (rev 179125)
+++ branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-01-26 19:38:48 UTC (rev 179126)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-01-26 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172854.
+
+ 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.
+
+2015-01-26 David Kilzer <ddkilzer@apple.com>
+
</ins><span class="cx"> Merge r177135.
</span><span class="cx">
</span><span class="cx"> 2014-12-10 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastrepaintnoanimationoutsideviewportsubframeexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-600.1.4.15-branch/LayoutTests/fast/repaint/no-animation-outside-viewport-subframe-expected.txt (0 => 179126)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/repaint/no-animation-outside-viewport-subframe-expected.txt (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/repaint/no-animation-outside-viewport-subframe-expected.txt 2015-01-26 19:38:48 UTC (rev 179126)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Test that animated gif in a frame outside viewport does not trigger repaint.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS repaintRectsAfterScroll is ""
+PASS repaintRectsAfterScrollBack is not ""
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
+
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfastrepaintnoanimationoutsideviewportsubframehtml"></a>
<div class="addfile"><h4>Added: branches/safari-600.1.4.15-branch/LayoutTests/fast/repaint/no-animation-outside-viewport-subframe.html (0 => 179126)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/repaint/no-animation-outside-viewport-subframe.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/repaint/no-animation-outside-viewport-subframe.html 2015-01-26 19:38:48 UTC (rev 179126)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+<html>
+<head>
+<script>jsTestIsAsync = true;</script>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+ description("Test that animated gif in a frame outside viewport does not trigger repaint.");
+ function startTrackingRepaints()
+ {
+ document.body.offsetTop;
+ window.internals.startTrackingRepaints();
+ window.scrollTo(0,200);
+ testRunner.display();
+ setTimeout(testAfterScroll, 200);
+ }
+
+ function testAfterScroll()
+ {
+ repaintRectsAfterScroll = window.internals.repaintRectsAsText();
+ window.internals.stopTrackingRepaints();
+
+ shouldBeEqualToString("repaintRectsAfterScroll", "");
+
+ window.internals.startTrackingRepaints();
+ window.scrollTo(0,0);
+ testRunner.display();
+ setTimeout(testAfterScrollBack, 200);
+ }
+
+ function testAfterScrollBack()
+ {
+ repaintRectsAfterScrollBack = window.internals.repaintRectsAsText();
+ window.internals.stopTrackingRepaints();
+
+ shouldNotBeEqualToString("repaintRectsAfterScrollBack", "");
+
+ 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()">
+<iframe srcdoc="<img src=resources/animated.gif>"></iframe>
+<div style="height:1000px"></div>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179125 => 179126)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-26 18:33:47 UTC (rev 179125)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-26 19:38:48 UTC (rev 179126)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2015-01-26 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172854.
+
+ 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):
+
+2015-01-26 David Kilzer <ddkilzer@apple.com>
+
</ins><span class="cx"> Merge r177135.
</span><span class="cx">
</span><span class="cx"> 2014-12-10 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in (179125 => 179126)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in 2015-01-26 18:33:47 UTC (rev 179125)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in 2015-01-26 19:38:48 UTC (rev 179126)
</span><span class="lines">@@ -2529,7 +2529,6 @@
</span><span class="cx"> _WebUIApplicationWillEnterForegroundNotification
</span><span class="cx"> _WebUIApplicationWillResignActiveNotification
</span><span class="cx"> __ZN7WebCore10CredentialC1EP13__SecIdentityPK9__CFArrayNS_21CredentialPersistenceE
</span><del>-__ZN7WebCore10RenderView35resumePausedImageAnimationsIfNeededEv
</del><span class="cx"> __ZN7WebCore10ScrollView15setScrollOffsetERKNS_8IntPointE
</span><span class="cx"> __ZN7WebCore10ScrollView21setExposedContentRectERKNS_9FloatRectE
</span><span class="cx"> __ZN7WebCore10ScrollView24setUnobscuredContentSizeERKNS_9FloatSizeE
</span><span class="lines">@@ -2755,6 +2754,7 @@
</span><span class="cx"> __ZN7WebCore9FrameView32setCustomFixedPositionLayoutRectERKNS_7IntRectE
</span><span class="cx"> __ZN7WebCore9FrameView33rectForViewportConstrainedObjectsERKNS_10LayoutRectERKNS_10LayoutSizeEfbNS_30ScrollBehaviorForFixedElementsE
</span><span class="cx"> __ZN7WebCore9FrameView36scheduleLayerFlushAllowingThrottlingEv
</span><ins>+__ZN7WebCore9FrameView46resumeVisibleImageAnimationsIncludingSubframesEv
</ins><span class="cx"> __ZN7WebCore9PageGroup17removeVisitedLinkERKNS_3URLE
</span><span class="cx"> __ZNK7WebCore10FloatPointcv7CGPointEv
</span><span class="cx"> __ZNK7WebCore10ScrollView18exposedContentRectEv
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.cpp (179125 => 179126)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.cpp 2015-01-26 18:33:47 UTC (rev 179125)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.cpp 2015-01-26 19:38:48 UTC (rev 179126)
</span><span class="lines">@@ -2064,12 +2064,22 @@
</span><span class="cx"> document->sendWillRevealEdgeEventsIfNeeded(oldPosition, newPosition, visibleContentRect(), contentsSize());
</span><span class="cx">
</span><span class="cx"> if (RenderView* renderView = this->renderView()) {
</span><del>- renderView->resumePausedImageAnimationsIfNeeded();
</del><span class="cx"> if (renderView->usesCompositing())
</span><span class="cx"> renderView->compositor().frameViewDidScroll();
</span><span class="cx"> }
</span><ins>+
+ resumeVisibleImageAnimationsIncludingSubframes();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+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();
+ }
+}
+
</ins><span class="cx"> void FrameView::updateLayerPositionsAfterScrolling()
</span><span class="cx"> {
</span><span class="cx"> // If we're scrolling as a result of updating the view size after layout, we'll update widgets and layer positions soon anyway.
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.h (179125 => 179126)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.h 2015-01-26 18:33:47 UTC (rev 179125)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.h 2015-01-26 19:38:48 UTC (rev 179126)
</span><span class="lines">@@ -244,6 +244,8 @@
</span><span class="cx"> virtual IntPoint maximumScrollPosition() const override;
</span><span class="cx"> void delayedScrollEventTimerFired(Timer<FrameView>&);
</span><span class="cx">
</span><ins>+ void resumeVisibleImageAnimationsIncludingSubframes();
+
</ins><span class="cx"> // This is different than visibleContentRect() in that it ignores negative (or overly positive)
</span><span class="cx"> // offsets from rubber-banding, and it takes zooming into account.
</span><span class="cx"> LayoutRect viewportConstrainedVisibleContentRect() const;
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/page/Page.cpp (179125 => 179126)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/page/Page.cpp 2015-01-26 18:33:47 UTC (rev 179125)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/page/Page.cpp 2015-01-26 19:38:48 UTC (rev 179126)
</span><span class="lines">@@ -1191,11 +1191,8 @@
</span><span class="cx"> {
</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><del>-
- for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree().traverseNext()) {
- if (auto* renderView = frame->contentRenderer())
- renderView->resumePausedImageAnimationsIfNeeded();
- }
</del><ins>+ if (FrameView* view = mainFrame().view())
+ view->resumeVisibleImageAnimationsIncludingSubframes();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Page::createPageThrottler()
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderElement.cpp (179125 => 179126)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderElement.cpp 2015-01-26 18:33:47 UTC (rev 179125)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderElement.cpp 2015-01-26 19:38:48 UTC (rev 179126)
</span><span class="lines">@@ -1321,7 +1321,8 @@
</span><span class="cx">
</span><span class="cx"> void RenderElement::newImageAnimationFrameAvailable(CachedImage& image)
</span><span class="cx"> {
</span><del>- auto visibleRect = view().frameView().visibleContentRect();
</del><ins>+ auto& frameView = view().frameView();
+ auto visibleRect = frameView.windowToContents(frameView.windowClipRect());
</ins><span class="cx"> if (!shouldRepaintForImageAnimation(*this, visibleRect)) {
</span><span class="cx"> // FIXME: It would be better to pass the image along with the renderer
</span><span class="cx"> // so that we can be smarter about detecting if the image is inside the
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLayer.cpp (179125 => 179126)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLayer.cpp 2015-01-26 18:33:47 UTC (rev 179125)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLayer.cpp 2015-01-26 19:38:48 UTC (rev 179126)
</span><span class="lines">@@ -2303,7 +2303,7 @@
</span><span class="cx"> if (scrollsOverflow())
</span><span class="cx"> frame.loader().client().didChangeScrollOffset();
</span><span class="cx">
</span><del>- renderer().view().resumePausedImageAnimationsIfNeeded();
</del><ins>+ view.frameView().resumeVisibleImageAnimationsIncludingSubframes();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline bool frameElementAndViewPermitScroll(HTMLFrameElementBase* frameElementBase, FrameView* frameView)
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderView.cpp (179125 => 179126)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderView.cpp 2015-01-26 18:33:47 UTC (rev 179125)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderView.cpp 2015-01-26 19:38:48 UTC (rev 179126)
</span><span class="lines">@@ -1339,7 +1339,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderView::resumePausedImageAnimationsIfNeeded()
</span><span class="cx"> {
</span><del>- auto visibleRect = frameView().visibleContentRect();
</del><ins>+ auto visibleRect = frameView().windowToContents(frameView().windowClipRect());
</ins><span class="cx"> Vector<RenderElement*, 10> toRemove;
</span><span class="cx"> for (auto* renderer : m_renderersWithPausedImageAnimation) {
</span><span class="cx"> if (renderer->repaintForPausedImageAnimationsIfNeeded(visibleRect))
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit/mac/ChangeLog (179125 => 179126)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit/mac/ChangeLog 2015-01-26 18:33:47 UTC (rev 179125)
+++ branches/safari-600.1.4.15-branch/Source/WebKit/mac/ChangeLog 2015-01-26 19:38:48 UTC (rev 179126)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2015-01-26 David Kilzer <ddkilzer@apple.com>
+
+ Merge r172854.
+
+ * WebView/WebView.mm:
+ (-[WebView _didFinishScrollingOrZooming]): Call
+ FrameView::resumeVisibleImageAnimationsIncludingSubframes().
+
</ins><span class="cx"> 2015-01-25 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r177301.
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit/mac/WebView/WebView.mm (179125 => 179126)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit/mac/WebView/WebView.mm 2015-01-26 18:33:47 UTC (rev 179125)
+++ branches/safari-600.1.4.15-branch/Source/WebKit/mac/WebView/WebView.mm 2015-01-26 19:38:48 UTC (rev 179126)
</span><span class="lines">@@ -1572,9 +1572,8 @@
</span><span class="cx"> _private->mainViewIsScrollingOrZooming = NO;
</span><span class="cx"> [self setDefersCallbacks:NO];
</span><span class="cx"> [[self mainFrame] setTimeoutsPaused:NO];
</span><del>- FrameView* view = [self _mainCoreFrame]->view();
- if (view && view->renderView())
- view->renderView()->resumePausedImageAnimationsIfNeeded();
</del><ins>+ if (FrameView* view = [self _mainCoreFrame]->view())
+ view->resumeVisibleImageAnimationsIncludingSubframes();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_setResourceLoadSchedulerSuspended:(BOOL)suspend
</span></span></pre>
</div>
</div>
</body>
</html>