Title: [275929] trunk/Source
- Revision
- 275929
- Author
- [email protected]
- Date
- 2021-04-13 21:16:31 -0700 (Tue, 13 Apr 2021)
Log Message
Implement PlatformXRSystem::xrCoordinator() for USE(APPLE_INTERNAL_SDK)
https://bugs.webkit.org/show_bug.cgi?id=224510
Patch by Ada Chan <[email protected]> on 2021-04-13
Reviewed by Dean Jackson.
Source/WebKit:
* UIProcess/Cocoa/PlatformXRSystem.mm:
Source/WTF:
Update ENABLE_WEBXR flag
* wtf/PlatformEnableCocoa.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (275928 => 275929)
--- trunk/Source/WTF/ChangeLog 2021-04-14 03:47:40 UTC (rev 275928)
+++ trunk/Source/WTF/ChangeLog 2021-04-14 04:16:31 UTC (rev 275929)
@@ -1,3 +1,14 @@
+2021-04-13 Ada Chan <[email protected]>
+
+ Implement PlatformXRSystem::xrCoordinator() for USE(APPLE_INTERNAL_SDK)
+ https://bugs.webkit.org/show_bug.cgi?id=224510
+
+ Reviewed by Dean Jackson.
+
+ Update ENABLE_WEBXR flag
+
+ * wtf/PlatformEnableCocoa.h:
+
2021-04-13 Alex Christensen <[email protected]>
WebProcessPool should store Vector<Ref<WebProcessProxy>> instead of Vector<RefPtr>
Modified: trunk/Source/WTF/wtf/PlatformEnableCocoa.h (275928 => 275929)
--- trunk/Source/WTF/wtf/PlatformEnableCocoa.h 2021-04-14 03:47:40 UTC (rev 275928)
+++ trunk/Source/WTF/wtf/PlatformEnableCocoa.h 2021-04-14 04:16:31 UTC (rev 275929)
@@ -590,7 +590,7 @@
#define ENABLE_WEBPROCESS_NSRUNLOOP 1
#endif
-#if !defined(ENABLE_WEBXR) && (HAVE(WEBXR_INTERNALS) || (USE(APPLE_INTERNAL_SDK) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000))
+#if !defined(ENABLE_WEBXR) && HAVE(WEBXR_INTERNALS)
#define ENABLE_WEBXR 1
#endif
Modified: trunk/Source/WebKit/ChangeLog (275928 => 275929)
--- trunk/Source/WebKit/ChangeLog 2021-04-14 03:47:40 UTC (rev 275928)
+++ trunk/Source/WebKit/ChangeLog 2021-04-14 04:16:31 UTC (rev 275929)
@@ -1,3 +1,12 @@
+2021-04-13 Ada Chan <[email protected]>
+
+ Implement PlatformXRSystem::xrCoordinator() for USE(APPLE_INTERNAL_SDK)
+ https://bugs.webkit.org/show_bug.cgi?id=224510
+
+ Reviewed by Dean Jackson.
+
+ * UIProcess/Cocoa/PlatformXRSystem.mm:
+
2021-04-13 Chris Dumez <[email protected]>
Unreviewed fix after r275921 to address crashes on the iOS bots.
Modified: trunk/Source/WebKit/UIProcess/Cocoa/PlatformXRSystem.mm (275928 => 275929)
--- trunk/Source/WebKit/UIProcess/Cocoa/PlatformXRSystem.mm 2021-04-14 03:47:40 UTC (rev 275928)
+++ trunk/Source/WebKit/UIProcess/Cocoa/PlatformXRSystem.mm 2021-04-14 04:16:31 UTC (rev 275929)
@@ -99,12 +99,19 @@
xrCoordinator->scheduleAnimationFrame(m_page, WTFMove(completionHandler));
}
+}
+
+#if USE(APPLE_INTERNAL_SDK)
+#include <WebKitAdditions/PlatformXRSystemAdditions.mm>
+#else
+namespace WebKit {
+
PlatformXRCoordinator* PlatformXRSystem::xrCoordinator()
{
- // FIXME: Implement this
return nullptr;
}
}
+#endif
#endif // ENABLE(WEBXR)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
