<!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>[178013] trunk/Source/WebCore</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/178013">178013</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-06 18:06:19 -0800 (Tue, 06 Jan 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add utility method on FrameView that resumes animated images and unthrottles DOM timers
https://bugs.webkit.org/show_bug.cgi?id=140151

Reviewed by Darin Adler.

Add utility method on FrameView that resumes animated images and
unthrottles DOM timers.

* dom/Document.cpp:
(WebCore::Document::recalcStyle):
* page/FrameView.cpp:
(WebCore::FrameView::setFrameRect):
(WebCore::FrameView::viewportContentsChanged):
(WebCore::FrameView::scrollPositionChanged):
(WebCore::FrameView::performPostLayoutTasks):
* page/FrameView.h:
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::scrollTo):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178012 => 178013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-01-07 01:59:10 UTC (rev 178012)
+++ trunk/Source/WebCore/ChangeLog        2015-01-07 02:06:19 UTC (rev 178013)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-01-06  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Add utility method on FrameView that resumes animated images and unthrottles DOM timers
+        https://bugs.webkit.org/show_bug.cgi?id=140151
+
+        Reviewed by Darin Adler.
+
+        Add utility method on FrameView that resumes animated images and
+        unthrottles DOM timers.
+
+        * dom/Document.cpp:
+        (WebCore::Document::recalcStyle):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::setFrameRect):
+        (WebCore::FrameView::viewportContentsChanged):
+        (WebCore::FrameView::scrollPositionChanged):
+        (WebCore::FrameView::performPostLayoutTasks):
+        * page/FrameView.h:
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::scrollTo):
+
+2015-01-06  Chris Dumez  &lt;cdumez@apple.com&gt;
+
</ins><span class="cx">         Do not attempt to revalidate cached main resource on back/forward navigation
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=139263
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (178012 => 178013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp        2015-01-07 01:59:10 UTC (rev 178012)
+++ trunk/Source/WebCore/dom/Document.cpp        2015-01-07 02:06:19 UTC (rev 178013)
</span><span class="lines">@@ -1793,7 +1793,7 @@
</span><span class="cx"> 
</span><span class="cx">     // Some animated images may now be inside the viewport due to style recalc,
</span><span class="cx">     // resume them if necessary.
</span><del>-    frameView.resumeVisibleImageAnimationsIncludingSubframes();
</del><ins>+    frameView.viewportContentsChanged();
</ins><span class="cx"> 
</span><span class="cx">     // As a result of the style recalculation, the currently hovered element might have been
</span><span class="cx">     // detached (for example, by setting display:none in the :hover style), schedule another mouseMove event
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (178012 => 178013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp        2015-01-07 01:59:10 UTC (rev 178012)
+++ trunk/Source/WebCore/page/FrameView.cpp        2015-01-07 02:06:19 UTC (rev 178013)
</span><span class="lines">@@ -459,8 +459,7 @@
</span><span class="cx">     if (frame().isMainFrame())
</span><span class="cx">         frame().mainFrame().pageOverlayController().didChangeViewSize();
</span><span class="cx"> 
</span><del>-    // The frame view was resized, check if we should resume animated images.
-    resumeVisibleImageAnimationsIncludingSubframes();
</del><ins>+    viewportContentsChanged();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(REQUEST_ANIMATION_FRAME)
</span><span class="lines">@@ -1752,6 +1751,14 @@
</span><span class="cx">     sendScrollEvent();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void FrameView::viewportContentsChanged()
+{
+    // When the viewport contents changes (scroll, resize, style recalc, layout, ...),
+    // check if we should resume animated images or unthrottle DOM timers.
+    resumeVisibleImageAnimationsIncludingSubframes();
+    updateThrottledDOMTimersState();
+}
+
</ins><span class="cx"> bool FrameView::fixedElementsLayoutRelativeToFrame() const
</span><span class="cx"> {
</span><span class="cx">     return frame().settings().fixedElementsLayoutRelativeToFrame();
</span><span class="lines">@@ -2115,8 +2122,7 @@
</span><span class="cx">             renderView-&gt;compositor().frameViewDidScroll();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    resumeVisibleImageAnimationsIncludingSubframes();
-    updateThrottledDOMTimersState();
</del><ins>+    viewportContentsChanged();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void FrameView::resumeVisibleImageAnimationsIncludingSubframes()
</span><span class="lines">@@ -2938,10 +2944,7 @@
</span><span class="cx">     scrollToAnchor();
</span><span class="cx"> 
</span><span class="cx">     sendResizeEventIfNeeded();
</span><del>-
-    // Check if we should unthrottle DOMTimers after layout as the position
-    // of Elements may have changed.
-    updateThrottledDOMTimersState();
</del><ins>+    viewportContentsChanged();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> IntSize FrameView::sizeForResizeEvent() const
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (178012 => 178013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h        2015-01-07 01:59:10 UTC (rev 178012)
+++ trunk/Source/WebCore/page/FrameView.h        2015-01-07 02:06:19 UTC (rev 178013)
</span><span class="lines">@@ -244,6 +244,7 @@
</span><span class="cx">     WEBCORE_EXPORT virtual IntPoint maximumScrollPosition() const override;
</span><span class="cx">     void delayedScrollEventTimerFired();
</span><span class="cx"> 
</span><ins>+    void viewportContentsChanged();
</ins><span class="cx">     void resumeVisibleImageAnimationsIncludingSubframes();
</span><span class="cx"> 
</span><span class="cx">     // This is different than visibleContentRect() in that it ignores negative (or overly positive)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (178012 => 178013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp        2015-01-07 01:59:10 UTC (rev 178012)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp        2015-01-07 02:06:19 UTC (rev 178013)
</span><span class="lines">@@ -2312,7 +2312,7 @@
</span><span class="cx">     if (scrollsOverflow())
</span><span class="cx">         view.frameView().didChangeScrollOffset();
</span><span class="cx"> 
</span><del>-    view.frameView().resumeVisibleImageAnimationsIncludingSubframes();
</del><ins>+    view.frameView().viewportContentsChanged();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static inline bool frameElementAndViewPermitScroll(HTMLFrameElementBase* frameElementBase, FrameView* frameView) 
</span></span></pre>
</div>
</div>

</body>
</html>