<!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>[214105] 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/214105">214105</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2017-03-17 07:11:24 -0700 (Fri, 17 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebGPU: build fixes for non-Cocoa platforms
https://bugs.webkit.org/show_bug.cgi?id=169781
Reviewed by Alex Christensen.
Enable building WebGPU code for other ports and fix various build
failures. This still leaves the GPUDevice::platformLayer() method
missing for other ports, as well as the general implementation of
the WebGPU platform abstractions under platform/graphics/gpu/.
* CMakeLists.txt: Move the WebGPU build targets here.
* PlatformMac.cmake:
* html/canvas/WebGPULibrary.h: Explicitly include the WTFString.h
header to suppress missing WTF::String definition errors.
* platform/graphics/gpu/GPUBuffer.cpp:
(WebCore::GPUBuffer::contents): Avoid ambiguous calls to
ArrayBuffer::create() by passing nullptr as the first argument.
* platform/graphics/gpu/GPUDevice.h: Include the Forward.h header
to forward-declare the WTF::String class. Also remove the unused
PlatformGPUDevice typedef for non-Cocoa platforms.
(WebCore::GPUDevice::layer): Move this and the related m_layer
member variable under the PLATFORM(COCOA) guard.
* platform/graphics/gpu/GPUFunction.cpp:
(WebCore::GPUFunction::GPUFunction): Remove the GPULibrary
parameter checks in this no-op constructor that's used on
non-Cocoa platforms.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGPULibraryh">trunk/Source/WebCore/html/canvas/WebGPULibrary.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgpuGPUBuffercpp">trunk/Source/WebCore/platform/graphics/gpu/GPUBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgpuGPUDeviceh">trunk/Source/WebCore/platform/graphics/gpu/GPUDevice.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgpuGPUFunctioncpp">trunk/Source/WebCore/platform/graphics/gpu/GPUFunction.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (214104 => 214105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2017-03-17 13:13:02 UTC (rev 214104)
+++ trunk/Source/WebCore/CMakeLists.txt 2017-03-17 14:11:24 UTC (rev 214105)
</span><span class="lines">@@ -596,6 +596,25 @@
</span><span class="cx"> html/canvas/CanvasProxy.idl
</span><span class="cx"> html/canvas/CanvasRenderingContext2D.idl
</span><span class="cx"> html/canvas/DOMPath.idl
</span><ins>+ html/canvas/WebGPUBuffer.idl
+ html/canvas/WebGPUCommandBuffer.idl
+ html/canvas/WebGPUCommandQueue.idl
+ html/canvas/WebGPUDepthStencilDescriptor.idl
+ html/canvas/WebGPUDepthStencilState.idl
+ html/canvas/WebGPUDrawable.idl
+ html/canvas/WebGPUFunction.idl
+ html/canvas/WebGPULibrary.idl
+ html/canvas/WebGPURenderCommandEncoder.idl
+ html/canvas/WebGPURenderPassAttachmentDescriptor.idl
+ html/canvas/WebGPURenderPassColorAttachmentDescriptor.idl
+ html/canvas/WebGPURenderPassDepthAttachmentDescriptor.idl
+ html/canvas/WebGPURenderPassDescriptor.idl
+ html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.idl
+ html/canvas/WebGPURenderPipelineDescriptor.idl
+ html/canvas/WebGPURenderPipelineState.idl
+ html/canvas/WebGPURenderingContext.idl
+ html/canvas/WebGPUTexture.idl
+ html/canvas/WebGPUTextureDescriptor.idl
</ins><span class="cx">
</span><span class="cx"> inspector/CommandLineAPIHost.idl
</span><span class="cx"> inspector/InspectorFrontendHost.idl
</span><span class="lines">@@ -1210,6 +1229,8 @@
</span><span class="cx"> bindings/js/JSWebGL2RenderingContextCustom.cpp
</span><span class="cx"> bindings/js/JSWebGLRenderingContextBaseCustom.cpp
</span><span class="cx"> bindings/js/JSWebGLRenderingContextCustom.cpp
</span><ins>+ bindings/js/JSWebGPURenderPassAttachmentDescriptorCustom.cpp
+ bindings/js/JSWebGPURenderingContextCustom.cpp
</ins><span class="cx"> bindings/js/JSWebKitSubtleCryptoCustom.cpp
</span><span class="cx"> bindings/js/JSWorkerCustom.cpp
</span><span class="cx"> bindings/js/JSWorkerGlobalScopeBase.cpp
</span><span class="lines">@@ -1798,6 +1819,27 @@
</span><span class="cx"> html/canvas/CanvasRenderingContext2D.cpp
</span><span class="cx"> html/canvas/CanvasStyle.cpp
</span><span class="cx"> html/canvas/DOMPath.cpp
</span><ins>+ html/canvas/WebGPUBuffer.cpp
+ html/canvas/WebGPUCommandBuffer.cpp
+ html/canvas/WebGPUCommandQueue.cpp
+ html/canvas/WebGPUDepthStencilDescriptor.cpp
+ html/canvas/WebGPUDepthStencilState.cpp
+ html/canvas/WebGPUDrawable.cpp
+ html/canvas/WebGPUEnums.cpp
+ html/canvas/WebGPUFunction.cpp
+ html/canvas/WebGPULibrary.cpp
+ html/canvas/WebGPUObject.cpp
+ html/canvas/WebGPURenderCommandEncoder.cpp
+ html/canvas/WebGPURenderPassAttachmentDescriptor.cpp
+ html/canvas/WebGPURenderPassColorAttachmentDescriptor.cpp
+ html/canvas/WebGPURenderPassDepthAttachmentDescriptor.cpp
+ html/canvas/WebGPURenderPassDescriptor.cpp
+ html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.cpp
+ html/canvas/WebGPURenderPipelineDescriptor.cpp
+ html/canvas/WebGPURenderPipelineState.cpp
+ html/canvas/WebGPURenderingContext.cpp
+ html/canvas/WebGPUTexture.cpp
+ html/canvas/WebGPUTextureDescriptor.cpp
</ins><span class="cx">
</span><span class="cx"> html/forms/FileIconLoader.cpp
</span><span class="cx">
</span><span class="lines">@@ -2291,6 +2333,26 @@
</span><span class="cx"> platform/graphics/filters/SourceGraphic.cpp
</span><span class="cx"> platform/graphics/filters/SpotLightSource.cpp
</span><span class="cx">
</span><ins>+ platform/graphics/gpu/GPUBuffer.cpp
+ platform/graphics/gpu/GPUCommandBuffer.cpp
+ platform/graphics/gpu/GPUCommandQueue.cpp
+ platform/graphics/gpu/GPUDepthStencilDescriptor.cpp
+ platform/graphics/gpu/GPUDepthStencilState.cpp
+ platform/graphics/gpu/GPUDevice.cpp
+ platform/graphics/gpu/GPUDrawable.cpp
+ platform/graphics/gpu/GPUFunction.cpp
+ platform/graphics/gpu/GPULibrary.cpp
+ platform/graphics/gpu/GPURenderCommandEncoder.cpp
+ platform/graphics/gpu/GPURenderPassAttachmentDescriptor.cpp
+ platform/graphics/gpu/GPURenderPassColorAttachmentDescriptor.cpp
+ platform/graphics/gpu/GPURenderPassDepthAttachmentDescriptor.cpp
+ platform/graphics/gpu/GPURenderPassDescriptor.cpp
+ platform/graphics/gpu/GPURenderPipelineColorAttachmentDescriptor.cpp
+ platform/graphics/gpu/GPURenderPipelineDescriptor.cpp
+ platform/graphics/gpu/GPURenderPipelineState.cpp
+ platform/graphics/gpu/GPUTexture.cpp
+ platform/graphics/gpu/GPUTextureDescriptor.cpp
+
</ins><span class="cx"> platform/graphics/opentype/OpenTypeMathData.cpp
</span><span class="cx">
</span><span class="cx"> platform/graphics/transforms/AffineTransform.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214104 => 214105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-17 13:13:02 UTC (rev 214104)
+++ trunk/Source/WebCore/ChangeLog 2017-03-17 14:11:24 UTC (rev 214105)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2017-03-17 Zan Dobersek <zdobersek@igalia.com>
+
+ WebGPU: build fixes for non-Cocoa platforms
+ https://bugs.webkit.org/show_bug.cgi?id=169781
+
+ Reviewed by Alex Christensen.
+
+ Enable building WebGPU code for other ports and fix various build
+ failures. This still leaves the GPUDevice::platformLayer() method
+ missing for other ports, as well as the general implementation of
+ the WebGPU platform abstractions under platform/graphics/gpu/.
+
+ * CMakeLists.txt: Move the WebGPU build targets here.
+ * PlatformMac.cmake:
+ * html/canvas/WebGPULibrary.h: Explicitly include the WTFString.h
+ header to suppress missing WTF::String definition errors.
+ * platform/graphics/gpu/GPUBuffer.cpp:
+ (WebCore::GPUBuffer::contents): Avoid ambiguous calls to
+ ArrayBuffer::create() by passing nullptr as the first argument.
+ * platform/graphics/gpu/GPUDevice.h: Include the Forward.h header
+ to forward-declare the WTF::String class. Also remove the unused
+ PlatformGPUDevice typedef for non-Cocoa platforms.
+ (WebCore::GPUDevice::layer): Move this and the related m_layer
+ member variable under the PLATFORM(COCOA) guard.
+ * platform/graphics/gpu/GPUFunction.cpp:
+ (WebCore::GPUFunction::GPUFunction): Remove the GPULibrary
+ parameter checks in this no-op constructor that's used on
+ non-Cocoa platforms.
+
</ins><span class="cx"> 2017-03-17 Miguel Gomez <magomez@igalia.com>
</span><span class="cx">
</span><span class="cx"> Follow-up (r213833): write a layout test for 169199
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (214104 => 214105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2017-03-17 13:13:02 UTC (rev 214104)
+++ trunk/Source/WebCore/PlatformMac.cmake 2017-03-17 14:11:24 UTC (rev 214105)
</span><span class="lines">@@ -166,8 +166,6 @@
</span><span class="cx"> accessibility/mac/WebAccessibilityObjectWrapperMac.mm
</span><span class="cx">
</span><span class="cx"> bindings/js/ScriptControllerMac.mm
</span><del>- bindings/js/JSWebGPURenderingContextCustom.cpp
- bindings/js/JSWebGPURenderPassAttachmentDescriptorCustom.cpp
</del><span class="cx">
</span><span class="cx"> bridge/objc/ObjCRuntimeObject.mm
</span><span class="cx"> bridge/objc/WebScriptObject.mm
</span><span class="lines">@@ -245,28 +243,6 @@
</span><span class="cx">
</span><span class="cx"> html/HTMLSlotElement.cpp
</span><span class="cx">
</span><del>- html/canvas/WebGPUBuffer.cpp
- html/canvas/WebGPUCommandBuffer.cpp
- html/canvas/WebGPUCommandQueue.cpp
- html/canvas/WebGPUDepthStencilDescriptor.cpp
- html/canvas/WebGPUDepthStencilState.cpp
- html/canvas/WebGPUDrawable.cpp
- html/canvas/WebGPUEnums.cpp
- html/canvas/WebGPUFunction.cpp
- html/canvas/WebGPULibrary.cpp
- html/canvas/WebGPUObject.cpp
- html/canvas/WebGPURenderCommandEncoder.cpp
- html/canvas/WebGPURenderingContext.cpp
- html/canvas/WebGPURenderPassAttachmentDescriptor.cpp
- html/canvas/WebGPURenderPassColorAttachmentDescriptor.cpp
- html/canvas/WebGPURenderPassDepthAttachmentDescriptor.cpp
- html/canvas/WebGPURenderPassDescriptor.cpp
- html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.cpp
- html/canvas/WebGPURenderPipelineDescriptor.cpp
- html/canvas/WebGPURenderPipelineState.cpp
- html/canvas/WebGPUTexture.cpp
- html/canvas/WebGPUTextureDescriptor.cpp
-
</del><span class="cx"> html/shadow/ImageControlsRootElement.cpp
</span><span class="cx"> html/shadow/YouTubeEmbedShadowElement.cpp
</span><span class="cx">
</span><span class="lines">@@ -481,25 +457,6 @@
</span><span class="cx"> platform/graphics/cv/TextureCacheCV.mm
</span><span class="cx"> platform/graphics/cv/VideoTextureCopierCV.cpp
</span><span class="cx">
</span><del>- platform/graphics/gpu/GPUBuffer.cpp
- platform/graphics/gpu/GPUCommandBuffer.cpp
- platform/graphics/gpu/GPUCommandQueue.cpp
- platform/graphics/gpu/GPUDepthStencilDescriptor.cpp
- platform/graphics/gpu/GPUDepthStencilState.cpp
- platform/graphics/gpu/GPUDevice.cpp
- platform/graphics/gpu/GPUDrawable.cpp
- platform/graphics/gpu/GPUFunction.cpp
- platform/graphics/gpu/GPULibrary.cpp
- platform/graphics/gpu/GPURenderCommandEncoder.cpp
- platform/graphics/gpu/GPURenderPassAttachmentDescriptor.cpp
- platform/graphics/gpu/GPURenderPassColorAttachmentDescriptor.cpp
- platform/graphics/gpu/GPURenderPassDepthAttachmentDescriptor.cpp
- platform/graphics/gpu/GPURenderPassDescriptor.cpp
- platform/graphics/gpu/GPURenderPipelineColorAttachmentDescriptor.cpp
- platform/graphics/gpu/GPURenderPipelineDescriptor.cpp
- platform/graphics/gpu/GPURenderPipelineState.cpp
- platform/graphics/gpu/GPUTexture.cpp
- platform/graphics/gpu/GPUTextureDescriptor.cpp
</del><span class="cx"> platform/graphics/gpu/Texture.cpp
</span><span class="cx"> platform/graphics/gpu/TilingData.cpp
</span><span class="cx">
</span><span class="lines">@@ -815,25 +772,6 @@
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_IDL_FILES
</span><span class="cx"> Modules/plugins/QuickTimePluginReplacement.idl
</span><del>- html/canvas/WebGPUBuffer.idl
- html/canvas/WebGPUCommandBuffer.idl
- html/canvas/WebGPUCommandQueue.idl
- html/canvas/WebGPUDepthStencilDescriptor.idl
- html/canvas/WebGPUDepthStencilState.idl
- html/canvas/WebGPUDrawable.idl
- html/canvas/WebGPUFunction.idl
- html/canvas/WebGPULibrary.idl
- html/canvas/WebGPURenderCommandEncoder.idl
- html/canvas/WebGPURenderingContext.idl
- html/canvas/WebGPURenderPassAttachmentDescriptor.idl
- html/canvas/WebGPURenderPassColorAttachmentDescriptor.idl
- html/canvas/WebGPURenderPassDepthAttachmentDescriptor.idl
- html/canvas/WebGPURenderPassDescriptor.idl
- html/canvas/WebGPURenderPipelineColorAttachmentDescriptor.idl
- html/canvas/WebGPURenderPipelineDescriptor.idl
- html/canvas/WebGPURenderPipelineState.idl
- html/canvas/WebGPUTexture.idl
- html/canvas/WebGPUTextureDescriptor.idl
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebCore_FORWARDING_HEADERS_FILES})
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGPULibraryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGPULibrary.h (214104 => 214105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGPULibrary.h 2017-03-17 13:13:02 UTC (rev 214104)
+++ trunk/Source/WebCore/html/canvas/WebGPULibrary.h 2017-03-17 14:11:24 UTC (rev 214105)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "WebGPUObject.h"
</span><span class="cx">
</span><span class="cx"> #include <wtf/Vector.h>
</span><ins>+#include <wtf/text/WTFString.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgpuGPUBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gpu/GPUBuffer.cpp (214104 => 214105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gpu/GPUBuffer.cpp 2017-03-17 13:13:02 UTC (rev 214104)
+++ trunk/Source/WebCore/platform/graphics/gpu/GPUBuffer.cpp 2017-03-17 14:11:24 UTC (rev 214105)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> if (m_contents)
</span><span class="cx"> return m_contents;
</span><span class="cx">
</span><del>- m_contents = ArrayBuffer::create(0, 1);
</del><ins>+ m_contents = ArrayBuffer::create(nullptr, 1);
</ins><span class="cx"> return m_contents;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgpuGPUDeviceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gpu/GPUDevice.h (214104 => 214105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gpu/GPUDevice.h 2017-03-17 13:13:02 UTC (rev 214104)
+++ trunk/Source/WebCore/platform/graphics/gpu/GPUDevice.h 2017-03-17 14:11:24 UTC (rev 214105)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include "PlatformLayer.h"
</span><span class="cx"> #include <runtime/ArrayBufferView.h>
</span><ins>+#include <wtf/Forward.h>
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><span class="cx"> #if USE(CA)
</span><span class="lines">@@ -41,7 +42,6 @@
</span><span class="cx"> OBJC_CLASS WebGPULayer;
</span><span class="cx"> #else
</span><span class="cx"> class WebGPULayer;
</span><del>-typedef void PlatformGPUDevice;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -61,12 +61,11 @@
</span><span class="cx"> void reshape(int width, int height);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><ins>+ WebGPULayer* layer() { return m_layer.get(); }
</ins><span class="cx"> CALayer* platformLayer() const { return reinterpret_cast<CALayer*>(m_layer.get()); }
</span><span class="cx"> WEBCORE_EXPORT id platformDevice();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- WebGPULayer* layer() { return m_layer.get(); }
-
</del><span class="cx"> WEBCORE_EXPORT RefPtr<GPUCommandQueue> createCommandQueue();
</span><span class="cx"> WEBCORE_EXPORT RefPtr<GPULibrary> createLibrary(const String& sourceCode);
</span><span class="cx"> WEBCORE_EXPORT RefPtr<GPUBuffer> createBufferFromData(ArrayBufferView* data);
</span><span class="lines">@@ -79,8 +78,8 @@
</span><span class="cx"> private:
</span><span class="cx"> GPUDevice();
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RetainPtr<WebGPULayer> m_layer;
</span><del>-#if PLATFORM(COCOA)
</del><span class="cx"> RetainPtr<id> m_device;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgpuGPUFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gpu/GPUFunction.cpp (214104 => 214105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gpu/GPUFunction.cpp 2017-03-17 13:13:02 UTC (rev 214104)
+++ trunk/Source/WebCore/platform/graphics/gpu/GPUFunction.cpp 2017-03-17 14:11:24 UTC (rev 214105)
</span><span class="lines">@@ -49,12 +49,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(COCOA)
</span><del>-GPUFunction::GPUFunction(GPULibrary* library, const String& name)
</del><ins>+GPUFunction::GPUFunction(GPULibrary*, const String&)
</ins><span class="cx"> {
</span><span class="cx"> LOG(WebGPU, "GPUFunction::GPUFunction()");
</span><del>-
- if (!library || !library->library())
- return;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String GPUFunction::name() const
</span></span></pre>
</div>
</div>
</body>
</html>