From a782e016ba4cb151f13fcfb53f312f749b0754c7 Mon Sep 17 00:00:00 2001
From: Megan Gardner <megan_gardner@apple.com>
Date: Mon, 3 Apr 2023 16:26:54 -0700
Subject: [PATCH] Unreviewed Build Fix for PlatformXRSystem
 https://bugs.webkit.org/show_bug.cgi?id=254952 rdar://107582238

Unreviewed Build Fix for issues with PlatformXRSystem.

* Source/WebKit/UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::xrSystem const):
* Source/WebKit/UIProcess/WebPageProxy.h:
* Source/WebKit/UIProcess/WebProcessProxy.cpp:
* Source/WebKit/UIProcess/ios/PageClientImplIOS.mm:

Canonical link: https://commits.webkit.org/262545@main
---
 Source/WebKit/UIProcess/WebPageProxy.cpp         | 7 +++++++
 Source/WebKit/UIProcess/WebPageProxy.h           | 3 ++-
 Source/WebKit/UIProcess/WebProcessProxy.cpp      | 1 +
 Source/WebKit/UIProcess/ios/PageClientImplIOS.mm | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
index 5d253f0bfb32..b64ddd68c940 100644
--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
@@ -7071,6 +7071,13 @@ void WebPageProxy::didChangeIntrinsicContentSize(const IntSize& intrinsicContent
 #endif
 }
 
+#if ENABLE(WEBXR) && !USE(OPENXR)
+PlatformXRSystem* WebPageProxy::xrSystem() const
+{
+    return internals().xrSystem.get();
+}
+#endif
+
 #if ENABLE(INPUT_TYPE_COLOR)
 
 void WebPageProxy::showColorPicker(const WebCore::Color& initialColor, const IntRect& elementRect, Vector<WebCore::Color>&& suggestions)
diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
index de0193081ef2..7040042731b9 100644
--- a/Source/WebKit/UIProcess/WebPageProxy.h
+++ b/Source/WebKit/UIProcess/WebPageProxy.h
@@ -327,6 +327,7 @@ class NetworkIssueReporter;
 class PageClient;
 class PageLoadState;
 class PageLoadStateObserverBase;
+class PlatformXRSystem;
 class PlaybackSessionManagerProxy;
 class ProcessThrottlerActivity;
 class ProvisionalPageProxy;
@@ -2212,7 +2213,7 @@ class WebPageProxy final : public API::ObjectImpl<API::Object::Type::Page>, publ
     String scrollbarStateForScrollingNodeID(int scrollingNodeID, bool isVertical);
 
 #if ENABLE(WEBXR) && !USE(OPENXR)
-    PlatformXRSystem* xrSystem() const { return m_xrSystem.get(); }
+    PlatformXRSystem* xrSystem() const;
 #endif
 
 #if ENABLE(INPUT_TYPE_COLOR)
diff --git a/Source/WebKit/UIProcess/WebProcessProxy.cpp b/Source/WebKit/UIProcess/WebProcessProxy.cpp
index ced6f7f2503d..378fa7925e5e 100644
--- a/Source/WebKit/UIProcess/WebProcessProxy.cpp
+++ b/Source/WebKit/UIProcess/WebProcessProxy.cpp
@@ -37,6 +37,7 @@
 #include "NetworkProcessConnectionInfo.h"
 #include "NotificationManagerMessageHandlerMessages.h"
 #include "PageLoadState.h"
+#include "PlatformXRSystem.h"
 #include "ProvisionalFrameProxy.h"
 #include "ProvisionalPageProxy.h"
 #include "RemoteWorkerType.h"
diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
index 4d3604799a92..b77810f0177b 100644
--- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
+++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
@@ -37,6 +37,7 @@
 #import "InteractionInformationAtPosition.h"
 #import "NativeWebKeyboardEvent.h"
 #import "NavigationState.h"
+#import "PlatformXRSystem.h"
 #import "RemoteLayerTreeNode.h"
 #import "RunningBoardServicesSPI.h"
 #import "StringUtilities.h"