Skip to content

Commit

Permalink
Unreviewed Build Fix for PlatformXRSystem
Browse files Browse the repository at this point in the history
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
  • Loading branch information
megangardner committed Apr 3, 2023
1 parent 1fe33ed commit a782e01
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 1 deletion.
7 changes: 7 additions & 0 deletions Source/WebKit/UIProcess/WebPageProxy.cpp
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion Source/WebKit/UIProcess/WebPageProxy.h
Expand Up @@ -327,6 +327,7 @@ class NetworkIssueReporter;
class PageClient;
class PageLoadState;
class PageLoadStateObserverBase;
class PlatformXRSystem;
class PlaybackSessionManagerProxy;
class ProcessThrottlerActivity;
class ProvisionalPageProxy;
Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions Source/WebKit/UIProcess/WebProcessProxy.cpp
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
Expand Up @@ -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"
Expand Down

0 comments on commit a782e01

Please sign in to comment.