Context Navigation

Changeset 277324 in webkit

Timestamp:

May 11, 2021, 7:55:53 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[WebXR] Return a default layer handle in XRDeviceProxy::createLayerProjection
https://bugs.webkit.org/show_bug.cgi?id=225631

Patch by Ada Chan <ada.chan@apple.com> on 2021-05-11
Reviewed by Dean Jackson.

(WebKit::XRDeviceProxy::createLayerProjection):

(WebKit::PlatformXRCoordinator::defaultLayerHandle):

(WebKit::PlatformXRSystemProxy::createLayerProjection):

Location:

trunk/Source/WebKit

Files:

-              r277316
+              r277324
+-05-11  Ada Chan  <ada.chan@apple.com>
+        [WebXR] Return a default layer handle in XRDeviceProxy::createLayerProjection
+        https://bugs.webkit.org/show_bug.cgi?id=225631
+        Reviewed by Dean Jackson.
+        * Shared/Cocoa/XRDeviceProxy.h:
+        * Shared/Cocoa/XRDeviceProxy.mm:
+        (WebKit::XRDeviceProxy::createLayerProjection):
+        * UIProcess/Cocoa/PlatformXRCoordinator.h:
+        (WebKit::PlatformXRCoordinator::defaultLayerHandle):
+        * WebProcess/cocoa/PlatformXRSystemProxy.h:
+        * WebProcess/cocoa/PlatformXRSystemProxy.mm:
+        (WebKit::PlatformXRSystemProxy::createLayerProjection):
 -05-10  Wenson Hsieh  <wenson_hsieh@apple.com>

r275835	r277324
57	57	Vector<PlatformXR::Device::ViewData> views(PlatformXR::SessionMode) const final;
58	58	void requestFrame(PlatformXR::Device::RequestFrameCallback&&) final;
59		Optional<PlatformXR::LayerHandle> createLayerProjection(uint32_t, uint32_t, bool) ~~override { return WTF::nullopt; }~~;
	59	Optional<PlatformXR::LayerHandle> createLayerProjection(uint32_t, uint32_t, bool) final;
60	60	void deleteLayer(PlatformXR::LayerHandle) override { };
61	61

-              r275835
+              r277324
+}
+Optional<PlatformXR::LayerHandle> XRDeviceProxy::createLayerProjection(uint32_t width, uint32_t height, bool alpha)
+{
+    return m_xrSystem ? m_xrSystem->createLayerProjection(width, height, alpha) : WTF::nullopt;
+}
 } // namespace WebKit

-              r275835
+              r277324
     virtual ~PlatformXRCoordinator() = default;
+    // FIXME: Temporary and will be fixed later.
+    static PlatformXR::LayerHandle defaultLayerHandle() { return 1; }
     using DeviceInfoCallback = Function<void(Optional<XRDeviceInfo>)>;
     virtual void getPrimaryDeviceInfo(DeviceInfoCallback&&) = 0;

r275835	r277324
46	46	void shutDownTrackingAndRendering();
47	47	void requestFrame(PlatformXR::Device::RequestFrameCallback&&);
	48	Optional<PlatformXR::LayerHandle> createLayerProjection(uint32_t, uint32_t, bool);
48	49
49	50	private:

-              r275835
+              r277324
 #if ENABLE(WEBXR)
+#import "PlatformXRCoordinator.h"
 #import "PlatformXRSystemMessages.h"
 #import "PlatformXRSystemProxyMessages.h"
 …
+}
+Optional<PlatformXR::LayerHandle> PlatformXRSystemProxy::createLayerProjection(uint32_t, uint32_t, bool)
+{
+    return PlatformXRCoordinator::defaultLayerHandle();
+}
 void PlatformXRSystemProxy::sessionDidEnd(XRDeviceIdentifier deviceIdentifier)
+{

Note: See TracChangeset for help on using the changeset viewer.