<!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>[176173] 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/176173">176173</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-11-16 22:49:41 -0800 (Sun, 16 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[TexMap] Add typecasting support for GraphicsLayerTextureMapper
https://bugs.webkit.org/show_bug.cgi?id=138741
Reviewed by Martin Robinson.
Source/WebCore:
Add type traits for the GraphicsLayerTextureMapper class.
This enables using typecasting functions instead of
toGraphicsLayerTextureMapper().
Remove toTextureMapperLayer() casting function which actually
returned the TextureMapperLayer object that belonged to the
passed-in GraphicsLayerTextureMapper. Instead, the GraphicsLayer
object is now downcasted and the TextureMapperLayer is accessed
by calling the GraphicsLayerTextureMapper::layer() method.
* platform/graphics/GraphicsLayer.h:
(WebCore::GraphicsLayer::isGraphicsLayerTextureMapper):
* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
(WebCore::toTextureMapperLayerVector):
(WebCore::GraphicsLayerTextureMapper::commitLayerChanges):
(WebCore::toTextureMapperLayer): Deleted.
* platform/graphics/texmap/GraphicsLayerTextureMapper.h:
(WebCore::toGraphicsLayerTextureMapper): Deleted.
Source/WebKit/win:
Switch to using downcast<GraphicsLayerTextureMapper>() and replace
uses of toTextureMapperLayer() with downcasting and calling
the GraphicsLayerTextureMapper::layer() method.
* WebCoreSupport/AcceleratedCompositingContext.cpp:
(AcceleratedCompositingContext::initialize):
(AcceleratedCompositingContext::startedAnimation):
(AcceleratedCompositingContext::compositeLayersToContext):
Source/WebKit2:
Replace uses of toTextureMapperLayer() with downcasting and
calling the GraphicsLayerTextureMapper::layer() method.
* WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
(WebKit::LayerTreeHostGtk::initialize):
(WebKit::LayerTreeHostGtk::layerFlushTimerFired):
(WebKit::LayerTreeHostGtk::compositeLayersToContext):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerh">trunk/Source/WebCore/platform/graphics/GraphicsLayer.h</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="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportAcceleratedCompositingContextcpp">trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp</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 (176172 => 176173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-17 06:46:24 UTC (rev 176172)
+++ trunk/Source/WebCore/ChangeLog 2014-11-17 06:49:41 UTC (rev 176173)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-11-16 Zan Dobersek <zdobersek@igalia.com>
+
+ [TexMap] Add typecasting support for GraphicsLayerTextureMapper
+ https://bugs.webkit.org/show_bug.cgi?id=138741
+
+ Reviewed by Martin Robinson.
+
+ Add type traits for the GraphicsLayerTextureMapper class.
+ This enables using typecasting functions instead of
+ toGraphicsLayerTextureMapper().
+
+ Remove toTextureMapperLayer() casting function which actually
+ returned the TextureMapperLayer object that belonged to the
+ passed-in GraphicsLayerTextureMapper. Instead, the GraphicsLayer
+ object is now downcasted and the TextureMapperLayer is accessed
+ by calling the GraphicsLayerTextureMapper::layer() method.
+
+ * platform/graphics/GraphicsLayer.h:
+ (WebCore::GraphicsLayer::isGraphicsLayerTextureMapper):
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+ (WebCore::toTextureMapperLayerVector):
+ (WebCore::GraphicsLayerTextureMapper::commitLayerChanges):
+ (WebCore::toTextureMapperLayer): Deleted.
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.h:
+ (WebCore::toGraphicsLayerTextureMapper): Deleted.
+
</ins><span class="cx"> 2014-11-16 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Move WebCore/loader to std::unique_ptr
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (176172 => 176173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2014-11-17 06:46:24 UTC (rev 176172)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2014-11-17 06:49:41 UTC (rev 176173)
</span><span class="lines">@@ -498,6 +498,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isGraphicsLayerCA() const { return false; }
</span><span class="cx"> virtual bool isGraphicsLayerCARemote() const { return false; }
</span><ins>+ virtual bool isGraphicsLayerTextureMapper() const { return false; }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> // Should be called from derived class destructors. Should call willBeDestroyed() on super.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (176172 => 176173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2014-11-17 06:46:24 UTC (rev 176172)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2014-11-17 06:49:41 UTC (rev 176173)
</span><span class="lines">@@ -30,11 +30,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-TextureMapperLayer* toTextureMapperLayer(GraphicsLayer* layer)
-{
- return layer ? toGraphicsLayerTextureMapper(layer)->layer() : 0;
-}
-
</del><span class="cx"> std::unique_ptr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerFactory* factory, GraphicsLayerClient& client)
</span><span class="cx"> {
</span><span class="cx"> if (!factory)
</span><span class="lines">@@ -419,7 +414,7 @@
</span><span class="cx"> {
</span><span class="cx"> texmapLayers.reserveCapacity(layers.size());
</span><span class="cx"> for (auto* layer : layers)
</span><del>- texmapLayers.append(toTextureMapperLayer(layer));
</del><ins>+ texmapLayers.append(downcast<GraphicsLayerTextureMapper>(layer)->layer());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsLayerTextureMapper::commitLayerChanges()
</span><span class="lines">@@ -434,10 +429,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_changeMask & MaskLayerChange)
</span><del>- m_layer->setMaskLayer(toTextureMapperLayer(maskLayer()));
</del><ins>+ m_layer->setMaskLayer(downcast<GraphicsLayerTextureMapper>(maskLayer())->layer());
</ins><span class="cx">
</span><span class="cx"> if (m_changeMask & ReplicaLayerChange)
</span><del>- m_layer->setReplicaLayer(toTextureMapperLayer(replicaLayer()));
</del><ins>+ m_layer->setReplicaLayer(downcast<GraphicsLayerTextureMapper>(replicaLayer())->layer());
</ins><span class="cx">
</span><span class="cx"> if (m_changeMask & PositionChange)
</span><span class="cx"> m_layer->setPosition(position());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMapperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h (176172 => 176173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h 2014-11-17 06:46:24 UTC (rev 176172)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h 2014-11-17 06:49:41 UTC (rev 176173)
</span><span class="lines">@@ -103,6 +103,8 @@
</span><span class="cx"> bool startedAnimation() const { return m_startedAnimation; }
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ // GraphicsLayer
+ virtual bool isGraphicsLayerTextureMapper() const override { return true; }
</ins><span class="cx">
</span><span class="cx"> // TextureMapperPlatformLayer::Client
</span><span class="cx"> virtual void platformLayerWillBeDestroyed() override { setContentsToPlatformLayer(0, NoContentsLayer); }
</span><span class="lines">@@ -182,14 +184,10 @@
</span><span class="cx"> bool m_startedAnimation;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline static GraphicsLayerTextureMapper* toGraphicsLayerTextureMapper(GraphicsLayer* layer)
-{
- return static_cast<GraphicsLayerTextureMapper*>(layer);
-}
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-TextureMapperLayer* toTextureMapperLayer(GraphicsLayer*);
</del><ins>+SPECIALIZE_TYPE_TRAITS_GRAPHICSLAYER(WebCore::GraphicsLayerTextureMapper, isGraphicsLayerTextureMapper())
</ins><span class="cx">
</span><del>-}
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #endif // GraphicsLayerTextureMapper_h
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (176172 => 176173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-11-17 06:46:24 UTC (rev 176172)
+++ trunk/Source/WebKit/win/ChangeLog 2014-11-17 06:49:41 UTC (rev 176173)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-11-16 Zan Dobersek <zdobersek@igalia.com>
+
+ [TexMap] Add typecasting support for GraphicsLayerTextureMapper
+ https://bugs.webkit.org/show_bug.cgi?id=138741
+
+ Reviewed by Martin Robinson.
+
+ Switch to using downcast<GraphicsLayerTextureMapper>() and replace
+ uses of toTextureMapperLayer() with downcasting and calling
+ the GraphicsLayerTextureMapper::layer() method.
+
+ * WebCoreSupport/AcceleratedCompositingContext.cpp:
+ (AcceleratedCompositingContext::initialize):
+ (AcceleratedCompositingContext::startedAnimation):
+ (AcceleratedCompositingContext::compositeLayersToContext):
+
</ins><span class="cx"> 2014-11-12 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Have DOMTimer deal with more ScriptExecutionContext references
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportAcceleratedCompositingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp (176172 => 176173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp 2014-11-17 06:46:24 UTC (rev 176172)
+++ trunk/Source/WebKit/win/WebCoreSupport/AcceleratedCompositingContext.cpp 2014-11-17 06:49:41 UTC (rev 176173)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> m_context->makeContextCurrent();
</span><span class="cx">
</span><span class="cx"> m_textureMapper = TextureMapperGL::create(TextureMapper::OpenGLMode);
</span><del>- toTextureMapperLayer(m_rootLayer.get())->setTextureMapper(m_textureMapper.get());
</del><ins>+ downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer()->setTextureMapper(m_textureMapper.get());
</ins><span class="cx">
</span><span class="cx"> scheduleLayerFlush();
</span><span class="cx"> }
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> if (!layer)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (toGraphicsLayerTextureMapper(layer)->startedAnimation())
</del><ins>+ if (downcast<GraphicsLayerTextureMapper>(layer)->startedAnimation())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> for (auto childLayer : layer->children()) {
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_textureMapper->beginPainting();
</span><del>- toTextureMapperLayer(m_rootLayer.get())->paint();
</del><ins>+ downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer()->paint();
</ins><span class="cx"> m_fpsCounter.updateFPSAndDisplay(m_textureMapper.get());
</span><span class="cx"> m_textureMapper->endPainting();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176172 => 176173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-17 06:46:24 UTC (rev 176172)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-17 06:49:41 UTC (rev 176173)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-11-16 Zan Dobersek <zdobersek@igalia.com>
+
+ [TexMap] Add typecasting support for GraphicsLayerTextureMapper
+ https://bugs.webkit.org/show_bug.cgi?id=138741
+
+ Reviewed by Martin Robinson.
+
+ Replace uses of toTextureMapperLayer() with downcasting and
+ calling the GraphicsLayerTextureMapper::layer() method.
+
+ * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
+ (WebKit::LayerTreeHostGtk::initialize):
+ (WebKit::LayerTreeHostGtk::layerFlushTimerFired):
+ (WebKit::LayerTreeHostGtk::compositeLayersToContext):
+
</ins><span class="cx"> 2014-11-16 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Use TextIndicator instead of the built in Lookup highlight
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (176172 => 176173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2014-11-17 06:46:24 UTC (rev 176172)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2014-11-17 06:49:41 UTC (rev 176173)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx">
</span><span class="cx"> m_textureMapper = TextureMapper::create(TextureMapper::OpenGLMode);
</span><span class="cx"> static_cast<TextureMapperGL*>(m_textureMapper.get())->setEnableEdgeDistanceAntialiasing(true);
</span><del>- toTextureMapperLayer(m_rootLayer.get())->setTextureMapper(m_textureMapper.get());
</del><ins>+ downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer()->setTextureMapper(m_textureMapper.get());
</ins><span class="cx">
</span><span class="cx"> // FIXME: Cretae page olverlay layers. https://bugs.webkit.org/show_bug.cgi?id=131433.
</span><span class="cx">
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> {
</span><span class="cx"> flushAndRenderLayers();
</span><span class="cx">
</span><del>- if (!m_layerFlushTimerCallback.isScheduled() && toTextureMapperLayer(m_rootLayer.get())->descendantsOrSelfHaveRunningAnimations()) {
</del><ins>+ if (!m_layerFlushTimerCallback.isScheduled() && downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer()->descendantsOrSelfHaveRunningAnimations()) {
</ins><span class="cx"> const double targetFPS = 60;
</span><span class="cx"> double nextFlush = std::max((1 / targetFPS) - (currentTime() - m_lastFlushTime), 0.0);
</span><span class="cx"> m_layerFlushTimerCallback.scheduleAfterDelay("[WebKit] layerFlushTimer", std::bind(&LayerTreeHostGtk::layerFlushTimerFired, this),
</span><span class="lines">@@ -293,7 +293,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_textureMapper->beginPainting();
</span><del>- toTextureMapperLayer(m_rootLayer.get())->paint();
</del><ins>+ downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer()->paint();
</ins><span class="cx"> m_textureMapper->endPainting();
</span><span class="cx">
</span><span class="cx"> context->swapBuffers();
</span></span></pre>
</div>
</div>
</body>
</html>