Skip to content
Permalink
Browse files
Turn on ENABLE_WEBXR for Cocoa
https://bugs.webkit.org/show_bug.cgi?id=219171

Patch by Ada Chan <adachan@apple.com> on 2020-11-19
Reviewed by Tim Horton.

Source/WebCore:

* Modules/webxr/WebXRRigidTransform.h:
* Modules/webxr/WebXRSystem.h:
* Modules/webxr/WebXRView.h:
* Modules/webxr/XREye.idl:
* Modules/webxr/XRHandedness.idl:
* Modules/webxr/XRReferenceSpaceType.idl:
* Modules/webxr/XRSessionMode.idl:
* Modules/webxr/XRTargetRayMode.idl:
* Modules/webxr/XRVisibilityState.idl:
* SourcesCocoa.txt:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSCallbackData.h:
* dom/ActiveDOMCallback.h:
* platform/xr/cocoa/PlatformXRCocoa.cpp: Copied from Source/WebCore/Modules/webxr/XRTargetRayMode.idl.
* platform/xr/cocoa/PlatformXRCocoa.h: Copied from Source/WebCore/Modules/webxr/XREye.idl.
* platform/xr/openxr/PlatformXROpenXR.cpp:
(PlatformXR::Instance::Impl::queue const):
(PlatformXR::Instance::Impl::checkInstanceExtensionProperties const):
(PlatformXR::Instance::Impl::Impl):
(PlatformXR::Instance::Impl::~Impl):
(PlatformXR::Instance::enumerateImmersiveXRDevices):
* platform/xr/openxr/PlatformXROpenXR.h:

Source/WTF:

* wtf/PlatformEnableCocoa.h:
* wtf/PlatformUse.h:

Canonical link: https://commits.webkit.org/231806@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@270067 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
achan00 authored and webkit-commit-queue committed Nov 20, 2020
1 parent 0ebf917 commit 281e3f72cc7f6290d00ec69ba79542f922503555
Showing 21 changed files with 198 additions and 48 deletions.
@@ -1,3 +1,13 @@
2020-11-19 Ada Chan <adachan@apple.com>

Turn on ENABLE_WEBXR for Cocoa
https://bugs.webkit.org/show_bug.cgi?id=219171

Reviewed by Tim Horton.

* wtf/PlatformEnableCocoa.h:
* wtf/PlatformUse.h:

2020-11-19 Saam Barati <sbarati@apple.com>

Use os_thread_self_restrict_rwx_is_supported instead of pthread_jit_write_protect_supported_np on Apple Internal SDK builds
@@ -590,6 +590,10 @@
#define ENABLE_WEBPROCESS_WINDOWSERVER_BLOCKING 1
#endif

#if !defined(ENABLE_WEBXR) && (HAVE(WEBXR_INTERNALS) || (USE(APPLE_INTERNAL_SDK) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000))
#define ENABLE_WEBXR 1
#endif

#if !defined(ENABLE_WEB_API_STATISTICS)
#define ENABLE_WEB_API_STATISTICS 1
#endif
@@ -326,3 +326,7 @@
#define USE_PTHREAD_JIT_PERMISSIONS_API 1
#endif
#endif

#if PLATFORM(COCOA)
#define USE_OPENXR 0
#endif
@@ -1,3 +1,33 @@
2020-11-19 Ada Chan <adachan@apple.com>

Turn on ENABLE_WEBXR for Cocoa
https://bugs.webkit.org/show_bug.cgi?id=219171

Reviewed by Tim Horton.

* Modules/webxr/WebXRRigidTransform.h:
* Modules/webxr/WebXRSystem.h:
* Modules/webxr/WebXRView.h:
* Modules/webxr/XREye.idl:
* Modules/webxr/XRHandedness.idl:
* Modules/webxr/XRReferenceSpaceType.idl:
* Modules/webxr/XRSessionMode.idl:
* Modules/webxr/XRTargetRayMode.idl:
* Modules/webxr/XRVisibilityState.idl:
* SourcesCocoa.txt:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSCallbackData.h:
* dom/ActiveDOMCallback.h:
* platform/xr/cocoa/PlatformXRCocoa.cpp: Copied from Source/WebCore/Modules/webxr/XRTargetRayMode.idl.
* platform/xr/cocoa/PlatformXRCocoa.h: Copied from Source/WebCore/Modules/webxr/XREye.idl.
* platform/xr/openxr/PlatformXROpenXR.cpp:
(PlatformXR::Instance::Impl::queue const):
(PlatformXR::Instance::Impl::checkInstanceExtensionProperties const):
(PlatformXR::Instance::Impl::Impl):
(PlatformXR::Instance::Impl::~Impl):
(PlatformXR::Instance::enumerateImmersiveXRDevices):
* platform/xr/openxr/PlatformXROpenXR.h:

2020-11-19 Aditya Keerthi <akeerthi@apple.com>

[iOS][FCR] Add new look for progress bars
@@ -38,11 +38,11 @@ struct DOMPointInit;
class DOMPointReadOnly;

class WebXRRigidTransform : public RefCounted<WebXRRigidTransform> {
WTF_MAKE_ISO_ALLOCATED(WebXRRigidTransform);
WTF_MAKE_ISO_ALLOCATED_EXPORT(WebXRRigidTransform, WEBCORE_EXPORT);
public:
static Ref<WebXRRigidTransform> create();
static ExceptionOr<Ref<WebXRRigidTransform>> create(const DOMPointInit&, const DOMPointInit&);
~WebXRRigidTransform();
WEBCORE_EXPORT static ExceptionOr<Ref<WebXRRigidTransform>> create(const DOMPointInit&, const DOMPointInit&);
WEBCORE_EXPORT ~WebXRRigidTransform();

const DOMPointReadOnly& position() const;
const DOMPointReadOnly& orientation() const;
@@ -75,8 +75,8 @@ class WebXRSystem final : public RefCounted<WebXRSystem>, public EventTargetWith
void sessionEnded(WebXRSession&);

// For testing purpouses only.
void registerSimulatedXRDeviceForTesting(PlatformXR::Device&);
void unregisterSimulatedXRDeviceForTesting(PlatformXR::Device&);
WEBCORE_EXPORT void registerSimulatedXRDeviceForTesting(PlatformXR::Device&);
WEBCORE_EXPORT void unregisterSimulatedXRDeviceForTesting(PlatformXR::Device&);

protected:
// EventTarget
@@ -40,17 +40,17 @@ namespace WebCore {
class WebXRRigidTransform;

class WebXRView : public RefCounted<WebXRView> {
WTF_MAKE_ISO_ALLOCATED(WebXRView);
WTF_MAKE_ISO_ALLOCATED_EXPORT(WebXRView, WEBCORE_EXPORT);
public:
static Ref<WebXRView> create();
~WebXRView();
WEBCORE_EXPORT static Ref<WebXRView> create();
WEBCORE_EXPORT ~WebXRView();

XREye eye() const { return m_eye; }
const Float32Array& projectionMatrix() const { return *m_projectionMatrix; }
const WebXRRigidTransform& transform() const { return *m_transform; }

void setEye(XREye eye) { m_eye = eye; }
void setProjectionMatrix(const Vector<float>&);
WEBCORE_EXPORT void setProjectionMatrix(const Vector<float>&);
void setTransform(RefPtr<WebXRRigidTransform>&& viewOffset) { m_transform = WTFMove(viewOffset); }

private:
@@ -25,7 +25,8 @@

[
EnabledAtRuntime=WebXR,
Conditional=WEBXR
Conditional=WEBXR,
ExportMacro=WEBCORE_EXPORT
] enum XREye {
"none",
"left",
@@ -25,7 +25,8 @@

[
EnabledAtRuntime=WebXR,
Conditional=WEBXR
Conditional=WEBXR,
ExportMacro=WEBCORE_EXPORT
] enum XRHandedness {
"none",
"left",
@@ -25,7 +25,8 @@

[
EnabledAtRuntime=WebXR,
Conditional=WEBXR
Conditional=WEBXR,
ExportMacro=WEBCORE_EXPORT
] enum XRReferenceSpaceType {
"viewer",
"local",
@@ -25,7 +25,8 @@

[
EnabledAtRuntime=WebXR,
Conditional=WEBXR
Conditional=WEBXR,
ExportMacro=WEBCORE_EXPORT
] enum XRSessionMode {
"inline",
"immersive-vr",
@@ -25,7 +25,8 @@

[
EnabledAtRuntime=WebXR,
Conditional=WEBXR
Conditional=WEBXR,
ExportMacro=WEBCORE_EXPORT
] enum XRTargetRayMode {
"gaze",
"tracked-pointer",
@@ -25,7 +25,8 @@

[
EnabledAtRuntime=WebXR,
Conditional=WEBXR
Conditional=WEBXR,
ExportMacro=WEBCORE_EXPORT
] enum XRVisibilityState {
"visible",
"visible-blurred",
@@ -587,6 +587,7 @@ platform/text/ios/TextEncodingRegistryIOS.mm
platform/text/mac/TextBoundaries.mm
platform/text/mac/TextCheckingMac.mm
platform/text/mac/TextEncodingRegistryMac.mm
platform/xr/cocoa/PlatformXRCocoa.cpp
rendering/RenderThemeCocoa.mm
rendering/RenderThemeIOS.mm
rendering/RenderThemeMac.mm
@@ -1599,6 +1599,19 @@
51FA2D78152132B300C1BA0B /* DOMWindowExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 517FBA18151AA71B00B57959 /* DOMWindowExtension.h */; settings = {ATTRIBUTES = (Private, ); }; };
51FB5504113E3E9100821176 /* JSCloseEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FB5502113E3E9100821176 /* JSCloseEvent.h */; };
51FB67DC1AE6B82F00D06C5A /* ContentExtensionStyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FB67DA1AE6B5E400D06C5A /* ContentExtensionStyleSheet.h */; settings = {ATTRIBUTES = (Private, ); }; };
5273CC77256103CF00850007 /* PlatformXRCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 5273CC75256103CF00850007 /* PlatformXRCocoa.h */; };
5273CC8E25637EB500850007 /* WebXRTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E18D83E0243F71CE009247D6 /* WebXRTest.cpp */; };
5273CC9025637F6700850007 /* WebFakeXRDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E18D83E9243F71D3009247D6 /* WebFakeXRDevice.cpp */; };
5273CC9125637F7500850007 /* WebFakeXRInputController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E18D83DD243F71CC009247D6 /* WebFakeXRInputController.cpp */; };
5273CC9C2563B25A00850007 /* JSWebXRTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5273CC9A2563B21200850007 /* JSWebXRTest.cpp */; };
5273CCA02563B37700850007 /* JSWebFakeXRDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5273CC9E2563B37600850007 /* JSWebFakeXRDevice.cpp */; };
5273CCA42563B4F800850007 /* JSXRSimulateUserActivationFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5273CCA22563B4F700850007 /* JSXRSimulateUserActivationFunction.cpp */; };
5273CCA82563B5CA00850007 /* JSWebFakeXRInputController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5273CCA62563B5C900850007 /* JSWebFakeXRInputController.cpp */; };
5273CCB02564576F00850007 /* JSFakeXRInputSourceInit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5273CCAA2564576B00850007 /* JSFakeXRInputSourceInit.cpp */; };
5273CCB12564576F00850007 /* JSFakeXRBoundsPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5273CCAC2564576C00850007 /* JSFakeXRBoundsPoint.cpp */; };
5273CCB22564576F00850007 /* JSFakeXRButtonStateInit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5273CCAD2564576C00850007 /* JSFakeXRButtonStateInit.cpp */; };
5273CCB32564576F00850007 /* JSFakeXRRigidTransformInit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5273CCAE2564576D00850007 /* JSFakeXRRigidTransformInit.cpp */; };
5273CCB42564576F00850007 /* JSFakeXRViewInit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5273CCAF2564576E00850007 /* JSFakeXRViewInit.cpp */; };
52B0D4BE1C57FD1E0077CE53 /* PlatformView.h in Headers */ = {isa = PBXBuildFile; fileRef = 52B0D4BD1C57FD1E0077CE53 /* PlatformView.h */; settings = {ATTRIBUTES = (Private, ); }; };
52B0D4C01C57FD660077CE53 /* VideoFullscreenChangeObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 52B0D4BF1C57FD660077CE53 /* VideoFullscreenChangeObserver.h */; settings = {ATTRIBUTES = (Private, ); }; };
52B0D4C21C57FF910077CE53 /* VideoFullscreenInterfaceMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 52B0D4C11C57FF910077CE53 /* VideoFullscreenInterfaceMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -8827,6 +8840,17 @@
526724F21CB2FDF60075974D /* TextTrackRepresentationCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackRepresentationCocoa.h; sourceTree = "<group>"; };
526B3F0122FB7BDD0076D37D /* WHLSLPruneUnreachableStandardLibraryFunctions.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WHLSLPruneUnreachableStandardLibraryFunctions.cpp; sourceTree = "<group>"; };
526B3F0322FB7BDE0076D37D /* WHLSLPruneUnreachableStandardLibraryFunctions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLPruneUnreachableStandardLibraryFunctions.h; sourceTree = "<group>"; };
5273CC74256103CF00850007 /* PlatformXRCocoa.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformXRCocoa.cpp; sourceTree = "<group>"; };
5273CC75256103CF00850007 /* PlatformXRCocoa.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformXRCocoa.h; sourceTree = "<group>"; };
5273CC9A2563B21200850007 /* JSWebXRTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebXRTest.cpp; sourceTree = "<group>"; };
5273CC9E2563B37600850007 /* JSWebFakeXRDevice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebFakeXRDevice.cpp; sourceTree = "<group>"; };
5273CCA22563B4F700850007 /* JSXRSimulateUserActivationFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSXRSimulateUserActivationFunction.cpp; sourceTree = "<group>"; };
5273CCA62563B5C900850007 /* JSWebFakeXRInputController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebFakeXRInputController.cpp; sourceTree = "<group>"; };
5273CCAA2564576B00850007 /* JSFakeXRInputSourceInit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFakeXRInputSourceInit.cpp; sourceTree = "<group>"; };
5273CCAC2564576C00850007 /* JSFakeXRBoundsPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFakeXRBoundsPoint.cpp; sourceTree = "<group>"; };
5273CCAD2564576C00850007 /* JSFakeXRButtonStateInit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFakeXRButtonStateInit.cpp; sourceTree = "<group>"; };
5273CCAE2564576D00850007 /* JSFakeXRRigidTransformInit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFakeXRRigidTransformInit.cpp; sourceTree = "<group>"; };
5273CCAF2564576E00850007 /* JSFakeXRViewInit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFakeXRViewInit.cpp; sourceTree = "<group>"; };
52914C2A22F93E4E00578150 /* WHLSLParsingMode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLParsingMode.h; sourceTree = "<group>"; };
52914C2C22F93E5D00578150 /* WHLSLAddressEscapeMode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLAddressEscapeMode.h; sourceTree = "<group>"; };
52B0D4BD1C57FD1E0077CE53 /* PlatformView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformView.h; sourceTree = "<group>"; };
@@ -19338,6 +19362,11 @@
417DA71213735D90007C57FB /* Testing */ = {
isa = PBXGroup;
children = (
5273CCAC2564576C00850007 /* JSFakeXRBoundsPoint.cpp */,
5273CCAD2564576C00850007 /* JSFakeXRButtonStateInit.cpp */,
5273CCAA2564576B00850007 /* JSFakeXRInputSourceInit.cpp */,
5273CCAE2564576D00850007 /* JSFakeXRRigidTransformInit.cpp */,
5273CCAF2564576E00850007 /* JSFakeXRViewInit.cpp */,
51714EAE1CF6654A004723C4 /* JSGCObservation.cpp */,
51714EAF1CF6654A004723C4 /* JSGCObservation.h */,
417DA71B13735DFA007C57FB /* JSInternals.cpp */,
@@ -19373,6 +19402,10 @@
427DA71C13735DFA007C57FB /* JSServiceWorkerInternals.h */,
EBF5121A1696496C0056BD25 /* JSTypeConversions.cpp */,
EBF5121B1696496C0056BD25 /* JSTypeConversions.h */,
5273CC9E2563B37600850007 /* JSWebFakeXRDevice.cpp */,
5273CCA62563B5C900850007 /* JSWebFakeXRInputController.cpp */,
5273CC9A2563B21200850007 /* JSWebXRTest.cpp */,
5273CCA22563B4F700850007 /* JSXRSimulateUserActivationFunction.cpp */,
);
name = Testing;
sourceTree = "<group>";
@@ -20564,6 +20597,15 @@
path = service;
sourceTree = "<group>";
};
5273CC722561039B00850007 /* cocoa */ = {
isa = PBXGroup;
children = (
5273CC74256103CF00850007 /* PlatformXRCocoa.cpp */,
5273CC75256103CF00850007 /* PlatformXRCocoa.h */,
);
path = cocoa;
sourceTree = "<group>";
};
538EC7EA1F96A95B004D22A8 /* unified-sources */ = {
isa = PBXGroup;
children = (
@@ -28589,6 +28631,7 @@
E1EE8B6B2412B2A700E794D6 /* xr */ = {
isa = PBXGroup;
children = (
5273CC722561039B00850007 /* cocoa */,
E1EE8B6D2412B2A700E794D6 /* openxr */,
E1EE8B6F2412B2A700E794D6 /* PlatformXR.h */,
);
@@ -33833,6 +33876,7 @@
52B0D4BE1C57FD1E0077CE53 /* PlatformView.h in Headers */,
935C476B09AC4D4F00A6AAB4 /* PlatformWheelEvent.h in Headers */,
E1EE8B722412B2A800E794D6 /* PlatformXR.h in Headers */,
5273CC77256103CF00850007 /* PlatformXRCocoa.h in Headers */,
E1C1A39E2480080800E0AF66 /* PlatformXROpenXR.h in Headers */,
712BE4801FE864A7002031CC /* PlaybackDirection.h in Headers */,
CDA29A321CC01A9500901CCF /* PlaybackSessionInterfaceAVKit.h in Headers */,
@@ -35663,6 +35707,11 @@
DE5F86111FA239DA006DB63A /* InternalSettingsGenerated.cpp in Sources */,
4136C57A2398E5BE002497D3 /* InternalsMapLike.cpp in Sources */,
4136EC0C23838870000ADBCE /* InternalsSetLike.cpp in Sources */,
5273CCB12564576F00850007 /* JSFakeXRBoundsPoint.cpp in Sources */,
5273CCB22564576F00850007 /* JSFakeXRButtonStateInit.cpp in Sources */,
5273CCB02564576F00850007 /* JSFakeXRInputSourceInit.cpp in Sources */,
5273CCB32564576F00850007 /* JSFakeXRRigidTransformInit.cpp in Sources */,
5273CCB42564576F00850007 /* JSFakeXRViewInit.cpp in Sources */,
DE5F86121FA239E7006DB63A /* JSGCObservation.cpp in Sources */,
417DA71D13735DFA007C57FB /* JSInternals.cpp in Sources */,
A740B5A714C935AF00A77FA4 /* JSInternalSettings.cpp in Sources */,
@@ -35682,6 +35731,10 @@
57156114234C7FD6008FC7AB /* JSMockWebAuthenticationConfiguration.cpp in Sources */,
427DA71D13735DFA007C57FB /* JSServiceWorkerInternals.cpp in Sources */,
EBF5121C1696496C0056BD25 /* JSTypeConversions.cpp in Sources */,
5273CCA02563B37700850007 /* JSWebFakeXRDevice.cpp in Sources */,
5273CCA82563B5CA00850007 /* JSWebFakeXRInputController.cpp in Sources */,
5273CC9C2563B25A00850007 /* JSWebXRTest.cpp in Sources */,
5273CCA42563B4F800850007 /* JSXRSimulateUserActivationFunction.cpp in Sources */,
CDC26B40160A8CC60026757B /* LegacyMockCDM.cpp in Sources */,
A1E086632489D34E00E496D9 /* MockApplePaySetupFeature.cpp in Sources */,
CDF4B7311E03D00700E235A2 /* MockCDMFactory.cpp in Sources */,
@@ -35700,6 +35753,9 @@
41D41C672256874F00697942 /* ServiceWorkerInternals.mm in Sources */,
DE7710861FA2F0D600460016 /* WebArchiveDumpSupport.mm in Sources */,
41815C1E138319830057AAA4 /* WebCoreTestSupport.cpp in Sources */,
5273CC9025637F6700850007 /* WebFakeXRDevice.cpp in Sources */,
5273CC9125637F7500850007 /* WebFakeXRInputController.cpp in Sources */,
5273CC8E25637EB500850007 /* WebXRTest.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -62,7 +62,7 @@ class JSCallbackData {
#endif
}

static JSC::JSValue invokeCallback(JSDOMGlobalObject&, JSC::JSObject* callback, JSC::JSValue thisValue, JSC::MarkedArgumentBuffer&, CallbackType, JSC::PropertyName functionName, NakedPtr<JSC::Exception>& returnedException);
WEBCORE_EXPORT static JSC::JSValue invokeCallback(JSDOMGlobalObject&, JSC::JSObject* callback, JSC::JSValue thisValue, JSC::MarkedArgumentBuffer&, CallbackType, JSC::PropertyName functionName, NakedPtr<JSC::Exception>& returnedException);

private:
JSC::Weak<JSDOMGlobalObject> m_globalObject;
@@ -47,8 +47,8 @@ class ScriptExecutionContext;
// context thread.
class ActiveDOMCallback : public ContextDestructionObserver {
public:
ActiveDOMCallback(ScriptExecutionContext*);
virtual ~ActiveDOMCallback();
WEBCORE_EXPORT ActiveDOMCallback(ScriptExecutionContext*);
WEBCORE_EXPORT virtual ~ActiveDOMCallback();

WEBCORE_EXPORT bool canInvokeCallback() const;

@@ -0,0 +1,33 @@
/*
* Copyright (C) 2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*/

#include "config.h"
#include "PlatformXRCocoa.h"

#if ENABLE(WEBXR) && PLATFORM(COCOA)

#include <WebKitAdditions/PlatformXRAdditions.cpp>

#endif

0 comments on commit 281e3f7

Please sign in to comment.