<!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>[182787] releases/WebKitGTK/webkit-2.8/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/182787">182787</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-14 02:01:50 -0700 (Tue, 14 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/182773">r182773</a> - Regression: Scrolling on popsci.com spends too much time in FrameView::viewportsContentsChanged()
https://bugs.webkit.org/show_bug.cgi?id=143675
Reviewed by Simon Fraser.
Optimize resumeVisibleImageAnimationsIncludingSubframes() so that the FrameViews'
windowClipRect gets computed less often:
- Cache the FrameView's windowClipRect before resuming image animations in subframes
as calling windowClipRect() on those subframes' view is going to call windowClipRect()
on their ancestors. This avoids a lot of unnecessary windowClipRect recomputations
in deep frame trees.
- Stop traversing the Frame tree if the current frame does not have a content
renderer, as this means the subframes won't have one either.
- Stop traversing the Frame tree if the current frame's view has an empty
windowClipRect() as this means the windowClipRect will be empty for those
subframes as well.
On popsci.com, this cuts down the number of uncached windowClipRect() calls by
approximately half. I see viewportsContentsChanged() at ~0.4% when scrolling
on popsci.com after this change.
* page/FrameView.cpp:
(WebCore::FrameView::resumeVisibleImageAnimationsIncludingSubframes):
(WebCore::FrameView::windowClipRect):
* page/FrameView.h:
* rendering/RenderView.cpp:
(WebCore::RenderView::resumePausedImageAnimationsIfNeeded):
* rendering/RenderView.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorepageFrameViewcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorepageFrameViewh">releases/WebKitGTK/webkit-2.8/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorerenderingRenderViewcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorerenderingRenderViewh">releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (182786 => 182787)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-04-14 08:40:07 UTC (rev 182786)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-04-14 09:01:50 UTC (rev 182787)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-04-13 Chris Dumez <cdumez@apple.com>
+
+ Regression: Scrolling on popsci.com spends too much time in FrameView::viewportsContentsChanged()
+ https://bugs.webkit.org/show_bug.cgi?id=143675
+
+ Reviewed by Simon Fraser.
+
+ Optimize resumeVisibleImageAnimationsIncludingSubframes() so that the FrameViews'
+ windowClipRect gets computed less often:
+ - Cache the FrameView's windowClipRect before resuming image animations in subframes
+ as calling windowClipRect() on those subframes' view is going to call windowClipRect()
+ on their ancestors. This avoids a lot of unnecessary windowClipRect recomputations
+ in deep frame trees.
+ - Stop traversing the Frame tree if the current frame does not have a content
+ renderer, as this means the subframes won't have one either.
+ - Stop traversing the Frame tree if the current frame's view has an empty
+ windowClipRect() as this means the windowClipRect will be empty for those
+ subframes as well.
+
+ On popsci.com, this cuts down the number of uncached windowClipRect() calls by
+ approximately half. I see viewportsContentsChanged() at ~0.4% when scrolling
+ on popsci.com after this change.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::resumeVisibleImageAnimationsIncludingSubframes):
+ (WebCore::FrameView::windowClipRect):
+ * page/FrameView.h:
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::resumePausedImageAnimationsIfNeeded):
+ * rendering/RenderView.h:
+
</ins><span class="cx"> 2015-04-13 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Canvas drawImage() has a security hole when the image isn't yet fully loaded.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/page/FrameView.cpp (182786 => 182787)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/page/FrameView.cpp 2015-04-14 08:40:07 UTC (rev 182786)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/page/FrameView.cpp 2015-04-14 09:01:50 UTC (rev 182787)
</span><span class="lines">@@ -2140,10 +2140,23 @@
</span><span class="cx">
</span><span class="cx"> void FrameView::resumeVisibleImageAnimationsIncludingSubframes()
</span><span class="cx"> {
</span><del>- // 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();
</del><ins>+ auto* renderView = frame().contentRenderer();
+ if (!renderView)
+ return;
+
+ IntRect windowClipRect = this->windowClipRect();
+ auto visibleRect = windowToContents(windowClipRect);
+ if (visibleRect.isEmpty())
+ return;
+
+ // Resume paused image animations in this frame.
+ renderView->resumePausedImageAnimationsIfNeeded(visibleRect);
+
+ // Recursive call for subframes. We cache the current FrameView's windowClipRect to avoid recomputing it for every subframe.
+ TemporaryChange<IntRect*> windowClipRectCache(m_cachedWindowClipRect, &windowClipRect);
+ for (Frame* childFrame = frame().tree().firstChild(); childFrame; childFrame = childFrame->tree().nextSibling()) {
+ if (auto* childView = childFrame->view())
+ childView->resumeVisibleImageAnimationsIncludingSubframes();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3266,6 +3279,9 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(frame().view() == this);
</span><span class="cx">
</span><ins>+ if (m_cachedWindowClipRect)
+ return *m_cachedWindowClipRect;
+
</ins><span class="cx"> if (paintsEntireContents())
</span><span class="cx"> return contentsToWindow(IntRect(IntPoint(), totalContentsSize()));
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/page/FrameView.h (182786 => 182787)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/page/FrameView.h 2015-04-14 08:40:07 UTC (rev 182786)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/page/FrameView.h 2015-04-14 09:01:50 UTC (rev 182787)
</span><span class="lines">@@ -782,6 +782,8 @@
</span><span class="cx"> bool m_visualUpdatesAllowedByClient;
</span><span class="cx">
</span><span class="cx"> ScrollPinningBehavior m_scrollPinningBehavior;
</span><ins>+
+ IntRect* m_cachedWindowClipRect { nullptr };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline void FrameView::incrementVisuallyNonEmptyCharacterCount(unsigned count)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderView.cpp (182786 => 182787)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderView.cpp 2015-04-14 08:40:07 UTC (rev 182786)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderView.cpp 2015-04-14 09:01:50 UTC (rev 182787)
</span><span class="lines">@@ -1356,9 +1356,8 @@
</span><span class="cx"> m_renderersWithPausedImageAnimation.remove(&renderer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderView::resumePausedImageAnimationsIfNeeded()
</del><ins>+void RenderView::resumePausedImageAnimationsIfNeeded(IntRect visibleRect)
</ins><span class="cx"> {
</span><del>- auto visibleRect = frameView().windowToContents(frameView().windowClipRect());
</del><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="releasesWebKitGTKwebkit28SourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderView.h (182786 => 182787)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderView.h 2015-04-14 08:40:07 UTC (rev 182786)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderView.h 2015-04-14 09:01:50 UTC (rev 182787)
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> void didCreateRenderer() { ++m_rendererCount; }
</span><span class="cx"> void didDestroyRenderer() { --m_rendererCount; }
</span><span class="cx">
</span><del>- void resumePausedImageAnimationsIfNeeded();
</del><ins>+ void resumePausedImageAnimationsIfNeeded(IntRect visibleRect);
</ins><span class="cx"> void addRendererWithPausedImageAnimations(RenderElement&);
</span><span class="cx"> void removeRendererWithPausedImageAnimations(RenderElement&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>