<!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>[174602] 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/174602">174602</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-10 10:51:01 -0700 (Fri, 10 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use is<>() / downcast<>() for GraphicsLayer subclasses
https://bugs.webkit.org/show_bug.cgi?id=137595
Reviewed by Darin Adler.
Use is<>() / downcast<>() for GraphicsLayer subclasses and clean up the
surrounding code.
Source/WebCore:
No new tests, no behavior change.
* page/mac/ServicesOverlayController.mm:
(WebCore::ServicesOverlayController::Highlight::Highlight):
(WebCore::ServicesOverlayController::Highlight::fadeIn):
(WebCore::ServicesOverlayController::Highlight::fadeOut):
* platform/graphics/GraphicsLayer.h:
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::removeFromParent):
(WebCore::GraphicsLayerCA::setMaskLayer):
(WebCore::GraphicsLayerCA::recursiveVisibleRectChangeRequiresFlush):
(WebCore::GraphicsLayerCA::recursiveCommitChanges):
(WebCore::GraphicsLayerCA::updateSublayerList):
(WebCore::GraphicsLayerCA::ensureStructuralLayer):
(WebCore::GraphicsLayerCA::updateMaskLayer):
(WebCore::GraphicsLayerCA::replicatedLayerRoot):
(WebCore::GraphicsLayerCA::swapFromOrToTiledLayer):
(WebCore::GraphicsLayerCA::propagateLayerChangeToReplicas):
(WebCore::GraphicsLayerCA::fetchCloneLayers):
* platform/graphics/ca/GraphicsLayerCA.h:
Source/WebKit2:
* WebProcess/WebPage/mac/GraphicsLayerCARemote.h:
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
(WebKit::RemoteLayerTreeDrawingArea::flushLayers):
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::layerForTransientZoom):
(WebKit::TiledCoreAnimationDrawingArea::shadowLayerForTransientZoom):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagemacServicesOverlayControllermm">trunk/Source/WebCore/page/mac/ServicesOverlayController.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerh">trunk/Source/WebCore/platform/graphics/GraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacGraphicsLayerCARemoteh">trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174601 => 174602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-10 17:47:52 UTC (rev 174601)
+++ trunk/Source/WebCore/ChangeLog 2014-10-10 17:51:01 UTC (rev 174602)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2014-10-10 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Use is<>() / downcast<>() for GraphicsLayer subclasses
+ https://bugs.webkit.org/show_bug.cgi?id=137595
+
+ Reviewed by Darin Adler.
+
+ Use is<>() / downcast<>() for GraphicsLayer subclasses and clean up the
+ surrounding code.
+
+ No new tests, no behavior change.
+
+ * page/mac/ServicesOverlayController.mm:
+ (WebCore::ServicesOverlayController::Highlight::Highlight):
+ (WebCore::ServicesOverlayController::Highlight::fadeIn):
+ (WebCore::ServicesOverlayController::Highlight::fadeOut):
+ * platform/graphics/GraphicsLayer.h:
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::removeFromParent):
+ (WebCore::GraphicsLayerCA::setMaskLayer):
+ (WebCore::GraphicsLayerCA::recursiveVisibleRectChangeRequiresFlush):
+ (WebCore::GraphicsLayerCA::recursiveCommitChanges):
+ (WebCore::GraphicsLayerCA::updateSublayerList):
+ (WebCore::GraphicsLayerCA::ensureStructuralLayer):
+ (WebCore::GraphicsLayerCA::updateMaskLayer):
+ (WebCore::GraphicsLayerCA::replicatedLayerRoot):
+ (WebCore::GraphicsLayerCA::swapFromOrToTiledLayer):
+ (WebCore::GraphicsLayerCA::propagateLayerChangeToReplicas):
+ (WebCore::GraphicsLayerCA::fetchCloneLayers):
+ * platform/graphics/ca/GraphicsLayerCA.h:
+
+2014-10-10 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Use is<>() / downcast<>() for RenderBoxModelObject
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137587
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacServicesOverlayControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/ServicesOverlayController.mm (174601 => 174602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/ServicesOverlayController.mm 2014-10-10 17:47:52 UTC (rev 174601)
+++ trunk/Source/WebCore/page/mac/ServicesOverlayController.mm 2014-10-10 17:51:01 UTC (rev 174602)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx">
</span><span class="cx"> // Set directly on the PlatformCALayer so that when we leave the 'from' value implicit
</span><span class="cx"> // in our animations, we get the right initial value regardless of flush timing.
</span><del>- toGraphicsLayerCA(layer())->platformCALayer()->setOpacity(0);
</del><ins>+ downcast<GraphicsLayerCA>(*layer()).platformCALayer()->setOpacity(0);
</ins><span class="cx">
</span><span class="cx"> controller.didCreateHighlight(this);
</span><span class="cx"> }
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> [animation setToValue:@1];
</span><span class="cx">
</span><span class="cx"> RefPtr<PlatformCAAnimation> platformAnimation = PlatformCAAnimationMac::create(animation.get());
</span><del>- toGraphicsLayerCA(layer())->platformCALayer()->addAnimationForKey("FadeHighlightIn", platformAnimation.get());
</del><ins>+ downcast<GraphicsLayerCA>(*layer()).platformCALayer()->addAnimationForKey("FadeHighlightIn", platformAnimation.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ServicesOverlayController::Highlight::fadeOut()
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> }];
</span><span class="cx">
</span><span class="cx"> RefPtr<PlatformCAAnimation> platformAnimation = PlatformCAAnimationMac::create(animation.get());
</span><del>- toGraphicsLayerCA(layer())->platformCALayer()->addAnimationForKey("FadeHighlightOut", platformAnimation.get());
</del><ins>+ downcast<GraphicsLayerCA>(*layer()).platformCALayer()->addAnimationForKey("FadeHighlightOut", platformAnimation.get());
</ins><span class="cx"> [CATransaction commit];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (174601 => 174602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2014-10-10 17:47:52 UTC (rev 174601)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2014-10-10 17:51:01 UTC (rev 174602)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #include "TransformOperations.h"
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><ins>+#include <wtf/TypeCasts.h>
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> #include "GraphicsTypes.h"
</span><span class="lines">@@ -604,11 +605,13 @@
</span><span class="cx"> CustomBehavior m_customBehavior;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#define GRAPHICSLAYER_TYPE_CASTS(ToValueTypeName, predicate) \
- TYPE_CASTS_BASE(ToValueTypeName, WebCore::GraphicsLayer, value, value->predicate, value.predicate)
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+#define SPECIALIZE_TYPE_TRAITS_GRAPHICSLAYER(ToValueTypeName, predicate) \
+SPECIALIZE_TYPE_TRAITS_BEGIN(ToValueTypeName) \
+ static bool isType(const WebCore::GraphicsLayer& layer) { return layer.predicate; } \
+SPECIALIZE_TYPE_TRAITS_END()
+
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> // Outside the WebCore namespace for ease of invocation from gdb.
</span><span class="cx"> void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (174601 => 174602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-10-10 17:47:52 UTC (rev 174601)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-10-10 17:51:01 UTC (rev 174602)
</span><span class="lines">@@ -449,7 +449,7 @@
</span><span class="cx"> void GraphicsLayerCA::removeFromParent()
</span><span class="cx"> {
</span><span class="cx"> if (m_parent)
</span><del>- toGraphicsLayerCA(m_parent)->noteSublayersChanged();
</del><ins>+ downcast<GraphicsLayerCA>(*m_parent).noteSublayersChanged();
</ins><span class="cx"> GraphicsLayer::removeFromParent();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -464,7 +464,7 @@
</span><span class="cx"> propagateLayerChangeToReplicas();
</span><span class="cx">
</span><span class="cx"> if (m_replicatedLayer)
</span><del>- toGraphicsLayerCA(m_replicatedLayer)->propagateLayerChangeToReplicas();
</del><ins>+ downcast<GraphicsLayerCA>(*m_replicatedLayer).propagateLayerChangeToReplicas();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsLayerCA::setReplicatedLayer(GraphicsLayer* layer)
</span><span class="lines">@@ -1015,8 +1015,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_maskLayer) {
</span><del>- GraphicsLayerCA* maskLayerCA = toGraphicsLayerCA(m_maskLayer);
- if (maskLayerCA->recursiveVisibleRectChangeRequiresFlush(localState))
</del><ins>+ GraphicsLayerCA& maskLayerCA = downcast<GraphicsLayerCA>(*m_maskLayer);
+ if (maskLayerCA.recursiveVisibleRectChangeRequiresFlush(localState))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1024,13 +1024,13 @@
</span><span class="cx"> size_t numChildren = childLayers.size();
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < numChildren; ++i) {
</span><del>- GraphicsLayerCA* curChild = toGraphicsLayerCA(childLayers[i]);
- if (curChild->recursiveVisibleRectChangeRequiresFlush(localState))
</del><ins>+ GraphicsLayerCA& currentChild = downcast<GraphicsLayerCA>(*childLayers[i]);
+ if (currentChild.recursiveVisibleRectChangeRequiresFlush(localState))
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_replicaLayer)
</span><del>- if (toGraphicsLayerCA(m_replicaLayer)->recursiveVisibleRectChangeRequiresFlush(localState))
</del><ins>+ if (downcast<GraphicsLayerCA>(*m_replicaLayer).recursiveVisibleRectChangeRequiresFlush(localState))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -1131,7 +1131,7 @@
</span><span class="cx"> m_uncommittedChanges |= VisibleRectChanged;
</span><span class="cx"> m_visibleRect = visibleRect;
</span><span class="cx">
</span><del>- if (GraphicsLayerCA* maskLayer = toGraphicsLayerCA(m_maskLayer)) {
</del><ins>+ if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer)) {
</ins><span class="cx"> // FIXME: this assumes that the mask layer has the same geometry as this layer (which is currently always true).
</span><span class="cx"> maskLayer->m_uncommittedChanges |= VisibleRectChanged;
</span><span class="cx"> maskLayer->m_visibleRect = visibleRect;
</span><span class="lines">@@ -1180,21 +1180,21 @@
</span><span class="cx"> affectedByTransformAnimation = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (GraphicsLayerCA* maskLayer = toGraphicsLayerCA(m_maskLayer))
</del><ins>+ if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer))
</ins><span class="cx"> maskLayer->commitLayerChangesBeforeSublayers(childCommitState, pageScaleFactor, baseRelativePosition, oldVisibleRect);
</span><span class="cx">
</span><span class="cx"> const Vector<GraphicsLayer*>& childLayers = children();
</span><span class="cx"> size_t numChildren = childLayers.size();
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < numChildren; ++i) {
</span><del>- GraphicsLayerCA* curChild = toGraphicsLayerCA(childLayers[i]);
- curChild->recursiveCommitChanges(childCommitState, localState, pageScaleFactor, baseRelativePosition, affectedByPageScale);
</del><ins>+ GraphicsLayerCA& currentChild = downcast<GraphicsLayerCA>(*childLayers[i]);
+ currentChild.recursiveCommitChanges(childCommitState, localState, pageScaleFactor, baseRelativePosition, affectedByPageScale);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (GraphicsLayerCA* replicaLayer = toGraphicsLayerCA(m_replicaLayer))
</del><ins>+ if (GraphicsLayerCA* replicaLayer = downcast<GraphicsLayerCA>(m_replicaLayer))
</ins><span class="cx"> replicaLayer->recursiveCommitChanges(childCommitState, localState, pageScaleFactor, baseRelativePosition, affectedByPageScale);
</span><span class="cx">
</span><del>- if (GraphicsLayerCA* maskLayer = toGraphicsLayerCA(m_maskLayer))
</del><ins>+ if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer))
</ins><span class="cx"> maskLayer->commitLayerChangesAfterSublayers(childCommitState);
</span><span class="cx">
</span><span class="cx"> commitLayerChangesAfterSublayers(childCommitState);
</span><span class="lines">@@ -1425,7 +1425,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_structuralLayer) {
</span><span class="cx"> if (m_replicaLayer)
</span><del>- structuralLayerChildren.append(toGraphicsLayerCA(m_replicaLayer)->primaryLayer());
</del><ins>+ structuralLayerChildren.append(downcast<GraphicsLayerCA>(*m_replicaLayer).primaryLayer());
</ins><span class="cx">
</span><span class="cx"> structuralLayerChildren.append(m_layer);
</span><span class="cx"> }
</span><span class="lines">@@ -1440,8 +1440,8 @@
</span><span class="cx"> const Vector<GraphicsLayer*>& childLayers = children();
</span><span class="cx"> size_t numChildren = childLayers.size();
</span><span class="cx"> for (size_t i = 0; i < numChildren; ++i) {
</span><del>- GraphicsLayerCA* curChild = toGraphicsLayerCA(childLayers[i]);
- PlatformCALayer* childLayer = curChild->layerForSuperlayer();
</del><ins>+ GraphicsLayerCA& currentChild = downcast<GraphicsLayerCA>(*childLayers[i]);
+ PlatformCALayer* childLayer = currentChild.layerForSuperlayer();
</ins><span class="cx"> childListForSublayers.append(childLayer);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1696,7 +1696,7 @@
</span><span class="cx">
</span><span class="cx"> if (purpose == StructuralLayerForPreserves3D) {
</span><span class="cx"> if (m_structuralLayer && m_structuralLayer->layerType() != PlatformCALayer::LayerTypeTransformLayer)
</span><del>- m_structuralLayer = 0;
</del><ins>+ m_structuralLayer = nullptr;
</ins><span class="cx">
</span><span class="cx"> if (!m_structuralLayer) {
</span><span class="cx"> m_structuralLayer = createPlatformCALayer(PlatformCALayer::LayerTypeTransformLayer, this);
</span><span class="lines">@@ -1704,7 +1704,7 @@
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> if (m_structuralLayer && m_structuralLayer->layerType() != PlatformCALayer::LayerTypeLayer)
</span><del>- m_structuralLayer = 0;
</del><ins>+ m_structuralLayer = nullptr;
</ins><span class="cx">
</span><span class="cx"> if (!m_structuralLayer) {
</span><span class="cx"> m_structuralLayer = createPlatformCALayer(PlatformCALayer::LayerTypeLayer, this);
</span><span class="lines">@@ -1719,7 +1719,7 @@
</span><span class="cx">
</span><span class="cx"> // We've changed the layer that our parent added to its sublayer list, so tell it to update
</span><span class="cx"> // sublayers again in its commitLayerChangesAfterSublayers().
</span><del>- toGraphicsLayerCA(parent())->noteSublayersChanged(DontScheduleFlush);
</del><ins>+ downcast<GraphicsLayerCA>(*parent()).noteSublayersChanged(DontScheduleFlush);
</ins><span class="cx">
</span><span class="cx"> // Set properties of m_layer to their default values, since these are expressed on on the structural layer.
</span><span class="cx"> FloatPoint point(m_size.width() / 2.0f, m_size.height() / 2.0f);
</span><span class="lines">@@ -2006,15 +2006,15 @@
</span><span class="cx">
</span><span class="cx"> void GraphicsLayerCA::updateMaskLayer()
</span><span class="cx"> {
</span><del>- PlatformCALayer* maskCALayer = m_maskLayer ? toGraphicsLayerCA(m_maskLayer)->primaryLayer() : 0;
</del><ins>+ PlatformCALayer* maskCALayer = m_maskLayer ? downcast<GraphicsLayerCA>(*m_maskLayer).primaryLayer() : nullptr;
</ins><span class="cx"> m_layer->setMask(maskCALayer);
</span><span class="cx">
</span><del>- LayerMap* maskLayerCloneMap = m_maskLayer ? toGraphicsLayerCA(m_maskLayer)->primaryLayerClones() : 0;
</del><ins>+ LayerMap* maskLayerCloneMap = m_maskLayer ? downcast<GraphicsLayerCA>(*m_maskLayer).primaryLayerClones() : nullptr;
</ins><span class="cx">
</span><span class="cx"> if (LayerMap* layerCloneMap = m_layerClones.get()) {
</span><span class="cx"> LayerMap::const_iterator end = layerCloneMap->end();
</span><span class="cx"> for (LayerMap::const_iterator it = layerCloneMap->begin(); it != end; ++it) {
</span><del>- PlatformCALayer* maskClone = maskLayerCloneMap ? maskLayerCloneMap->get(it->key) : 0;
</del><ins>+ PlatformCALayer* maskClone = maskLayerCloneMap ? maskLayerCloneMap->get(it->key) : nullptr;
</ins><span class="cx"> it->value->setMask(maskClone);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2060,12 +2060,12 @@
</span><span class="cx"> {
</span><span class="cx"> // Limit replica nesting, to avoid 2^N explosion of replica layers.
</span><span class="cx"> if (!m_replicatedLayer || replicaState.replicaDepth() == ReplicaState::maxReplicaDepth)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><del>- GraphicsLayerCA* replicatedLayer = toGraphicsLayerCA(m_replicatedLayer);
</del><ins>+ GraphicsLayerCA& replicatedLayer = downcast<GraphicsLayerCA>(*m_replicatedLayer);
</ins><span class="cx">
</span><del>- RefPtr<PlatformCALayer> clonedLayerRoot = replicatedLayer->fetchCloneLayers(this, replicaState, RootCloneLevel);
- FloatPoint cloneRootPosition = replicatedLayer->positionForCloneRootLayer();
</del><ins>+ RefPtr<PlatformCALayer> clonedLayerRoot = replicatedLayer.fetchCloneLayers(this, replicaState, RootCloneLevel);
+ FloatPoint cloneRootPosition = replicatedLayer.positionForCloneRootLayer();
</ins><span class="cx">
</span><span class="cx"> // Replica root has no offset or transform
</span><span class="cx"> clonedLayerRoot->setPosition(cloneRootPosition);
</span><span class="lines">@@ -2980,7 +2980,7 @@
</span><span class="cx"> // A mask layer's superlayer is the layer that it masks. Set the MaskLayerChanged dirty bit
</span><span class="cx"> // so that the parent will fix up the platform layers in commitLayerChangesAfterSublayers().
</span><span class="cx"> if (GraphicsLayer* parentLayer = parent())
</span><del>- toGraphicsLayerCA(parentLayer)->noteLayerPropertyChanged(MaskLayerChanged);
</del><ins>+ downcast<GraphicsLayerCA>(*parentLayer).noteLayerPropertyChanged(MaskLayerChanged);
</ins><span class="cx"> } else if (oldLayer->superlayer()) {
</span><span class="cx"> // Skip this step if we don't have a superlayer. This is probably a benign
</span><span class="cx"> // case that happens while restructuring the layer tree, and also occurs with
</span><span class="lines">@@ -3119,13 +3119,13 @@
</span><span class="cx">
</span><span class="cx"> void GraphicsLayerCA::propagateLayerChangeToReplicas()
</span><span class="cx"> {
</span><del>- for (GraphicsLayer* currLayer = this; currLayer; currLayer = currLayer->parent()) {
- GraphicsLayerCA* currLayerCA = toGraphicsLayerCA(currLayer);
- if (!currLayerCA->hasCloneLayers())
</del><ins>+ for (GraphicsLayer* currentLayer = this; currentLayer; currentLayer = currentLayer->parent()) {
+ GraphicsLayerCA& currentLayerCA = downcast<GraphicsLayerCA>(*currentLayer);
+ if (!currentLayerCA.hasCloneLayers())
</ins><span class="cx"> break;
</span><span class="cx">
</span><del>- if (currLayerCA->replicaLayer())
- toGraphicsLayerCA(currLayerCA->replicaLayer())->noteLayerPropertyChanged(ReplicatedLayerChanged);
</del><ins>+ if (currentLayerCA.replicaLayer())
+ downcast<GraphicsLayerCA>(*currentLayerCA.replicaLayer()).noteLayerPropertyChanged(ReplicatedLayerChanged);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3138,7 +3138,7 @@
</span><span class="cx"> ensureCloneLayers(replicaState.cloneID(), primaryLayer, structuralLayer, contentsLayer, contentsClippingLayer, cloneLevel);
</span><span class="cx">
</span><span class="cx"> if (m_maskLayer) {
</span><del>- RefPtr<PlatformCALayer> maskClone = toGraphicsLayerCA(m_maskLayer)->fetchCloneLayers(replicaRoot, replicaState, IntermediateCloneLevel);
</del><ins>+ RefPtr<PlatformCALayer> maskClone = downcast<GraphicsLayerCA>(*m_maskLayer).fetchCloneLayers(replicaRoot, replicaState, IntermediateCloneLevel);
</ins><span class="cx"> primaryLayer->setMask(maskClone.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3146,7 +3146,7 @@
</span><span class="cx"> // We are a replica being asked for clones of our layers.
</span><span class="cx"> RefPtr<PlatformCALayer> replicaRoot = replicatedLayerRoot(replicaState);
</span><span class="cx"> if (!replicaRoot)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> if (structuralLayer) {
</span><span class="cx"> structuralLayer->insertSublayer(replicaRoot.get(), 0);
</span><span class="lines">@@ -3165,7 +3165,7 @@
</span><span class="cx"> if (m_replicaLayer && m_replicaLayer != replicaRoot) {
</span><span class="cx"> // We have nested replicas. Ask the replica layer for a clone of its contents.
</span><span class="cx"> replicaState.setBranchType(ReplicaState::ReplicaBranch);
</span><del>- replicaLayer = toGraphicsLayerCA(m_replicaLayer)->fetchCloneLayers(replicaRoot, replicaState, RootCloneLevel);
</del><ins>+ replicaLayer = downcast<GraphicsLayerCA>(*m_replicaLayer).fetchCloneLayers(replicaRoot, replicaState, RootCloneLevel);
</ins><span class="cx"> replicaState.setBranchType(ReplicaState::ChildBranch);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3196,13 +3196,10 @@
</span><span class="cx">
</span><span class="cx"> replicaState.push(ReplicaState::ChildBranch);
</span><span class="cx">
</span><del>- size_t numChildren = childLayers.size();
- for (size_t i = 0; i < numChildren; ++i) {
- GraphicsLayerCA* curChild = toGraphicsLayerCA(childLayers[i]);
-
- RefPtr<PlatformCALayer> childLayer = curChild->fetchCloneLayers(replicaRoot, replicaState, IntermediateCloneLevel);
- if (childLayer)
- clonalSublayers.append(childLayer);
</del><ins>+ for (auto* childLayer : childLayers) {
+ GraphicsLayerCA& childLayerCA = downcast<GraphicsLayerCA>(*childLayer);
+ if (RefPtr<PlatformCALayer> platformLayer = childLayerCA.fetchCloneLayers(replicaRoot, replicaState, IntermediateCloneLevel))
+ clonalSublayers.append(platformLayer.release());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> replicaState.pop();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (174601 => 174602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-10-10 17:47:52 UTC (rev 174601)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-10-10 17:51:01 UTC (rev 174602)
</span><span class="lines">@@ -516,8 +516,8 @@
</span><span class="cx"> bool m_isCommittingChanges;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-GRAPHICSLAYER_TYPE_CASTS(GraphicsLayerCA, isGraphicsLayerCA());
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_GRAPHICSLAYER(WebCore::GraphicsLayerCA, isGraphicsLayerCA())
+
</ins><span class="cx"> #endif // GraphicsLayerCA_h
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (174601 => 174602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-10-10 17:47:52 UTC (rev 174601)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-10 17:51:01 UTC (rev 174602)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-10-10 Chris Dumez <cdumez@apple.com>
+
+ Use is<>() / downcast<>() for GraphicsLayer subclasses
+ https://bugs.webkit.org/show_bug.cgi?id=137595
+
+ Reviewed by Darin Adler.
+
+ Use is<>() / downcast<>() for GraphicsLayer subclasses and clean up the
+ surrounding code.
+
+ * WebProcess/WebPage/mac/GraphicsLayerCARemote.h:
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+ (WebKit::RemoteLayerTreeDrawingArea::flushLayers):
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::layerForTransientZoom):
+ (WebKit::TiledCoreAnimationDrawingArea::shadowLayerForTransientZoom):
+
</ins><span class="cx"> 2014-10-10 Pascal Jacquemart <p.jacquemart@samsung.com>
</span><span class="cx">
</span><span class="cx"> Fix debug build on EFL after r174584
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacGraphicsLayerCARemoteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h (174601 => 174602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h 2014-10-10 17:47:52 UTC (rev 174601)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h 2014-10-10 17:51:01 UTC (rev 174602)
</span><span class="lines">@@ -58,8 +58,8 @@
</span><span class="cx"> RemoteLayerTreeContext& m_context;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-GRAPHICSLAYER_TYPE_CASTS(GraphicsLayerCARemote, isGraphicsLayerCARemote());
-
</del><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_GRAPHICSLAYER(WebKit::GraphicsLayerCARemote, isGraphicsLayerCARemote())
+
</ins><span class="cx"> #endif // GraphicsLayerCARemote_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (174601 => 174602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2014-10-10 17:47:52 UTC (rev 174601)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2014-10-10 17:51:01 UTC (rev 174602)
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx"> RemoteLayerTreeTransaction layerTransaction;
</span><span class="cx"> layerTransaction.setTransactionID(takeNextTransactionID());
</span><span class="cx"> layerTransaction.setCallbackIDs(WTF::move(m_pendingCallbackIDs));
</span><del>- m_remoteLayerTreeContext->buildTransaction(layerTransaction, *toGraphicsLayerCARemote(m_rootLayer.get())->platformCALayer());
</del><ins>+ m_remoteLayerTreeContext->buildTransaction(layerTransaction, *downcast<GraphicsLayerCARemote>(*m_rootLayer).platformCALayer());
</ins><span class="cx"> backingStoreCollection.willCommitLayerTree(layerTransaction);
</span><span class="cx"> m_webPage.willCommitLayerTree(layerTransaction);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (174601 => 174602)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2014-10-10 17:47:52 UTC (rev 174601)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2014-10-10 17:51:01 UTC (rev 174602)
</span><span class="lines">@@ -537,9 +537,9 @@
</span><span class="cx"> RenderLayerBacking* renderViewBacking = m_webPage.mainFrameView()->renderView()->layer()->backing();
</span><span class="cx">
</span><span class="cx"> if (GraphicsLayer* contentsContainmentLayer = renderViewBacking->contentsContainmentLayer())
</span><del>- return toGraphicsLayerCA(contentsContainmentLayer)->platformCALayer();
</del><ins>+ return downcast<GraphicsLayerCA>(*contentsContainmentLayer).platformCALayer();
</ins><span class="cx">
</span><del>- return toGraphicsLayerCA(renderViewBacking->graphicsLayer())->platformCALayer();
</del><ins>+ return downcast<GraphicsLayerCA>(*renderViewBacking->graphicsLayer()).platformCALayer();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PlatformCALayer* TiledCoreAnimationDrawingArea::shadowLayerForTransientZoom() const
</span><span class="lines">@@ -547,7 +547,7 @@
</span><span class="cx"> RenderLayerCompositor& renderLayerCompositor = m_webPage.mainFrameView()->renderView()->compositor();
</span><span class="cx">
</span><span class="cx"> if (GraphicsLayer* shadowGraphicsLayer = renderLayerCompositor.layerForContentShadow())
</span><del>- return toGraphicsLayerCA(shadowGraphicsLayer)->platformCALayer();
</del><ins>+ return downcast<GraphicsLayerCA>(*shadowGraphicsLayer).platformCALayer();
</ins><span class="cx">
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>