Title: [213556] trunk/Source/WebCore
- Revision
- 213556
- Author
- [email protected]
- Date
- 2017-03-07 17:36:45 -0800 (Tue, 07 Mar 2017)
Log Message
Make platformDevice() not inline, to avoid a
weak external symbol issue on newer compilers/linkers
* platform/graphics/cocoa/GPUDeviceMetal.mm:
(WebCore::GPUDevice::platformDevice):
* platform/graphics/gpu/GPUDevice.h:
(WebCore::GPUDevice::platformDevice): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (213555 => 213556)
--- trunk/Source/WebCore/ChangeLog 2017-03-08 01:03:38 UTC (rev 213555)
+++ trunk/Source/WebCore/ChangeLog 2017-03-08 01:36:45 UTC (rev 213556)
@@ -1,5 +1,15 @@
2017-03-07 Dean Jackson <[email protected]>
+ Make platformDevice() not inline, to avoid a
+ weak external symbol issue on newer compilers/linkers
+
+ * platform/graphics/cocoa/GPUDeviceMetal.mm:
+ (WebCore::GPUDevice::platformDevice):
+ * platform/graphics/gpu/GPUDevice.h:
+ (WebCore::GPUDevice::platformDevice): Deleted.
+
+2017-03-07 Dean Jackson <[email protected]>
+
Some platforms won't be able to create a GPUDevice
https://bugs.webkit.org/show_bug.cgi?id=169314
<rdar://problems/30907521>
Modified: trunk/Source/WebCore/platform/graphics/cocoa/GPUDeviceMetal.mm (213555 => 213556)
--- trunk/Source/WebCore/platform/graphics/cocoa/GPUDeviceMetal.mm 2017-03-08 01:03:38 UTC (rev 213555)
+++ trunk/Source/WebCore/platform/graphics/cocoa/GPUDeviceMetal.mm 2017-03-08 01:36:45 UTC (rev 213556)
@@ -73,6 +73,11 @@
// FIXME: WebGPU - Lots of reshape stuff should go here. See GC3D.
}
+id GPUDevice::platformDevice()
+{
+ return m_device.get();
+}
+
} // namespace WebCore
#endif
Modified: trunk/Source/WebCore/platform/graphics/gpu/GPUDevice.h (213555 => 213556)
--- trunk/Source/WebCore/platform/graphics/gpu/GPUDevice.h 2017-03-08 01:03:38 UTC (rev 213555)
+++ trunk/Source/WebCore/platform/graphics/gpu/GPUDevice.h 2017-03-08 01:36:45 UTC (rev 213556)
@@ -56,7 +56,7 @@
#if PLATFORM(COCOA)
CALayer* platformLayer() const { return reinterpret_cast<CALayer*>(m_layer.get()); }
- WEBCORE_EXPORT id platformDevice() { return m_device.get(); }
+ WEBCORE_EXPORT id platformDevice();
#endif
WebGPULayer* layer() { return m_layer.get(); }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
