<!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>[171306] 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/171306">171306</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-07-21 11:26:43 -0700 (Mon, 21 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS WK1] Single touch div scrolling doesn't work in framesets (breaks Word previews)
https://bugs.webkit.org/show_bug.cgi?id=135103
<rdar://problem/11830219>
Reviewed by Darin Adler.
After <a href="http://trac.webkit.org/projects/webkit/changeset/166117">r166117</a> all layer flushing starts on the root frame; we no longer flush layers
for each frame during painting. However, flushing GraphicsLayers can set some state
on a subframe RenderLayerCompositor that is now never processed, which breaks scroll
layer registration.
Fix by doing a walk of the Frame tree, and calling didFlushLayers() on subframe RenderLayerCompositors
before calling didFlushLayers() on self.
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::flushPendingLayerChanges):
(WebCore::RenderLayerCompositor::didFlushLayers):
(WebCore::RenderLayerCompositor::notifySubframesAfterLayerFlush):
(WebCore::RenderLayerCompositor::enclosingCompositorFlushingLayers): Drive-by nullptr.
* rendering/RenderLayerCompositor.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorh">trunk/Source/WebCore/rendering/RenderLayerCompositor.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171305 => 171306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-21 17:44:26 UTC (rev 171305)
+++ trunk/Source/WebCore/ChangeLog 2014-07-21 18:26:43 UTC (rev 171306)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-07-20 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK1] Single touch div scrolling doesn't work in framesets (breaks Word previews)
+ https://bugs.webkit.org/show_bug.cgi?id=135103
+ <rdar://problem/11830219>
+
+ Reviewed by Darin Adler.
+
+ After r166117 all layer flushing starts on the root frame; we no longer flush layers
+ for each frame during painting. However, flushing GraphicsLayers can set some state
+ on a subframe RenderLayerCompositor that is now never processed, which breaks scroll
+ layer registration.
+
+ Fix by doing a walk of the Frame tree, and calling didFlushLayers() on subframe RenderLayerCompositors
+ before calling didFlushLayers() on self.
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::flushPendingLayerChanges):
+ (WebCore::RenderLayerCompositor::didFlushLayers):
+ (WebCore::RenderLayerCompositor::notifySubframesAfterLayerFlush):
+ (WebCore::RenderLayerCompositor::enclosingCompositorFlushingLayers): Drive-by nullptr.
+ * rendering/RenderLayerCompositor.h:
+
</ins><span class="cx"> 2014-07-21 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] a Paused media session is not active
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (171305 => 171306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-07-21 17:44:26 UTC (rev 171305)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-07-21 18:26:43 UTC (rev 171306)
</span><span class="lines">@@ -470,19 +470,41 @@
</span><span class="cx"> ASSERT(m_flushingLayers);
</span><span class="cx"> m_flushingLayers = false;
</span><span class="cx">
</span><ins>+ updateScrollCoordinatedLayersAfterFlushIncludingSubframes();
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- updateCustomLayersAfterFlush();
-
</del><span class="cx"> ChromeClient* client = this->chromeClient();
</span><span class="cx"> if (client && isFlushRoot)
</span><span class="cx"> client->didFlushCompositingLayers();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ startLayerFlushTimerIfNeeded();
+}
+
+void RenderLayerCompositor::updateScrollCoordinatedLayersAfterFlushIncludingSubframes()
+{
+ updateScrollCoordinatedLayersAfterFlush();
+
+ Frame& frame = m_renderView.frameView().frame();
+ for (Frame* subframe = frame.tree().firstChild(); subframe; subframe = subframe->tree().traverseNext(&frame)) {
+ RenderView* view = subframe->contentRenderer();
+ if (!view)
+ continue;
+
+ view->compositor().updateScrollCoordinatedLayersAfterFlush();
+ }
+}
+
+void RenderLayerCompositor::updateScrollCoordinatedLayersAfterFlush()
+{
+#if PLATFORM(IOS)
+ updateCustomLayersAfterFlush();
+#endif
+
</ins><span class="cx"> for (auto it = m_scrollCoordinatedLayersNeedingUpdate.begin(), end = m_scrollCoordinatedLayersNeedingUpdate.end(); it != end; ++it)
</span><span class="cx"> updateScrollCoordinatedStatus(**it);
</span><span class="cx">
</span><span class="cx"> m_scrollCoordinatedLayersNeedingUpdate.clear();
</span><del>- startLayerFlushTimerIfNeeded();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -600,7 +622,7 @@
</span><span class="cx"> RenderLayerCompositor* RenderLayerCompositor::enclosingCompositorFlushingLayers() const
</span><span class="cx"> {
</span><span class="cx"> for (Frame* frame = &m_renderView.frameView().frame(); frame; frame = frame->tree().parent()) {
</span><del>- RenderLayerCompositor* compositor = frame->contentRenderer() ? &frame->contentRenderer()->compositor() : 0;
</del><ins>+ RenderLayerCompositor* compositor = frame->contentRenderer() ? &frame->contentRenderer()->compositor() : nullptr;
</ins><span class="cx"> if (compositor->isFlushingLayers())
</span><span class="cx"> return compositor;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (171305 => 171306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2014-07-21 17:44:26 UTC (rev 171305)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2014-07-21 18:26:43 UTC (rev 171306)
</span><span class="lines">@@ -381,6 +381,8 @@
</span><span class="cx"> void notifyIFramesOfCompositingChange();
</span><span class="cx">
</span><span class="cx"> bool isFlushingLayers() const { return m_flushingLayers; }
</span><ins>+ void updateScrollCoordinatedLayersAfterFlushIncludingSubframes();
+ void updateScrollCoordinatedLayersAfterFlush();
</ins><span class="cx">
</span><span class="cx"> Page* page() const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>