<!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>[178111] trunk/Source</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/178111">178111</a></dd>
<dt>Author</dt> <dd>yoon@igalia.com</dd>
<dt>Date</dt> <dd>2015-01-08 05:29:41 -0800 (Thu, 08 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Seperate updateBackingStore from flushCompositingState.
https://bugs.webkit.org/show_bug.cgi?id=136887
Reviewed by Žan Doberšek.
Source/WebCore:
When LayerTreeHostGtk flushes pending layer changes, it updates backing
stores using same loop. This makes requesting layer flush during
flushing in certain condition which causes a assertion failure.
Animated GIF's animations are drived by the painting cycle,
GraphicsLayerTextureMapper::updateBackingStoreIfNeeded would request
scheduleLayerFlush during flushing layers, if animated GIF needs to
advance its frame immediately. It doesn't mean the advanced frame should
be painted in this painting phase. This frame advancing happens after
painting a current frame to the backing store. It means the advanced
frame should be painted ASAP without using its frame timer.
This patch seperates updateBackingStore from flushCompositingState
to avoid above behavior.
No new tests. The bug is timing-dependent.
* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
(WebCore::GraphicsLayerTextureMapper::flushCompositingStateForThisLayerOnly):
(WebCore::toGraphicsLayerTextureMapper):
(WebCore::GraphicsLayerTextureMapper::updateBackingStoreIncludingSubLayers):
* platform/graphics/texmap/GraphicsLayerTextureMapper.h:
Source/WebKit2:
* WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
(WebKit::LayerTreeHostGtk::flushPendingLayerChanges):
Modified to call GraphicsLayerTextureMapper::updateBackingStoreIncludingSubLayers</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMappercpp">trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMapperh">trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp">trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178110 => 178111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-08 11:43:00 UTC (rev 178110)
+++ trunk/Source/WebCore/ChangeLog 2015-01-08 13:29:41 UTC (rev 178111)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-01-08 Gwang Yoon Hwang <yoon@igalia.com>
+
+ [GTK] Seperate updateBackingStore from flushCompositingState.
+ https://bugs.webkit.org/show_bug.cgi?id=136887
+
+ Reviewed by Žan Doberšek.
+
+ When LayerTreeHostGtk flushes pending layer changes, it updates backing
+ stores using same loop. This makes requesting layer flush during
+ flushing in certain condition which causes a assertion failure.
+
+ Animated GIF's animations are drived by the painting cycle,
+ GraphicsLayerTextureMapper::updateBackingStoreIfNeeded would request
+ scheduleLayerFlush during flushing layers, if animated GIF needs to
+ advance its frame immediately. It doesn't mean the advanced frame should
+ be painted in this painting phase. This frame advancing happens after
+ painting a current frame to the backing store. It means the advanced
+ frame should be painted ASAP without using its frame timer.
+
+ This patch seperates updateBackingStore from flushCompositingState
+ to avoid above behavior.
+
+ No new tests. The bug is timing-dependent.
+
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+ (WebCore::GraphicsLayerTextureMapper::flushCompositingStateForThisLayerOnly):
+ (WebCore::toGraphicsLayerTextureMapper):
+ (WebCore::GraphicsLayerTextureMapper::updateBackingStoreIncludingSubLayers):
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.h:
+
</ins><span class="cx"> 2015-01-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Move -webkit-tap-highlight-color / -webkit-overflow-scrolling / -webkit-touch-callout to the new StyleBuilder
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (178110 => 178111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2015-01-08 11:43:00 UTC (rev 178110)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2015-01-08 13:29:41 UTC (rev 178111)
</span><span class="lines">@@ -368,7 +368,6 @@
</span><span class="cx"> prepareBackingStoreIfNeeded();
</span><span class="cx"> commitLayerChanges();
</span><span class="cx"> m_layer.syncAnimations();
</span><del>- updateBackingStoreIfNeeded();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsLayerTextureMapper::prepareBackingStoreIfNeeded()
</span><span class="lines">@@ -512,6 +511,21 @@
</span><span class="cx"> child->flushCompositingState(rect);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void GraphicsLayerTextureMapper::updateBackingStoreIncludingSubLayers()
+{
+ if (!m_layer.textureMapper())
+ return;
+
+ updateBackingStoreIfNeeded();
+
+ if (maskLayer())
+ downcast<GraphicsLayerTextureMapper>(*maskLayer()).updateBackingStoreIfNeeded();
+ if (replicaLayer())
+ downcast<GraphicsLayerTextureMapper>(*replicaLayer()).updateBackingStoreIfNeeded();
+ for (auto* child : children())
+ downcast<GraphicsLayerTextureMapper>(*child).updateBackingStoreIncludingSubLayers();
+}
+
</ins><span class="cx"> void GraphicsLayerTextureMapper::updateBackingStoreIfNeeded()
</span><span class="cx"> {
</span><span class="cx"> TextureMapper* textureMapper = m_layer.textureMapper();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMapperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h (178110 => 178111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h 2015-01-08 11:43:00 UTC (rev 178110)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h 2015-01-08 13:29:41 UTC (rev 178111)
</span><span class="lines">@@ -86,6 +86,8 @@
</span><span class="cx"> virtual void flushCompositingState(const FloatRect&) override;
</span><span class="cx"> virtual void flushCompositingStateForThisLayerOnly() override;
</span><span class="cx">
</span><ins>+ void updateBackingStoreIncludingSubLayers();
+
</ins><span class="cx"> TextureMapperLayer& layer() { return m_layer; }
</span><span class="cx">
</span><span class="cx"> void didCommitScrollOffset(const IntSize&);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178110 => 178111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-08 11:43:00 UTC (rev 178110)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-08 13:29:41 UTC (rev 178111)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-01-08 Gwang Yoon Hwang <yoon@igalia.com>
+
+ [GTK] Seperate updateBackingStore from flushCompositingState.
+ https://bugs.webkit.org/show_bug.cgi?id=136887
+
+ Reviewed by Žan Doberšek.
+
+ * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
+ (WebKit::LayerTreeHostGtk::flushPendingLayerChanges):
+ Modified to call GraphicsLayerTextureMapper::updateBackingStoreIncludingSubLayers
+
</ins><span class="cx"> 2015-01-07 Gwang Yoon Hwang <yoon@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK][ThreadedCompositor] Add support for threaded compositor.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (178110 => 178111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2015-01-08 11:43:00 UTC (rev 178110)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2015-01-08 13:29:41 UTC (rev 178111)
</span><span class="lines">@@ -300,7 +300,11 @@
</span><span class="cx"> for (PageOverlayLayerMap::iterator it = m_pageOverlayLayers.begin(); it != end; ++it)
</span><span class="cx"> it->value->flushCompositingStateForThisLayerOnly();
</span><span class="cx">
</span><del>- return m_webPage->corePage()->mainFrame().view()->flushCompositingStateIncludingSubframes();
</del><ins>+ if (!m_webPage->corePage()->mainFrame().view()->flushCompositingStateIncludingSubframes())
+ return false;
+
+ downcast<GraphicsLayerTextureMapper>(*m_rootLayer).updateBackingStoreIncludingSubLayers();
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void LayerTreeHostGtk::compositeLayersToContext(CompositePurpose purpose)
</span></span></pre>
</div>
</div>
</body>
</html>