<!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>[213783] trunk/Source/WebCore</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/213783">213783</a></dd>
<dt>Author</dt> <dd>jonlee@apple.com</dd>
<dt>Date</dt> <dd>2017-03-13 00:18:33 -0700 (Mon, 13 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebGPU: Backend - hosting WebGPU layers
https://bugs.webkit.org/show_bug.cgi?id=169366
<rdar://problem/30928735>
Reviewed by Dean Jackson.
* html/canvas/WebGPURenderingContext.cpp:
(WebCore::WebGPURenderingContext::create): Create the device and the
rendering context.
* platform/graphics/cocoa/GPUCommandBufferMetal.mm:
(WebCore::GPUCommandBuffer::commit):
* platform/graphics/cocoa/GPUDrawableMetal.mm:
(WebCore::GPUDrawable::release): Fix a log message
* platform/graphics/gpu/GPUCommandBuffer.cpp:
(WebCore::GPUCommandBuffer::commit): Deleted. Moved to GPUCommandBufferMetal.
* rendering/RenderLayerBacking.cpp:
(WebCore::canvasCompositingStrategy): WebGPU canvas should return CanvasAsLayerContents.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPURenderingContextcpp">trunk/Source/WebCore/html/canvas/WebGPURenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaGPUCommandBufferMetalmm">trunk/Source/WebCore/platform/graphics/cocoa/GPUCommandBufferMetal.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaGPUDrawableMetalmm">trunk/Source/WebCore/platform/graphics/cocoa/GPUDrawableMetal.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgpuGPUCommandBuffercpp">trunk/Source/WebCore/platform/graphics/gpu/GPUCommandBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213782 => 213783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-13 06:17:56 UTC (rev 213782)
+++ trunk/Source/WebCore/ChangeLog 2017-03-13 07:18:33 UTC (rev 213783)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-03-13 Jon Lee <jonlee@apple.com>
+
+ WebGPU: Backend - hosting WebGPU layers
+ https://bugs.webkit.org/show_bug.cgi?id=169366
+ <rdar://problem/30928735>
+
+ Reviewed by Dean Jackson.
+
+ * html/canvas/WebGPURenderingContext.cpp:
+ (WebCore::WebGPURenderingContext::create): Create the device and the
+ rendering context.
+ * platform/graphics/cocoa/GPUCommandBufferMetal.mm:
+ (WebCore::GPUCommandBuffer::commit):
+ * platform/graphics/cocoa/GPUDrawableMetal.mm:
+ (WebCore::GPUDrawable::release): Fix a log message
+ * platform/graphics/gpu/GPUCommandBuffer.cpp:
+ (WebCore::GPUCommandBuffer::commit): Deleted. Moved to GPUCommandBufferMetal.
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::canvasCompositingStrategy): WebGPU canvas should return CanvasAsLayerContents.
+
</ins><span class="cx"> 2017-03-12 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove stubs from WebGPU front end
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPURenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPURenderingContext.cpp (213782 => 213783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPURenderingContext.cpp 2017-03-13 06:17:56 UTC (rev 213782)
+++ trunk/Source/WebCore/html/canvas/WebGPURenderingContext.cpp 2017-03-13 07:18:33 UTC (rev 213783)
</span><span class="lines">@@ -71,24 +71,8 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<WebGPURenderingContext> WebGPURenderingContext::create(HTMLCanvasElement& canvas)
</span><span class="cx"> {
</span><del>- UNUSED_PARAM(canvas);
-/* FIXME: WebGPU - To be implemented.
- Document& document = canvas.document();
- Frame* frame = document.frame();
- if (!frame)
- return nullptr;
</del><ins>+ RefPtr<GPUDevice> device(GPUDevice::create());
</ins><span class="cx">
</span><del>- GPUDevice::Attributes attributes;
-
- attributes.antialias = false;
-
- // FIXME: WebGPU - handle retina.
- // if (page)
- // attributes.devicePixelRatio = page->deviceScaleFactor();
-
- HostWindow* hostWindow = document.view()->root()->hostWindow();
- RefPtr<GPUDevice> device(GPUDevice::create(attributes, hostWindow));
-
</del><span class="cx"> if (!device) {
</span><span class="cx"> // FIXME: WebGPU - dispatch an event here for the failure.
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -99,8 +83,6 @@
</span><span class="cx"> renderingContext->suspendIfNeeded();
</span><span class="cx">
</span><span class="cx"> return renderingContext;
</span><del>-*/
- return nullptr;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebGPURenderingContext::WebGPURenderingContext(HTMLCanvasElement& canvas, PassRefPtr<GPUDevice> device)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaGPUCommandBufferMetalmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/GPUCommandBufferMetal.mm (213782 => 213783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/GPUCommandBufferMetal.mm 2017-03-13 06:17:56 UTC (rev 213782)
+++ trunk/Source/WebCore/platform/graphics/cocoa/GPUCommandBufferMetal.mm 2017-03-13 07:18:33 UTC (rev 213783)
</span><span class="lines">@@ -61,6 +61,14 @@
</span><span class="cx"> drawable->release();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void GPUCommandBuffer::commit()
+{
+ if (!m_commandBuffer)
+ return;
+
+ [m_commandBuffer commit];
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaGPUDrawableMetalmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/GPUDrawableMetal.mm (213782 => 213783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/GPUDrawableMetal.mm 2017-03-13 06:17:56 UTC (rev 213782)
+++ trunk/Source/WebCore/platform/graphics/cocoa/GPUDrawableMetal.mm 2017-03-13 07:18:33 UTC (rev 213783)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> void GPUDrawable::release()
</span><span class="cx"> {
</span><del>- LOG(WebGPU, "MetalDrawable::release()");
</del><ins>+ LOG(WebGPU, "GPUDrawable::release()");
</ins><span class="cx"> m_drawable = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgpuGPUCommandBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gpu/GPUCommandBuffer.cpp (213782 => 213783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gpu/GPUCommandBuffer.cpp 2017-03-13 06:17:56 UTC (rev 213782)
+++ trunk/Source/WebCore/platform/graphics/gpu/GPUCommandBuffer.cpp 2017-03-13 07:18:33 UTC (rev 213783)
</span><span class="lines">@@ -47,10 +47,6 @@
</span><span class="cx"> LOG(WebGPU, "GPUCommandBuffer::~GPUCommandBuffer()");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void GPUCommandBuffer::commit()
-{
-}
-
</del><span class="cx"> RefPtr<GPURenderCommandEncoder> GPUCommandBuffer::createRenderCommandEncoder(GPURenderPassDescriptor* descriptor)
</span><span class="cx"> {
</span><span class="cx"> return GPURenderCommandEncoder::create(this, descriptor);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (213782 => 213783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-03-13 06:17:56 UTC (rev 213782)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-03-13 07:18:33 UTC (rev 213783)
</span><span class="lines">@@ -84,6 +84,11 @@
</span><span class="cx"> if (context->is3d())
</span><span class="cx"> return CanvasAsLayerContents;
</span><span class="cx">
</span><ins>+#if ENABLE(WEBGPU)
+ if (context->isGPU())
+ return CanvasAsLayerContents;
+#endif
+
</ins><span class="cx"> #if ENABLE(ACCELERATED_2D_CANVAS)
</span><span class="cx"> return CanvasAsLayerContents;
</span><span class="cx"> #else
</span></span></pre>
</div>
</div>
</body>
</html>