<!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>[159967] trunk/Source/WebKit2</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/159967">159967</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2013-12-02 14:42:34 -0800 (Mon, 02 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remote Layer Tree: Support cloning layers
https://bugs.webkit.org/show_bug.cgi?id=124874
<rdar://problem/15349468>
Reviewed by Simon Fraser.
We use PlatformCALayer::clone for CSS reflections, so implement it.
Also, since many reflections testcases also use masks,
working on this revealed that masks weren't working, because
we weren't flushing mask layers.
* Shared/mac/RemoteLayerTreePropertyApplier.mm:
(WebKit::RemoteLayerTreePropertyApplier::applyPropertiesToLayer):
* Shared/mac/RemoteLayerTreeTransaction.mm:
(WebKit::RemoteLayerTreeTransaction::LayerProperties::LayerProperties):
(WebKit::RemoteLayerTreeTransaction::LayerProperties::encode):
(WebKit::RemoteLayerTreeTransaction::LayerProperties::decode):
Rename maskLayer->maskLayerID since it's a LayerID.
* UIProcess/mac/RemoteLayerTreeHost.mm:
(WebKit::RemoteLayerTreeHost::commit):
Don't try to look up the layer if it's null.
* Shared/mac/RemoteLayerTreeTransaction.h:
(WebKit::RemoteLayerTreeTransaction::LayerProperties::notePropertiesChanged):
* Shared/mac/RemoteLayerTreeTransaction.mm:
(WebKit::RemoteLayerTreeTransaction::LayerProperties::LayerProperties):
Keep track of all properties that have ever been changed on a layer.
* WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
(PlatformCALayerRemote::create):
(PlatformCALayerRemote::PlatformCALayerRemote):
(PlatformCALayerRemote::clone):
Copy all of the layer properties from the original to the clone,
and mark all properties that have ever been modified as
needing to be flushed to the UI process.
(PlatformCALayerRemote::recursiveBuildTransaction):
Flush our mask layer, if we have one.
(PlatformCALayerRemote::setMask):
* WebProcess/WebPage/mac/PlatformCALayerRemote.h:
Store the mask layer we're given. Our owning GraphicsLayer will
hold on to it for us.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerTreePropertyAppliermm">trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionh">trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionmm">trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacRemoteLayerTreeHostmm">trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemotecpp">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteh">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (159966 => 159967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-02 22:36:07 UTC (rev 159966)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-02 22:42:34 UTC (rev 159967)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2013-12-02 Tim Horton <timothy_horton@apple.com>
+
+ Remote Layer Tree: Support cloning layers
+ https://bugs.webkit.org/show_bug.cgi?id=124874
+ <rdar://problem/15349468>
+
+ Reviewed by Simon Fraser.
+
+ We use PlatformCALayer::clone for CSS reflections, so implement it.
+
+ Also, since many reflections testcases also use masks,
+ working on this revealed that masks weren't working, because
+ we weren't flushing mask layers.
+
+ * Shared/mac/RemoteLayerTreePropertyApplier.mm:
+ (WebKit::RemoteLayerTreePropertyApplier::applyPropertiesToLayer):
+ * Shared/mac/RemoteLayerTreeTransaction.mm:
+ (WebKit::RemoteLayerTreeTransaction::LayerProperties::LayerProperties):
+ (WebKit::RemoteLayerTreeTransaction::LayerProperties::encode):
+ (WebKit::RemoteLayerTreeTransaction::LayerProperties::decode):
+ Rename maskLayer->maskLayerID since it's a LayerID.
+
+ * UIProcess/mac/RemoteLayerTreeHost.mm:
+ (WebKit::RemoteLayerTreeHost::commit):
+ Don't try to look up the layer if it's null.
+
+ * Shared/mac/RemoteLayerTreeTransaction.h:
+ (WebKit::RemoteLayerTreeTransaction::LayerProperties::notePropertiesChanged):
+ * Shared/mac/RemoteLayerTreeTransaction.mm:
+ (WebKit::RemoteLayerTreeTransaction::LayerProperties::LayerProperties):
+ Keep track of all properties that have ever been changed on a layer.
+
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
+ (PlatformCALayerRemote::create):
+ (PlatformCALayerRemote::PlatformCALayerRemote):
+ (PlatformCALayerRemote::clone):
+ Copy all of the layer properties from the original to the clone,
+ and mark all properties that have ever been modified as
+ needing to be flushed to the UI process.
+
+ (PlatformCALayerRemote::recursiveBuildTransaction):
+ Flush our mask layer, if we have one.
+
+ (PlatformCALayerRemote::setMask):
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.h:
+ Store the mask layer we're given. Our owning GraphicsLayer will
+ hold on to it for us.
+
</ins><span class="cx"> 2013-12-02 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> WKPageLoaderClient should be versioned
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerTreePropertyAppliermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm (159966 => 159967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm 2013-12-02 22:36:07 UTC (rev 159966)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm 2013-12-02 22:42:34 UTC (rev 159967)
</span><span class="lines">@@ -116,10 +116,14 @@
</span><span class="cx"> layer.opaque = properties.opaque;
</span><span class="cx">
</span><span class="cx"> if (properties.changedProperties & RemoteLayerTreeTransaction::MaskLayerChanged) {
</span><del>- CALayer *maskLayer = relatedLayers.get(properties.maskLayer);
- ASSERT(!maskLayer.superlayer);
- if (!maskLayer.superlayer)
- layer.mask = maskLayer;
</del><ins>+ if (!properties.maskLayerID)
+ layer.mask = nullptr;
+ else {
+ CALayer *maskLayer = relatedLayers.get(properties.maskLayerID);
+ ASSERT(!maskLayer.superlayer);
+ if (!maskLayer.superlayer)
+ layer.mask = maskLayer;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (properties.changedProperties & RemoteLayerTreeTransaction::ContentsRectChanged)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h (159966 => 159967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h 2013-12-02 22:36:07 UTC (rev 159966)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h 2013-12-02 22:42:34 UTC (rev 159967)
</span><span class="lines">@@ -97,9 +97,14 @@
</span><span class="cx"> void encode(CoreIPC::ArgumentEncoder&) const;
</span><span class="cx"> static bool decode(CoreIPC::ArgumentDecoder&, LayerProperties&);
</span><span class="cx">
</span><del>- void notePropertiesChanged(LayerChange layerChanges) { changedProperties = static_cast<LayerChange>(changedProperties | layerChanges); }
</del><ins>+ void notePropertiesChanged(LayerChange layerChanges)
+ {
+ changedProperties = static_cast<LayerChange>(changedProperties | layerChanges);
+ everChangedProperties = static_cast<LayerChange>(everChangedProperties | layerChanges);
+ }
</ins><span class="cx">
</span><span class="cx"> LayerChange changedProperties;
</span><ins>+ LayerChange everChangedProperties;
</ins><span class="cx">
</span><span class="cx"> String name;
</span><span class="cx"> Vector<LayerID> children;
</span><span class="lines">@@ -117,7 +122,7 @@
</span><span class="cx"> bool doubleSided;
</span><span class="cx"> bool masksToBounds;
</span><span class="cx"> bool opaque;
</span><del>- LayerID maskLayer;
</del><ins>+ LayerID maskLayerID;
</ins><span class="cx"> WebCore::FloatRect contentsRect;
</span><span class="cx"> float contentsScale;
</span><span class="cx"> WebCore::PlatformCALayer::FilterType minificationFilter;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm (159966 => 159967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2013-12-02 22:36:07 UTC (rev 159966)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2013-12-02 22:42:34 UTC (rev 159967)
</span><span class="lines">@@ -70,6 +70,7 @@
</span><span class="cx">
</span><span class="cx"> RemoteLayerTreeTransaction::LayerProperties::LayerProperties()
</span><span class="cx"> : changedProperties(NoChange)
</span><ins>+ , everChangedProperties(NoChange)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -126,7 +127,7 @@
</span><span class="cx"> encoder << opaque;
</span><span class="cx">
</span><span class="cx"> if (changedProperties & MaskLayerChanged)
</span><del>- encoder << maskLayer;
</del><ins>+ encoder << maskLayerID;
</ins><span class="cx">
</span><span class="cx"> if (changedProperties & ContentsRectChanged)
</span><span class="cx"> encoder << contentsRect;
</span><span class="lines">@@ -247,7 +248,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (result.changedProperties & MaskLayerChanged) {
</span><del>- if (!decoder.decode(result.maskLayer))
</del><ins>+ if (!decoder.decode(result.maskLayerID))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -609,7 +610,7 @@
</span><span class="cx"> dumpProperty<bool>(ts, "opaque", layerProperties.opaque);
</span><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::MaskLayerChanged)
</span><del>- dumpProperty<RemoteLayerTreeTransaction::LayerID>(ts, "maskLayer", layerProperties.maskLayer);
</del><ins>+ dumpProperty<RemoteLayerTreeTransaction::LayerID>(ts, "maskLayer", layerProperties.maskLayerID);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::ContentsRectChanged)
</span><span class="cx"> dumpProperty<FloatRect>(ts, "contentsRect", layerProperties.contentsRect);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacRemoteLayerTreeHostmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm (159966 => 159967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2013-12-02 22:36:07 UTC (rev 159966)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2013-12-02 22:42:34 UTC (rev 159967)
</span><span class="lines">@@ -80,8 +80,8 @@
</span><span class="cx"> relatedLayers.set(child, getLayer(child));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (properties.changedProperties & RemoteLayerTreeTransaction::MaskLayerChanged)
- relatedLayers.set(properties.maskLayer, getLayer(properties.maskLayer));
</del><ins>+ if (properties.changedProperties & RemoteLayerTreeTransaction::MaskLayerChanged && properties.maskLayerID)
+ relatedLayers.set(properties.maskLayerID, getLayer(properties.maskLayerID));
</ins><span class="cx">
</span><span class="cx"> RemoteLayerTreePropertyApplier::applyPropertiesToLayer(layer, properties, relatedLayers);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemotecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (159966 => 159967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2013-12-02 22:36:07 UTC (rev 159966)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2013-12-02 22:42:34 UTC (rev 159967)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> return static_cast<PlatformCALayerRemote*>(layer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<PlatformCALayer> PlatformCALayerRemote::create(LayerType layerType, PlatformCALayerClient* owner, RemoteLayerTreeContext* context)
</del><ins>+PassRefPtr<PlatformCALayerRemote> PlatformCALayerRemote::create(LayerType layerType, PlatformCALayerClient* owner, RemoteLayerTreeContext* context)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<PlatformCALayerRemote> layer;
</span><span class="cx">
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> return layer.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<PlatformCALayer> PlatformCALayerRemote::create(PlatformLayer *platformLayer, PlatformCALayerClient* owner, RemoteLayerTreeContext* context)
</del><ins>+PassRefPtr<PlatformCALayerRemote> PlatformCALayerRemote::create(PlatformLayer *platformLayer, PlatformCALayerClient* owner, RemoteLayerTreeContext* context)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<PlatformCALayerRemote> layer = adoptRef(new PlatformCALayerRemoteCustom(static_cast<PlatformLayer*>(platformLayer), owner, context));
</span><span class="cx">
</span><span class="lines">@@ -86,6 +86,7 @@
</span><span class="cx"> : PlatformCALayer(layerType, owner)
</span><span class="cx"> , m_layerID(generateLayerID())
</span><span class="cx"> , m_superlayer(nullptr)
</span><ins>+ , m_maskLayer(nullptr)
</ins><span class="cx"> , m_acceleratesDrawing(false)
</span><span class="cx"> , m_context(context)
</span><span class="cx"> {
</span><span class="lines">@@ -93,9 +94,14 @@
</span><span class="cx"> setContentsScale(1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<PlatformCALayer> PlatformCALayerRemote::clone(PlatformCALayerClient* owner) const
</del><ins>+PassRefPtr<PlatformCALayer> PlatformCALayerRemote::clone(PlatformCALayerClient* client) const
</ins><span class="cx"> {
</span><del>- return nullptr;
</del><ins>+ RefPtr<PlatformCALayerRemote> clone = PlatformCALayerRemote::create(layerType(), client, m_context);
+
+ clone->m_properties = m_properties;
+ clone->m_properties.notePropertiesChanged(static_cast<RemoteLayerTreeTransaction::LayerChange>(m_properties.everChangedProperties & ~RemoteLayerTreeTransaction::BackingStoreChanged));
+
+ return clone.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PlatformCALayerRemote::~PlatformCALayerRemote()
</span><span class="lines">@@ -132,6 +138,9 @@
</span><span class="cx"> ASSERT(child->superlayer() == this);
</span><span class="cx"> child->recursiveBuildTransaction(transaction);
</span><span class="cx"> }
</span><ins>+
+ if (m_maskLayer)
+ m_maskLayer->recursiveBuildTransaction(transaction);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformCALayerRemote::animationStarted(CFTimeInterval beginTime)
</span><span class="lines">@@ -264,7 +273,14 @@
</span><span class="cx">
</span><span class="cx"> void PlatformCALayerRemote::setMask(PlatformCALayer* layer)
</span><span class="cx"> {
</span><del>- m_properties.maskLayer = toPlatformCALayerRemote(layer)->layerID();
</del><ins>+ if (layer) {
+ m_maskLayer = toPlatformCALayerRemote(layer);
+ m_properties.maskLayerID = m_maskLayer->layerID();
+ } else {
+ m_maskLayer = nullptr;
+ m_properties.maskLayerID = 0;
+ }
+
</ins><span class="cx"> m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::MaskLayerChanged);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h (159966 => 159967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2013-12-02 22:36:07 UTC (rev 159966)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2013-12-02 22:42:34 UTC (rev 159967)
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx">
</span><span class="cx"> class PlatformCALayerRemote : public WebCore::PlatformCALayer {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<PlatformCALayer> create(WebCore::PlatformCALayer::LayerType, WebCore::PlatformCALayerClient*, RemoteLayerTreeContext*);
- static PassRefPtr<PlatformCALayer> create(PlatformLayer *, WebCore::PlatformCALayerClient*, RemoteLayerTreeContext*);
</del><ins>+ static PassRefPtr<PlatformCALayerRemote> create(WebCore::PlatformCALayer::LayerType, WebCore::PlatformCALayerClient*, RemoteLayerTreeContext*);
+ static PassRefPtr<PlatformCALayerRemote> create(PlatformLayer *, WebCore::PlatformCALayerClient*, RemoteLayerTreeContext*);
</ins><span class="cx">
</span><span class="cx"> virtual ~PlatformCALayerRemote();
</span><span class="cx">
</span><span class="lines">@@ -161,6 +161,7 @@
</span><span class="cx"> RemoteLayerTreeTransaction::LayerProperties m_properties;
</span><span class="cx"> WebCore::PlatformCALayerList m_children;
</span><span class="cx"> PlatformCALayerRemote* m_superlayer;
</span><ins>+ PlatformCALayerRemote* m_maskLayer;
</ins><span class="cx"> bool m_acceleratesDrawing;
</span><span class="cx">
</span><span class="cx"> RemoteLayerTreeContext* m_context;
</span></span></pre>
</div>
</div>
</body>
</html>