<!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>[213940] 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/213940">213940</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2017-03-14 14:39:22 -0700 (Tue, 14 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename LayerTypeWebGLLayer and use it for both WebGL and WebGPU
https://bugs.webkit.org/show_bug.cgi?id=169628
<rdar://problems/31047025>
Reviewed by Simon Fraser.
Rename LayerTypeWebGLLayer to LayerTypeContentsProvidedLayer
and use it for both WebGLLayer and WebGPULayer, to avoid
code duplication.
Source/WebCore:
* platform/graphics/ca/PlatformCALayer.cpp:
(WebCore::operator<<):
* platform/graphics/ca/PlatformCALayer.h:
* platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
(PlatformCALayerCocoa::layerTypeForPlatformLayer):
(PlatformCALayerCocoa::PlatformCALayerCocoa):
(PlatformCALayerCocoa::commonInit):
Source/WebKit2:
* Shared/mac/RemoteLayerBackingStore.mm:
(WebKit::RemoteLayerBackingStore::drawInContext):
* Shared/mac/RemoteLayerTreeTransaction.mm:
(WebKit::RemoteLayerTreeTransaction::description):
* UIProcess/ios/RemoteLayerTreeHostIOS.mm:
(WebKit::RemoteLayerTreeHost::createLayer):
* UIProcess/mac/RemoteLayerTreeHost.mm:
(WebKit::RemoteLayerTreeHost::createLayer):
* WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm:
(WebKit::PlatformCALayerRemoteCustom::PlatformCALayerRemoteCustom):
(WebKit::PlatformCALayerRemoteCustom::clone):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCALayercpp">trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCALayerh">trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoamm">trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerBackingStoremm">trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionmm">trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosRemoteLayerTreeHostIOSmm">trunk/Source/WebKit2/UIProcess/ios/RemoteLayerTreeHostIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacRemoteLayerTreeHostmm">trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteCustommm">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213939 => 213940)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-14 21:37:41 UTC (rev 213939)
+++ trunk/Source/WebCore/ChangeLog 2017-03-14 21:39:22 UTC (rev 213940)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-03-14 Dean Jackson <dino@apple.com>
+
+ Rename LayerTypeWebGLLayer and use it for both WebGL and WebGPU
+ https://bugs.webkit.org/show_bug.cgi?id=169628
+ <rdar://problems/31047025>
+
+ Reviewed by Simon Fraser.
+
+ Rename LayerTypeWebGLLayer to LayerTypeContentsProvidedLayer
+ and use it for both WebGLLayer and WebGPULayer, to avoid
+ code duplication.
+
+ * platform/graphics/ca/PlatformCALayer.cpp:
+ (WebCore::operator<<):
+ * platform/graphics/ca/PlatformCALayer.h:
+ * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
+ (PlatformCALayerCocoa::layerTypeForPlatformLayer):
+ (PlatformCALayerCocoa::PlatformCALayerCocoa):
+ (PlatformCALayerCocoa::commonInit):
+
</ins><span class="cx"> 2017-03-13 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Make classes used by Media Stream encode/decode friendly
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCALayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp (213939 => 213940)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp 2017-03-14 21:37:41 UTC (rev 213939)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp 2017-03-14 21:39:22 UTC (rev 213940)
</span><span class="lines">@@ -223,14 +223,9 @@
</span><span class="cx"> case PlatformCALayer::LayerTypeAVPlayerLayer:
</span><span class="cx"> ts << "av-player-layer";
</span><span class="cx"> break;
</span><del>- case PlatformCALayer::LayerTypeWebGLLayer:
- ts << "web-gl-layer";
</del><ins>+ case PlatformCALayer::LayerTypeContentsProvidedLayer:
+ ts << "contents-provided-layer";
</ins><span class="cx"> break;
</span><del>-#if ENABLE(WEBGPU)
- case PlatformCALayer::LayerTypeWebGPULayer:
- ts << "webgpu-layer";
- break;
-#endif
</del><span class="cx"> case PlatformCALayer::LayerTypeShapeLayer:
</span><span class="cx"> ts << "shape-layer";
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCALayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h (213939 => 213940)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2017-03-14 21:37:41 UTC (rev 213939)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2017-03-14 21:39:22 UTC (rev 213940)
</span><span class="lines">@@ -72,10 +72,7 @@
</span><span class="cx"> LayerTypeTiledBackingTileLayer,
</span><span class="cx"> LayerTypeRootLayer,
</span><span class="cx"> LayerTypeAVPlayerLayer,
</span><del>- LayerTypeWebGLLayer,
-#if ENABLE(WEBGPU)
- LayerTypeWebGPULayer,
-#endif
</del><ins>+ LayerTypeContentsProvidedLayer,
</ins><span class="cx"> LayerTypeBackdropLayer,
</span><span class="cx"> LayerTypeShapeLayer,
</span><span class="cx"> LayerTypeLightSystemBackdropLayer,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm (213939 => 213940)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2017-03-14 21:37:41 UTC (rev 213939)
+++ trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2017-03-14 21:39:22 UTC (rev 213940)
</span><span class="lines">@@ -196,11 +196,11 @@
</span><span class="cx"> return LayerTypeAVPlayerLayer;
</span><span class="cx">
</span><span class="cx"> if ([layer isKindOfClass:[WebGLLayer class]])
</span><del>- return LayerTypeWebGLLayer;
</del><ins>+ return LayerTypeContentsProvidedLayer;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGPU)
</span><span class="cx"> if ([layer isKindOfClass:[WebGPULayer class]])
</span><del>- return LayerTypeWebGPULayer;
</del><ins>+ return LayerTypeContentsProvidedLayer;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return LayerTypeCustom;
</span><span class="lines">@@ -254,11 +254,8 @@
</span><span class="cx"> case LayerTypeAVPlayerLayer:
</span><span class="cx"> layerClass = getAVPlayerLayerClass();
</span><span class="cx"> break;
</span><del>-#if ENABLE(WEBGPU)
- case LayerTypeWebGPULayer:
-#endif
- case LayerTypeWebGLLayer:
- // We don't create PlatformCALayerCocoas wrapped around WebGLLayers.
</del><ins>+ case LayerTypeContentsProvidedLayer:
+ // We don't create PlatformCALayerCocoas wrapped around WebGLLayers or WebGPULayers.
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><span class="cx"> case LayerTypeShapeLayer:
</span><span class="lines">@@ -295,11 +292,7 @@
</span><span class="cx"> [m_layer setValue:[NSValue valueWithPointer:this] forKey:platformCALayerPointer];
</span><span class="cx">
</span><span class="cx"> // Clear all the implicit animations on the CALayer
</span><del>-#if ENABLE(WEBGPU)
- if (m_layerType == LayerTypeAVPlayerLayer || m_layerType == LayerTypeWebGLLayer || m_layerType == LayerTypeWebGPULayer || m_layerType == LayerTypeScrollingLayer || m_layerType == LayerTypeCustom)
-#else
- if (m_layerType == LayerTypeAVPlayerLayer || m_layerType == LayerTypeWebGLLayer || m_layerType == LayerTypeScrollingLayer || m_layerType == LayerTypeCustom)
-#endif
</del><ins>+ if (m_layerType == LayerTypeAVPlayerLayer || m_layerType == LayerTypeContentsProvidedLayer || m_layerType == LayerTypeScrollingLayer || m_layerType == LayerTypeCustom)
</ins><span class="cx"> [m_layer web_disableAllActions];
</span><span class="cx"> else
</span><span class="cx"> [m_layer setDelegate:[WebActionDisablingCALayerDelegate shared]];
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (213939 => 213940)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-14 21:37:41 UTC (rev 213939)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-14 21:39:22 UTC (rev 213940)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2017-03-14 Dean Jackson <dino@apple.com>
+
+ Rename LayerTypeWebGLLayer and use it for both WebGL and WebGPU
+ https://bugs.webkit.org/show_bug.cgi?id=169628
+ <rdar://problems/31047025>
+
+ Reviewed by Simon Fraser.
+
+ Rename LayerTypeWebGLLayer to LayerTypeContentsProvidedLayer
+ and use it for both WebGLLayer and WebGPULayer, to avoid
+ code duplication.
+
+ * Shared/mac/RemoteLayerBackingStore.mm:
+ (WebKit::RemoteLayerBackingStore::drawInContext):
+ * Shared/mac/RemoteLayerTreeTransaction.mm:
+ (WebKit::RemoteLayerTreeTransaction::description):
+ * UIProcess/ios/RemoteLayerTreeHostIOS.mm:
+ (WebKit::RemoteLayerTreeHost::createLayer):
+ * UIProcess/mac/RemoteLayerTreeHost.mm:
+ (WebKit::RemoteLayerTreeHost::createLayer):
+ * WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm:
+ (WebKit::PlatformCALayerRemoteCustom::PlatformCALayerRemoteCustom):
+ (WebKit::PlatformCALayerRemoteCustom::clone):
+
</ins><span class="cx"> 2017-03-13 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Make classes used by Media Stream encode/decode friendly
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerBackingStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm (213939 => 213940)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2017-03-14 21:37:41 UTC (rev 213939)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2017-03-14 21:39:22 UTC (rev 213940)
</span><span class="lines">@@ -358,10 +358,7 @@
</span><span class="cx"> case PlatformCALayer::LayerTypePageTiledBackingLayer:
</span><span class="cx"> case PlatformCALayer::LayerTypeRootLayer:
</span><span class="cx"> case PlatformCALayer::LayerTypeAVPlayerLayer:
</span><del>- case PlatformCALayer::LayerTypeWebGLLayer:
-#if ENABLE(WEBGPU)
- case PlatformCALayer::LayerTypeWebGPULayer:
-#endif
</del><ins>+ case PlatformCALayer::LayerTypeContentsProvidedLayer:
</ins><span class="cx"> case PlatformCALayer::LayerTypeShapeLayer:
</span><span class="cx"> case PlatformCALayer::LayerTypeScrollingLayer:
</span><span class="cx"> case PlatformCALayer::LayerTypeCustom:
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm (213939 => 213940)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2017-03-14 21:37:41 UTC (rev 213939)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2017-03-14 21:39:22 UTC (rev 213940)
</span><span class="lines">@@ -893,14 +893,9 @@
</span><span class="cx"> case PlatformCALayer::LayerTypeAVPlayerLayer:
</span><span class="cx"> ts << " (context-id " << createdLayer.hostingContextID << ")";
</span><span class="cx"> break;
</span><del>-#if ENABLE(WEBGPU)
- case PlatformCALayer::LayerTypeWebGPULayer:
</del><ins>+ case PlatformCALayer::LayerTypeContentsProvidedLayer:
</ins><span class="cx"> ts << " (context-id " << createdLayer.hostingContextID << ")";
</span><span class="cx"> break;
</span><del>-#endif
- case PlatformCALayer::LayerTypeWebGLLayer:
- ts << " (context-id " << createdLayer.hostingContextID << ")";
- break;
</del><span class="cx"> case PlatformCALayer::LayerTypeCustom:
</span><span class="cx"> ts << " (context-id " << createdLayer.hostingContextID << ")";
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosRemoteLayerTreeHostIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/RemoteLayerTreeHostIOS.mm (213939 => 213940)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/RemoteLayerTreeHostIOS.mm 2017-03-14 21:37:41 UTC (rev 213939)
+++ trunk/Source/WebKit2/UIProcess/ios/RemoteLayerTreeHostIOS.mm 2017-03-14 21:39:22 UTC (rev 213940)
</span><span class="lines">@@ -206,10 +206,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case PlatformCALayer::LayerTypeCustom:
</span><span class="cx"> case PlatformCALayer::LayerTypeAVPlayerLayer:
</span><del>-#if ENABLE(WEBGPU)
- case PlatformCALayer::LayerTypeWebGPULayer:
-#endif
- case PlatformCALayer::LayerTypeWebGLLayer:
</del><ins>+ case PlatformCALayer::LayerTypeContentsProvidedLayer:
</ins><span class="cx"> if (!m_isDebugLayerTreeHost) {
</span><span class="cx"> view = adoptNS([[WKRemoteView alloc] initWithFrame:CGRectZero contextID:properties.hostingContextID]);
</span><span class="cx"> if (properties.type == PlatformCALayer::LayerTypeAVPlayerLayer) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacRemoteLayerTreeHostmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm (213939 => 213940)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2017-03-14 21:37:41 UTC (rev 213939)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2017-03-14 21:39:22 UTC (rev 213940)
</span><span class="lines">@@ -254,10 +254,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case PlatformCALayer::LayerTypeCustom:
</span><span class="cx"> case PlatformCALayer::LayerTypeAVPlayerLayer:
</span><del>-#if ENABLE(WEBGPU)
- case PlatformCALayer::LayerTypeWebGPULayer:
-#endif
- case PlatformCALayer::LayerTypeWebGLLayer:
</del><ins>+ case PlatformCALayer::LayerTypeContentsProvidedLayer:
</ins><span class="cx"> if (!m_isDebugLayerTreeHost)
</span><span class="cx"> layer = WKMakeRenderLayer(properties.hostingContextID);
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteCustommm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm (213939 => 213940)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm 2017-03-14 21:37:41 UTC (rev 213939)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm 2017-03-14 21:39:22 UTC (rev 213940)
</span><span class="lines">@@ -82,11 +82,7 @@
</span><span class="cx"> m_platformLayer = customLayer;
</span><span class="cx"> [customLayer web_disableAllActions];
</span><span class="cx">
</span><del>-#if ENABLE(WEBGPU)
- m_providesContents = layerType == LayerTypeWebGLLayer || layerType == LayerTypeWebGPULayer;
-#else
- m_providesContents = layerType == LayerTypeWebGLLayer;
-#endif
</del><ins>+ m_providesContents = layerType == LayerTypeContentsProvidedLayer;
</ins><span class="cx">
</span><span class="cx"> properties().position = FloatPoint3D(customLayer.position.x, customLayer.position.y, customLayer.zPosition);
</span><span class="cx"> properties().anchorPoint = FloatPoint3D(customLayer.anchorPoint.x, customLayer.anchorPoint.y, customLayer.anchorPointZ);
</span><span class="lines">@@ -125,11 +121,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> copyContents = false;
</span><del>-#if ENABLE(WEBGPU)
- } else if (layerType() == LayerTypeWebGLLayer || layerType() == LayerTypeWebGPULayer) {
-#else
- } else if (layerType() == LayerTypeWebGLLayer) {
-#endif
</del><ins>+ } else if (layerType() == LayerTypeContentsProvidedLayer) {
</ins><span class="cx"> clonedLayer = adoptNS([[CALayer alloc] init]);
</span><span class="cx"> // FIXME: currently copying WebGL contents breaks the original layer.
</span><span class="cx"> copyContents = false;
</span></span></pre>
</div>
</div>
</body>
</html>