<!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>[203157] 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/203157">203157</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-13 04:00:43 -0700 (Wed, 13 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Coordinated Graphics] Remove toCoordinatedGraphicsLayer and use downcast instead
https://bugs.webkit.org/show_bug.cgi?id=159469
Reviewed by Michael Catanzaro.
Source/WebCore:
* page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp:
(WebCore::ScrollingCoordinatorCoordinatedGraphics::detachFromStateTree):
(WebCore::ScrollingCoordinatorCoordinatedGraphics::updateViewportConstrainedNode):
(WebCore::ScrollingCoordinatorCoordinatedGraphics::scrollableAreaScrollLayerDidChange):
(WebCore::ScrollingCoordinatorCoordinatedGraphics::willDestroyScrollableArea):
* platform/graphics/GraphicsLayer.h:
(WebCore::GraphicsLayer::isCoordinatedGraphicsLayer):
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
(WebCore::toCoordinatedLayerID):
(WebCore::CoordinatedGraphicsLayer::setShouldUpdateVisibleRect):
(WebCore::CoordinatedGraphicsLayer::removeFromParent):
(WebCore::CoordinatedGraphicsLayer::setMaskLayer):
(WebCore::CoordinatedGraphicsLayer::flushCompositingState):
(WebCore::CoordinatedGraphicsLayer::syncPendingStateChangesIncludingSubLayers):
(WebCore::CoordinatedGraphicsLayer::findFirstDescendantWithContentsRecursively):
(WebCore::CoordinatedGraphicsLayer::updateContentBuffersIncludingSubLayers):
(WebCore::CoordinatedGraphicsLayer::computeTransformedVisibleRect):
(WebCore::CoordinatedGraphicsLayer::selfOrAncestorHasActiveTransformAnimation):
(WebCore::CoordinatedGraphicsLayer::selfOrAncestorHaveNonAffineTransforms):
(WebCore::toCoordinatedGraphicsLayer): Deleted.
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:
Source/WebKit2:
* WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp:
(WebKit::CompositingCoordinator::flushPendingLayerChanges):
(WebKit::CompositingCoordinator::initializeRootCompositingLayerIfNeeded):
(WebKit::CompositingCoordinator::mainContentsLayer):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagescrollingcoordinatedgraphicsScrollingCoordinatorCoordinatedGraphicscpp">trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerh">trunk/Source/WebCore/platform/graphics/GraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayerh">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCompositingCoordinatorcpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHostcpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203156 => 203157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-13 10:22:33 UTC (rev 203156)
+++ trunk/Source/WebCore/ChangeLog 2016-07-13 11:00:43 UTC (rev 203157)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-07-13 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [Coordinated Graphics] Remove toCoordinatedGraphicsLayer and use downcast instead
+ https://bugs.webkit.org/show_bug.cgi?id=159469
+
+ Reviewed by Michael Catanzaro.
+
+ * page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp:
+ (WebCore::ScrollingCoordinatorCoordinatedGraphics::detachFromStateTree):
+ (WebCore::ScrollingCoordinatorCoordinatedGraphics::updateViewportConstrainedNode):
+ (WebCore::ScrollingCoordinatorCoordinatedGraphics::scrollableAreaScrollLayerDidChange):
+ (WebCore::ScrollingCoordinatorCoordinatedGraphics::willDestroyScrollableArea):
+ * platform/graphics/GraphicsLayer.h:
+ (WebCore::GraphicsLayer::isCoordinatedGraphicsLayer):
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+ (WebCore::toCoordinatedLayerID):
+ (WebCore::CoordinatedGraphicsLayer::setShouldUpdateVisibleRect):
+ (WebCore::CoordinatedGraphicsLayer::removeFromParent):
+ (WebCore::CoordinatedGraphicsLayer::setMaskLayer):
+ (WebCore::CoordinatedGraphicsLayer::flushCompositingState):
+ (WebCore::CoordinatedGraphicsLayer::syncPendingStateChangesIncludingSubLayers):
+ (WebCore::CoordinatedGraphicsLayer::findFirstDescendantWithContentsRecursively):
+ (WebCore::CoordinatedGraphicsLayer::updateContentBuffersIncludingSubLayers):
+ (WebCore::CoordinatedGraphicsLayer::computeTransformedVisibleRect):
+ (WebCore::CoordinatedGraphicsLayer::selfOrAncestorHasActiveTransformAnimation):
+ (WebCore::CoordinatedGraphicsLayer::selfOrAncestorHaveNonAffineTransforms):
+ (WebCore::toCoordinatedGraphicsLayer): Deleted.
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:
+
</ins><span class="cx"> 2016-07-12 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Fetch API] isRedirected should be conveyed in workers
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingcoordinatedgraphicsScrollingCoordinatorCoordinatedGraphicscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp (203156 => 203157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp 2016-07-13 10:22:33 UTC (rev 203156)
+++ trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp 2016-07-13 11:00:43 UTC (rev 203157)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> {
</span><span class="cx"> ScrollingStateNode* node = m_scrollingStateTree->stateNodeForID(nodeID);
</span><span class="cx"> if (node && node->nodeType() == FixedNode)
</span><del>- toCoordinatedGraphicsLayer(node->layer())->setFixedToViewport(false);
</del><ins>+ downcast<CoordinatedGraphicsLayer>(*static_cast<GraphicsLayer*>(node->layer())).setFixedToViewport(false);
</ins><span class="cx">
</span><span class="cx"> m_scrollingStateTree->detachNode(nodeID);
</span><span class="cx"> }
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx">
</span><span class="cx"> switch (constraints.constraintType()) {
</span><span class="cx"> case ViewportConstraints::FixedPositionConstraint: {
</span><del>- toCoordinatedGraphicsLayer(graphicsLayer)->setFixedToViewport(true); // FIXME : Use constraints!
</del><ins>+ downcast<CoordinatedGraphicsLayer>(*graphicsLayer).setFixedToViewport(true);
</ins><span class="cx"> downcast<ScrollingStateFixedNode>(*node).setLayer(graphicsLayer);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx">
</span><span class="cx"> void ScrollingCoordinatorCoordinatedGraphics::scrollableAreaScrollLayerDidChange(ScrollableArea& scrollableArea)
</span><span class="cx"> {
</span><del>- CoordinatedGraphicsLayer* layer = toCoordinatedGraphicsLayer(scrollLayerForScrollableArea(scrollableArea));
</del><ins>+ CoordinatedGraphicsLayer* layer = downcast<CoordinatedGraphicsLayer>(scrollLayerForScrollableArea(scrollableArea));
</ins><span class="cx"> if (!layer)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx">
</span><span class="cx"> void ScrollingCoordinatorCoordinatedGraphics::willDestroyScrollableArea(ScrollableArea& scrollableArea)
</span><span class="cx"> {
</span><del>- CoordinatedGraphicsLayer* layer = toCoordinatedGraphicsLayer(scrollLayerForScrollableArea(scrollableArea));
</del><ins>+ CoordinatedGraphicsLayer* layer = downcast<CoordinatedGraphicsLayer>(scrollLayerForScrollableArea(scrollableArea));
</ins><span class="cx"> if (!layer)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (203156 => 203157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2016-07-13 10:22:33 UTC (rev 203156)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2016-07-13 11:00:43 UTC (rev 203157)
</span><span class="lines">@@ -551,6 +551,7 @@
</span><span class="cx"> virtual bool isGraphicsLayerCA() const { return false; }
</span><span class="cx"> virtual bool isGraphicsLayerCARemote() const { return false; }
</span><span class="cx"> virtual bool isGraphicsLayerTextureMapper() const { return false; }
</span><ins>+ virtual bool isCoordinatedGraphicsLayer() const { return false; }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> WEBCORE_EXPORT explicit GraphicsLayer(Type, GraphicsLayerClient&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (203156 => 203157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2016-07-13 10:22:33 UTC (rev 203156)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2016-07-13 11:00:43 UTC (rev 203157)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> static CoordinatedLayerID toCoordinatedLayerID(GraphicsLayer* layer)
</span><span class="cx"> {
</span><del>- return layer ? toCoordinatedGraphicsLayer(layer)->id() : 0;
</del><ins>+ return is<CoordinatedGraphicsLayer>(layer) ? downcast<CoordinatedGraphicsLayer>(*layer).id() : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CoordinatedGraphicsLayer::notifyFlushRequired()
</span><span class="lines">@@ -99,9 +99,9 @@
</span><span class="cx"> {
</span><span class="cx"> m_shouldUpdateVisibleRect = true;
</span><span class="cx"> for (auto& child : children())
</span><del>- toCoordinatedGraphicsLayer(child)->setShouldUpdateVisibleRect();
</del><ins>+ downcast<CoordinatedGraphicsLayer>(*child).setShouldUpdateVisibleRect();
</ins><span class="cx"> if (replicaLayer())
</span><del>- toCoordinatedGraphicsLayer(replicaLayer())->setShouldUpdateVisibleRect();
</del><ins>+ downcast<CoordinatedGraphicsLayer>(*replicaLayer()).setShouldUpdateVisibleRect();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsLayer::didChangeGeometry()
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsLayer::removeFromParent()
</span><span class="cx"> {
</span><del>- if (CoordinatedGraphicsLayer* parentLayer = toCoordinatedGraphicsLayer(parent()))
</del><ins>+ if (CoordinatedGraphicsLayer* parentLayer = downcast<CoordinatedGraphicsLayer>(parent()))
</ins><span class="cx"> parentLayer->didChangeChildren();
</span><span class="cx"> GraphicsLayer::removeFromParent();
</span><span class="cx"> }
</span><span class="lines">@@ -503,10 +503,10 @@
</span><span class="cx">
</span><span class="cx"> layer->setSize(size());
</span><span class="cx"> layer->setContentsVisible(contentsAreVisible());
</span><del>- CoordinatedGraphicsLayer* coordinatedLayer = toCoordinatedGraphicsLayer(layer);
- coordinatedLayer->didChangeLayerState();
</del><ins>+ auto& coordinatedLayer = downcast<CoordinatedGraphicsLayer>(*layer);
+ coordinatedLayer.didChangeLayerState();
</ins><span class="cx">
</span><del>- m_layerState.mask = coordinatedLayer->id();
</del><ins>+ m_layerState.mask = coordinatedLayer.id();
</ins><span class="cx"> m_layerState.maskChanged = true;
</span><span class="cx">
</span><span class="cx"> didChangeLayerState();
</span><span class="lines">@@ -590,10 +590,10 @@
</span><span class="cx"> if (notifyFlushRequired())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (CoordinatedGraphicsLayer* mask = toCoordinatedGraphicsLayer(maskLayer()))
</del><ins>+ if (CoordinatedGraphicsLayer* mask = downcast<CoordinatedGraphicsLayer>(maskLayer()))
</ins><span class="cx"> mask->flushCompositingStateForThisLayerOnly(viewportIsStable);
</span><span class="cx">
</span><del>- if (CoordinatedGraphicsLayer* replica = toCoordinatedGraphicsLayer(replicaLayer()))
</del><ins>+ if (CoordinatedGraphicsLayer* replica = downcast<CoordinatedGraphicsLayer>(replicaLayer()))
</ins><span class="cx"> replica->flushCompositingStateForThisLayerOnly(viewportIsStable);
</span><span class="cx">
</span><span class="cx"> flushCompositingStateForThisLayerOnly(viewportIsStable);
</span><span class="lines">@@ -602,11 +602,6 @@
</span><span class="cx"> child->flushCompositingState(rect, viewportIsStable);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CoordinatedGraphicsLayer* toCoordinatedGraphicsLayer(GraphicsLayer* layer)
-{
- return static_cast<CoordinatedGraphicsLayer*>(layer);
-}
-
</del><span class="cx"> void CoordinatedGraphicsLayer::syncChildren()
</span><span class="cx"> {
</span><span class="cx"> if (!m_shouldSyncChildren)
</span><span class="lines">@@ -811,10 +806,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (maskLayer())
</span><del>- toCoordinatedGraphicsLayer(maskLayer())->syncPendingStateChangesIncludingSubLayers();
</del><ins>+ downcast<CoordinatedGraphicsLayer>(*maskLayer()).syncPendingStateChangesIncludingSubLayers();
</ins><span class="cx">
</span><span class="cx"> for (auto& child : children())
</span><del>- toCoordinatedGraphicsLayer(child)->syncPendingStateChangesIncludingSubLayers();
</del><ins>+ downcast<CoordinatedGraphicsLayer>(*child).syncPendingStateChangesIncludingSubLayers();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsLayer::resetLayerState()
</span><span class="lines">@@ -850,12 +845,11 @@
</span><span class="cx"> return this;
</span><span class="cx">
</span><span class="cx"> for (auto& child : children()) {
</span><del>- CoordinatedGraphicsLayer* layer = toCoordinatedGraphicsLayer(child)->findFirstDescendantWithContentsRecursively();
- if (layer)
</del><ins>+ if (CoordinatedGraphicsLayer* layer = downcast<CoordinatedGraphicsLayer>(*child).findFirstDescendantWithContentsRecursively())
</ins><span class="cx"> return layer;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsLayer::setVisibleContentRectTrajectoryVector(const FloatPoint& trajectoryVector)
</span><span class="lines">@@ -989,16 +983,16 @@
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsLayer::updateContentBuffersIncludingSubLayers()
</span><span class="cx"> {
</span><del>- if (CoordinatedGraphicsLayer* mask = toCoordinatedGraphicsLayer(maskLayer()))
</del><ins>+ if (CoordinatedGraphicsLayer* mask = downcast<CoordinatedGraphicsLayer>(maskLayer()))
</ins><span class="cx"> mask->updateContentBuffers();
</span><span class="cx">
</span><del>- if (CoordinatedGraphicsLayer* replica = toCoordinatedGraphicsLayer(replicaLayer()))
</del><ins>+ if (CoordinatedGraphicsLayer* replica = downcast<CoordinatedGraphicsLayer>(replicaLayer()))
</ins><span class="cx"> replica->updateContentBuffers();
</span><span class="cx">
</span><span class="cx"> updateContentBuffers();
</span><span class="cx">
</span><span class="cx"> for (auto& child : children())
</span><del>- toCoordinatedGraphicsLayer(child)->updateContentBuffersIncludingSubLayers();
</del><ins>+ downcast<CoordinatedGraphicsLayer>(*child).updateContentBuffersIncludingSubLayers();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsLayer::updateContentBuffers()
</span><span class="lines">@@ -1134,7 +1128,7 @@
</span><span class="cx">
</span><span class="cx"> m_layerTransform.setFlattening(!preserves3D());
</span><span class="cx"> m_layerTransform.setChildrenTransform(childrenTransform());
</span><del>- m_layerTransform.combineTransforms(parent() ? toCoordinatedGraphicsLayer(parent())->m_layerTransform.combinedForChildren() : TransformationMatrix());
</del><ins>+ m_layerTransform.combineTransforms(parent() ? downcast<CoordinatedGraphicsLayer>(*parent()).m_layerTransform.combinedForChildren() : TransformationMatrix());
</ins><span class="cx">
</span><span class="cx"> m_cachedInverseTransform = m_layerTransform.combined().inverse().valueOr(TransformationMatrix());
</span><span class="cx">
</span><span class="lines">@@ -1155,7 +1149,7 @@
</span><span class="cx"> if (!parent())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return toCoordinatedGraphicsLayer(parent())->selfOrAncestorHasActiveTransformAnimation();
</del><ins>+ return downcast<CoordinatedGraphicsLayer>(*parent()).selfOrAncestorHasActiveTransformAnimation();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CoordinatedGraphicsLayer::selfOrAncestorHaveNonAffineTransforms()
</span><span class="lines">@@ -1169,7 +1163,7 @@
</span><span class="cx"> if (!parent())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return toCoordinatedGraphicsLayer(parent())->selfOrAncestorHaveNonAffineTransforms();
</del><ins>+ return downcast<CoordinatedGraphicsLayer>(*parent()).selfOrAncestorHaveNonAffineTransforms();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CoordinatedGraphicsLayer::addAnimation(const KeyframeValueList& valueList, const FloatSize& boxSize, const Animation* anim, const String& keyframesName, double delayAsNegativeTimeOffset)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h (203156 => 203157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h 2016-07-13 10:22:33 UTC (rev 203156)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h 2016-07-13 11:00:43 UTC (rev 203157)
</span><span class="lines">@@ -149,6 +149,8 @@
</span><span class="cx"> CoordinatedGraphicsLayer* findFirstDescendantWithContentsRecursively();
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ bool isCoordinatedGraphicsLayer() const override { return true; }
+
</ins><span class="cx"> #if USE(GRAPHICS_SURFACE)
</span><span class="cx"> enum PendingPlatformLayerOperation {
</span><span class="cx"> None = 0x00,
</span><span class="lines">@@ -255,9 +257,10 @@
</span><span class="cx"> ScrollableArea* m_scrollableArea;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-CoordinatedGraphicsLayer* toCoordinatedGraphicsLayer(GraphicsLayer*);
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-} // namespace WebCore
</del><ins>+SPECIALIZE_TYPE_TRAITS_GRAPHICSLAYER(WebCore::CoordinatedGraphicsLayer, isCoordinatedGraphicsLayer())
+
</ins><span class="cx"> #endif // USE(COORDINATED_GRAPHICS)
</span><span class="cx">
</span><span class="cx"> #endif // CoordinatedGraphicsLayer_h
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (203156 => 203157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-07-13 10:22:33 UTC (rev 203156)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-13 11:00:43 UTC (rev 203157)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-07-13 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [Coordinated Graphics] Remove toCoordinatedGraphicsLayer and use downcast instead
+ https://bugs.webkit.org/show_bug.cgi?id=159469
+
+ Reviewed by Michael Catanzaro.
+
+ * WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp:
+ (WebKit::CompositingCoordinator::flushPendingLayerChanges):
+ (WebKit::CompositingCoordinator::initializeRootCompositingLayerIfNeeded):
+ (WebKit::CompositingCoordinator::mainContentsLayer):
+
+2016-07-13 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] WebKitGtk+ uses too many file descriptors
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152316
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCompositingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp (203156 => 203157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp 2016-07-13 10:22:33 UTC (rev 203156)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp 2016-07-13 11:00:43 UTC (rev 203157)
</span><span class="lines">@@ -106,8 +106,9 @@
</span><span class="cx">
</span><span class="cx"> bool didSync = m_page->mainFrame().view()->flushCompositingStateIncludingSubframes();
</span><span class="cx">
</span><del>- toCoordinatedGraphicsLayer(m_rootLayer.get())->updateContentBuffersIncludingSubLayers();
- toCoordinatedGraphicsLayer(m_rootLayer.get())->syncPendingStateChangesIncludingSubLayers();
</del><ins>+ auto& coordinatedLayer = downcast<CoordinatedGraphicsLayer>(*m_rootLayer);
+ coordinatedLayer.updateContentBuffersIncludingSubLayers();
+ coordinatedLayer.syncPendingStateChangesIncludingSubLayers();
</ins><span class="cx">
</span><span class="cx"> flushPendingImageBackingChanges();
</span><span class="cx">
</span><span class="lines">@@ -177,7 +178,7 @@
</span><span class="cx"> if (m_didInitializeRootCompositingLayer)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_state.rootCompositingLayer = toCoordinatedGraphicsLayer(m_rootLayer.get())->id();
</del><ins>+ m_state.rootCompositingLayer = downcast<CoordinatedGraphicsLayer>(*m_rootLayer).id();
</ins><span class="cx"> m_didInitializeRootCompositingLayer = true;
</span><span class="cx"> m_shouldSyncFrame = true;
</span><span class="cx"> }
</span><span class="lines">@@ -302,10 +303,10 @@
</span><span class="cx">
</span><span class="cx"> CoordinatedGraphicsLayer* CompositingCoordinator::mainContentsLayer()
</span><span class="cx"> {
</span><del>- if (!m_rootCompositingLayer)
- return 0;
</del><ins>+ if (!is<CoordinatedGraphicsLayer>(m_rootCompositingLayer))
+ return nullptr;
</ins><span class="cx">
</span><del>- return toCoordinatedGraphicsLayer(m_rootCompositingLayer)->findFirstDescendantWithContentsRecursively();
</del><ins>+ return downcast<CoordinatedGraphicsLayer>(*m_rootCompositingLayer).findFirstDescendantWithContentsRecursively();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CompositingCoordinator::setVisibleContentsRect(const FloatRect& rect, const FloatPoint& trajectoryVector)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp (203156 => 203157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2016-07-13 10:22:33 UTC (rev 203156)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2016-07-13 11:00:43 UTC (rev 203157)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_coordinator.createRootLayer(m_webPage.size());
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</span><del>- m_layerTreeContext.contextID = toCoordinatedGraphicsLayer(m_coordinator.rootLayer())->id();
</del><ins>+ m_layerTreeContext.contextID = downcast<CoordinatedGraphicsLayer>(*m_coordinator.rootLayer()).id();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> CoordinatedSurface::setFactory(createCoordinatedSurface);
</span></span></pre>
</div>
</div>
</body>
</html>