<!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>[213549] trunk</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/213549">213549</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2017-03-07 16:09:37 -0800 (Tue, 07 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Some platforms won't be able to create a GPUDevice
https://bugs.webkit.org/show_bug.cgi?id=169314
<rdar://problems/30907521>
Reviewed by Jon Lee.
Source/JavaScriptCore:
Disable WEB_GPU on the iOS Simulator.
* Configurations/FeatureDefines.xcconfig:
Source/WebCore:
Protect for the case where the hardware doesn't support Metal. And
we might as well disable WebGPU completely in the iOS simulator
for now.
* Configurations/FeatureDefines.xcconfig:
* platform/graphics/cocoa/GPUDeviceMetal.mm:
(WebCore::GPUDevice::GPUDevice):
* platform/graphics/gpu/GPUDevice.cpp:
(WebCore::GPUDevice::create):
Source/WebCore/PAL:
Disable WEB_GPU on the iOS Simulator.
* Configurations/FeatureDefines.xcconfig:
Source/WebKit/mac:
Disable WEB_GPU on the iOS Simulator.
* Configurations/FeatureDefines.xcconfig:
Source/WebKit2:
Disable WEB_GPU on the iOS Simulator.
* Configurations/FeatureDefines.xcconfig:
Tools:
Protect for the case where the hardware doesn't support Metal.
* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
* TestWebKitAPI/Tests/WebCore/mac/GPUDevice.mm:
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCorePALChangeLog">trunk/Source/WebCore/PAL/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePALConfigurationsFeatureDefinesxcconfig">trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaGPUDeviceMetalmm">trunk/Source/WebCore/platform/graphics/cocoa/GPUDeviceMetal.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgpuGPUDevicecpp">trunk/Source/WebCore/platform/graphics/gpu/GPUDevice.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig">trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoremacGPUDevicemm">trunk/Tools/TestWebKitAPI/Tests/WebCore/mac/GPUDevice.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (213548 => 213549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-03-07 23:21:49 UTC (rev 213548)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-03-08 00:09:37 UTC (rev 213549)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-03-07 Dean Jackson <dino@apple.com>
+
+ Some platforms won't be able to create a GPUDevice
+ https://bugs.webkit.org/show_bug.cgi?id=169314
+ <rdar://problems/30907521>
+
+ Reviewed by Jon Lee.
+
+ Disable WEB_GPU on the iOS Simulator.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2017-03-06 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> WebAssembly: Implement the WebAssembly.instantiate API
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (213548 => 213549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2017-03-07 23:21:49 UTC (rev 213548)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2017-03-08 00:09:37 UTC (rev 213549)
</span><span class="lines">@@ -200,6 +200,7 @@
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><span class="cx"> ENABLE_WEBGL2 = ENABLE_WEBGL2;
</span><span class="cx"> ENABLE_WEBGPU = ENABLE_WEBGPU;
</span><ins>+ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
</ins><span class="cx"> ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
</span><span class="cx"> ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
</span><span class="cx"> ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213548 => 213549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-07 23:21:49 UTC (rev 213548)
+++ trunk/Source/WebCore/ChangeLog 2017-03-08 00:09:37 UTC (rev 213549)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-03-07 Dean Jackson <dino@apple.com>
+
+ Some platforms won't be able to create a GPUDevice
+ https://bugs.webkit.org/show_bug.cgi?id=169314
+ <rdar://problems/30907521>
+
+ Reviewed by Jon Lee.
+
+ Protect for the case where the hardware doesn't support Metal. And
+ we might as well disable WebGPU completely in the iOS simulator
+ for now.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * platform/graphics/cocoa/GPUDeviceMetal.mm:
+ (WebCore::GPUDevice::GPUDevice):
+ * platform/graphics/gpu/GPUDevice.cpp:
+ (WebCore::GPUDevice::create):
+
</ins><span class="cx"> 2017-03-07 Maureen Daum <mdaum@apple.com>
</span><span class="cx">
</span><span class="cx"> Correctly check for an empty database file.
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (213548 => 213549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-03-07 23:21:49 UTC (rev 213548)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-03-08 00:09:37 UTC (rev 213549)
</span><span class="lines">@@ -200,6 +200,7 @@
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><span class="cx"> ENABLE_WEBGL2 = ENABLE_WEBGL2;
</span><span class="cx"> ENABLE_WEBGPU = ENABLE_WEBGPU;
</span><ins>+ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
</ins><span class="cx"> ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
</span><span class="cx"> ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
</span><span class="cx"> ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
</span></span></pre></div>
<a id="trunkSourceWebCorePALChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/ChangeLog (213548 => 213549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/ChangeLog 2017-03-07 23:21:49 UTC (rev 213548)
+++ trunk/Source/WebCore/PAL/ChangeLog 2017-03-08 00:09:37 UTC (rev 213549)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-03-07 Dean Jackson <dino@apple.com>
+
+ Some platforms won't be able to create a GPUDevice
+ https://bugs.webkit.org/show_bug.cgi?id=169314
+ <rdar://problems/30907521>
+
+ Reviewed by Jon Lee.
+
+ Disable WEB_GPU on the iOS Simulator.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2017-03-06 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> Take advantage of fast permissions switching of JIT memory for devices that support it
</span></span></pre></div>
<a id="trunkSourceWebCorePALConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (213548 => 213549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2017-03-07 23:21:49 UTC (rev 213548)
+++ trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2017-03-08 00:09:37 UTC (rev 213549)
</span><span class="lines">@@ -200,6 +200,7 @@
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><span class="cx"> ENABLE_WEBGL2 = ENABLE_WEBGL2;
</span><span class="cx"> ENABLE_WEBGPU = ENABLE_WEBGPU;
</span><ins>+ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
</ins><span class="cx"> ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
</span><span class="cx"> ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
</span><span class="cx"> ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaGPUDeviceMetalmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/GPUDeviceMetal.mm (213548 => 213549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/GPUDeviceMetal.mm 2017-03-07 23:21:49 UTC (rev 213548)
+++ trunk/Source/WebCore/platform/graphics/cocoa/GPUDeviceMetal.mm 2017-03-08 00:09:37 UTC (rev 213549)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #import <runtime/ArrayBuffer.h>
</span><span class="cx"> #import <wtf/BlockObjCExceptions.h>
</span><span class="cx">
</span><del>-#if ENABLE(WEBGPU) && !PLATFORM(IOS_SIMULATOR)
</del><ins>+#if ENABLE(WEBGPU)
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -40,13 +40,14 @@
</span><span class="cx"> GPUDevice::GPUDevice()
</span><span class="cx"> {
</span><span class="cx"> m_device = MTLCreateSystemDefaultDevice();
</span><del>- LOG(WebGPU, "GPUDevice::GPUDevice Metal device is %p", m_device.get());
</del><span class="cx">
</span><span class="cx"> if (!m_device) {
</span><del>- LOG(WebGPU, "GPUDevice::GPUDevice -- could not create the device");
</del><ins>+ LOG(WebGPU, "GPUDevice::GPUDevice -- could not create the device. This usually means Metal is not available on this hardware.");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ LOG(WebGPU, "GPUDevice::GPUDevice Metal device is %p", m_device.get());
+
</ins><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx"> m_layer = [[WebGPULayer alloc] initWithGPUDevice:this];
</span><span class="cx"> [m_layer setOpaque:0];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgpuGPUDevicecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gpu/GPUDevice.cpp (213548 => 213549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gpu/GPUDevice.cpp 2017-03-07 23:21:49 UTC (rev 213548)
+++ trunk/Source/WebCore/platform/graphics/gpu/GPUDevice.cpp 2017-03-08 00:09:37 UTC (rev 213549)
</span><span class="lines">@@ -35,6 +35,14 @@
</span><span class="cx"> RefPtr<GPUDevice> GPUDevice::create()
</span><span class="cx"> {
</span><span class="cx"> RefPtr<GPUDevice> device = adoptRef(new GPUDevice());
</span><ins>+
+#if PLATFORM(COCOA)
+ if (!device->platformDevice()) {
+ LOG(WebGPU, "GPUDevice::create() was unable to create the low-level device");
+ return nullptr;
+ }
+#endif
+
</ins><span class="cx"> LOG(WebGPU, "GPUDevice::create() device is %p", device.get());
</span><span class="cx"> return device;
</span><span class="cx"> }
</span><span class="lines">@@ -44,7 +52,7 @@
</span><span class="cx"> LOG(WebGPU, "GPUDevice::~GPUDevice()");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(COCOA) || PLATFORM(IOS_SIMULATOR)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> GPUDevice::GPUDevice()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (213548 => 213549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2017-03-07 23:21:49 UTC (rev 213548)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-03-08 00:09:37 UTC (rev 213549)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-03-07 Dean Jackson <dino@apple.com>
+
+ Some platforms won't be able to create a GPUDevice
+ https://bugs.webkit.org/show_bug.cgi?id=169314
+ <rdar://problems/30907521>
+
+ Reviewed by Jon Lee.
+
+ Disable WEB_GPU on the iOS Simulator.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2017-03-07 Maureen Daum <mdaum@apple.com>
</span><span class="cx">
</span><span class="cx"> Correctly check for an empty database file.
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (213548 => 213549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2017-03-07 23:21:49 UTC (rev 213548)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2017-03-08 00:09:37 UTC (rev 213549)
</span><span class="lines">@@ -200,6 +200,7 @@
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><span class="cx"> ENABLE_WEBGL2 = ENABLE_WEBGL2;
</span><span class="cx"> ENABLE_WEBGPU = ENABLE_WEBGPU;
</span><ins>+ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
</ins><span class="cx"> ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
</span><span class="cx"> ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
</span><span class="cx"> ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (213548 => 213549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-07 23:21:49 UTC (rev 213548)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-08 00:09:37 UTC (rev 213549)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-03-07 Dean Jackson <dino@apple.com>
+
+ Some platforms won't be able to create a GPUDevice
+ https://bugs.webkit.org/show_bug.cgi?id=169314
+ <rdar://problems/30907521>
+
+ Reviewed by Jon Lee.
+
+ Disable WEB_GPU on the iOS Simulator.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2017-03-07 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac][iOS][WK2] Whitelist sysctl-read
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (213548 => 213549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2017-03-07 23:21:49 UTC (rev 213548)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2017-03-08 00:09:37 UTC (rev 213549)
</span><span class="lines">@@ -200,6 +200,7 @@
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><span class="cx"> ENABLE_WEBGL2 = ENABLE_WEBGL2;
</span><span class="cx"> ENABLE_WEBGPU = ENABLE_WEBGPU;
</span><ins>+ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
</ins><span class="cx"> ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
</span><span class="cx"> ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
</span><span class="cx"> ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (213548 => 213549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-07 23:21:49 UTC (rev 213548)
+++ trunk/Tools/ChangeLog 2017-03-08 00:09:37 UTC (rev 213549)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-03-07 Dean Jackson <dino@apple.com>
+
+ Some platforms won't be able to create a GPUDevice
+ https://bugs.webkit.org/show_bug.cgi?id=169314
+ <rdar://problems/30907521>
+
+ Reviewed by Jon Lee.
+
+ Protect for the case where the hardware doesn't support Metal.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+ * TestWebKitAPI/Tests/WebCore/mac/GPUDevice.mm:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2017-03-07 Maureen Daum <mdaum@apple.com>
</span><span class="cx">
</span><span class="cx"> Correctly check for an empty database file.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (213548 => 213549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-03-07 23:21:49 UTC (rev 213548)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-03-08 00:09:37 UTC (rev 213549)
</span><span class="lines">@@ -200,6 +200,7 @@
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><span class="cx"> ENABLE_WEBGL2 = ENABLE_WEBGL2;
</span><span class="cx"> ENABLE_WEBGPU = ENABLE_WEBGPU;
</span><ins>+ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
</ins><span class="cx"> ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
</span><span class="cx"> ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
</span><span class="cx"> ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoremacGPUDevicemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/mac/GPUDevice.mm (213548 => 213549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/mac/GPUDevice.mm 2017-03-07 23:21:49 UTC (rev 213548)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/mac/GPUDevice.mm 2017-03-08 00:09:37 UTC (rev 213549)
</span><span class="lines">@@ -37,6 +37,12 @@
</span><span class="cx"> TEST(GPU, Basic)
</span><span class="cx"> {
</span><span class="cx"> auto device = GPUDevice::create();
</span><ins>+ // Not all hardware supports Metal, so it is possible
+ // that we were unable to create the MTLDevice object.
+ // In that case, the device should be null.
+ if (!device)
+ return;
+
</ins><span class="cx"> EXPECT_NOT_NULL(device->layer());
</span><span class="cx"> EXPECT_NOT_NULL(device->platformLayer());
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>