Diff
Modified: trunk/Source/WTF/ChangeLog (286316 => 286317)
--- trunk/Source/WTF/ChangeLog 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WTF/ChangeLog 2021-11-30 20:40:10 UTC (rev 286317)
@@ -1,3 +1,17 @@
+2021-11-30 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r286227.
+ https://bugs.webkit.org/show_bug.cgi?id=233652
+
+ Broke some Apple-internal builds
+
+ Reverted changeset:
+
+ "[Model] clean up compile-time flags and condition IDL methods
+ behind them"
+ https://bugs.webkit.org/show_bug.cgi?id=233407
+ https://commits.webkit.org/r286227
+
2021-11-30 Youenn Fablet <[email protected]>
[Cocoa] Enable HTMLVideoElement.requestVideoFrameCallback by default
Modified: trunk/Source/WTF/wtf/PlatformEnableCocoa.h (286316 => 286317)
--- trunk/Source/WTF/wtf/PlatformEnableCocoa.h 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WTF/wtf/PlatformEnableCocoa.h 2021-11-30 20:40:10 UTC (rev 286317)
@@ -736,18 +736,20 @@
#define ENABLE_PREDEFINED_COLOR_SPACE_DISPLAY_P3 1
#endif
-#if !defined(ENABLE_ARKIT_INLINE_PREVIEW) && HAVE(ASV_INLINE_PREVIEW) && !ENABLE(SEPARATED_MODEL)
-#define ENABLE_ARKIT_INLINE_PREVIEW 1
+#if PLATFORM(IOS_FAMILY) && HAVE(ASV_INLINE_PREVIEW) && !ENABLE(SEPARATED_MODEL)
+#define ENABLE_ARKIT_INLINE_PREVIEW_IOS 1
#endif
-#if !defined(ENABLE_MODEL_ELEMENT_CAMERA_CONTROL) && HAVE(ASV_INLINE_PREVIEW_CAMERA_CONTROL)
-#define ENABLE_MODEL_ELEMENT_CAMERA_CONTROL 1
+#if PLATFORM(MAC) && HAVE(ASV_INLINE_PREVIEW)
+#define ENABLE_ARKIT_INLINE_PREVIEW_MAC 1
#endif
-#if !defined(ENABLE_MODEL_ELEMENT_ANIMATION_CONTROL) && HAVE(ASV_INLINE_PREVIEW_ANIMATION_CONTROL)
-#define ENABLE_MODEL_ELEMENT_ANIMATION_CONTROL 1
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS) || ENABLE(ARKIT_INLINE_PREVIEW_MAC)
+#define ENABLE_ARKIT_INLINE_PREVIEW 1
#endif
-#if !defined(ENABLE_MODEL_ELEMENT_AUDIO_CONTROL) && HAVE(ASV_INLINE_PREVIEW_AUDIO_CONTROL)
-#define ENABLE_MODEL_ELEMENT_AUDIO_CONTROL 1
+#if (ENABLE(ARKIT_INLINE_PREVIEW_MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 120400) || (ENABLE(ARKIT_INLINE_PREVIEW_IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 150400)
+#define ENABLE_ARKIT_INLINE_PREVIEW_CAMERA_TRANSFORM 1
+#define ENABLE_ARKIT_INLINE_PREVIEW_ANIMATIONS_CONTROL 1
+#define ENABLE_ARKIT_INLINE_PREVIEW_AUDIO_CONTROL 1
#endif
Modified: trunk/Source/WTF/wtf/PlatformHave.h (286316 => 286317)
--- trunk/Source/WTF/wtf/PlatformHave.h 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2021-11-30 20:40:10 UTC (rev 286317)
@@ -951,24 +951,11 @@
#endif
#if (PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
- || (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
-#define HAVE_ASV_INLINE_PREVIEW_IOS 1
-#endif
-
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000)
-#define HAVE_ASV_INLINE_PREVIEW_MAC 1
-#endif
-
-#if HAVE(ASV_INLINE_PREVIEW_IOS) || HAVE(ASV_INLINE_PREVIEW_MAC)
+ || (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
+ || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000)
#define HAVE_ASV_INLINE_PREVIEW 1
#endif
-#if (HAVE(ASV_INLINE_PREVIEW_MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 120300) || (HAVE(ASV_INLINE_PREVIEW_IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 150400)
-#define HAVE_ASV_INLINE_PREVIEW_CAMERA_CONTROL 1
-#define HAVE_ASV_INLINE_PREVIEW_ANIMATION_CONTROL 1
-#define HAVE_ASV_INLINE_PREVIEW_AUDIO_CONTROL 1
-#endif
-
#if PLATFORM(IOS) || PLATFORM(MACCATALYST) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
#define HAVE_NSURLPROTOCOL_WITH_SKIPAPPSSO 1
#endif
Modified: trunk/Source/WebCore/ChangeLog (286316 => 286317)
--- trunk/Source/WebCore/ChangeLog 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebCore/ChangeLog 2021-11-30 20:40:10 UTC (rev 286317)
@@ -1,3 +1,17 @@
+2021-11-30 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r286227.
+ https://bugs.webkit.org/show_bug.cgi?id=233652
+
+ Broke some Apple-internal builds
+
+ Reverted changeset:
+
+ "[Model] clean up compile-time flags and condition IDL methods
+ behind them"
+ https://bugs.webkit.org/show_bug.cgi?id=233407
+ https://commits.webkit.org/r286227
+
2021-11-30 Chris Dumez <[email protected]>
Several WPT tests under html/semantics/forms/constraints are failing due to extraneous willValidate() checks
Modified: trunk/Source/WebCore/Modules/model-element/HTMLModelElement.cpp (286316 => 286317)
--- trunk/Source/WebCore/Modules/model-element/HTMLModelElement.cpp 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebCore/Modules/model-element/HTMLModelElement.cpp 2021-11-30 20:40:10 UTC (rev 286317)
@@ -358,7 +358,6 @@
// MARK: - Camera support.
-#if ENABLE(MODEL_ELEMENT_CAMERA_CONTROL)
void HTMLModelElement::getCamera(CameraPromise&& promise)
{
if (!m_modelPlayer) {
@@ -388,11 +387,9 @@
promise.reject();
});
}
-#endif // ENABLE(MODEL_ELEMENT_CAMERA_CONTROL)
// MARK: - Animations support.
-#if ENABLE(MODEL_ELEMENT_ANIMATION_CONTROL)
void HTMLModelElement::isPlayingAnimation(IsPlayingAnimationPromise&& promise)
{
if (!m_modelPlayer) {
@@ -507,11 +504,9 @@
promise.reject();
});
}
-#endif // ENABLE(MODEL_ELEMENT_ANIMATION_CONTROL)
// MARK: - Audio support.
-#if ENABLE(MODEL_ELEMENT_AUDIO_CONTROL)
void HTMLModelElement::hasAudio(HasAudioPromise&& promise)
{
if (!m_modelPlayer) {
@@ -556,7 +551,6 @@
promise.reject();
});
}
-#endif // ENABLE(MODEL_ELEMENT_AUDIO_CONTROL)
}
Modified: trunk/Source/WebCore/Modules/model-element/HTMLModelElement.h (286316 => 286317)
--- trunk/Source/WebCore/Modules/model-element/HTMLModelElement.h 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebCore/Modules/model-element/HTMLModelElement.h 2021-11-30 20:40:10 UTC (rev 286317)
@@ -70,13 +70,10 @@
void enterFullscreen();
-#if ENABLE(MODEL_ELEMENT_CAMERA_CONTROL)
using CameraPromise = DOMPromiseDeferred<IDLDictionary<HTMLModelElementCamera>>;
void getCamera(CameraPromise&&);
void setCamera(HTMLModelElementCamera, DOMPromiseDeferred<void>&&);
-#endif
-#if ENABLE(MODEL_ELEMENT_ANIMATION_CONTROL)
using IsPlayingAnimationPromise = DOMPromiseDeferred<IDLBoolean>;
void isPlayingAnimation(IsPlayingAnimationPromise&&);
void playAnimation(DOMPromiseDeferred<void>&&);
@@ -91,15 +88,12 @@
using CurrentTimePromise = DOMPromiseDeferred<IDLDouble>;
void animationCurrentTime(CurrentTimePromise&&);
void setAnimationCurrentTime(double, DOMPromiseDeferred<void>&&);
-#endif
-#if ENABLE(MODEL_ELEMENT_AUDIO_CONTROL)
using HasAudioPromise = DOMPromiseDeferred<IDLBoolean>;
void hasAudio(HasAudioPromise&&);
using IsMutedPromise = DOMPromiseDeferred<IDLBoolean>;
void isMuted(IsMutedPromise&&);
void setIsMuted(bool, DOMPromiseDeferred<void>&&);
-#endif
bool isDraggableIgnoringAttributes() const final { return true; }
@@ -131,9 +125,7 @@
void dragDidChange(MouseEvent&);
void dragDidEnd(MouseEvent&);
-#if ENABLE(MODEL_ELEMENT_ANIMATION_CONTROL)
void setAnimationIsPlaying(bool, DOMPromiseDeferred<void>&&);
-#endif
URL m_sourceURL;
CachedResourceHandle<CachedRawResource> m_resource;
Modified: trunk/Source/WebCore/Modules/model-element/HTMLModelElement.idl (286316 => 286317)
--- trunk/Source/WebCore/Modules/model-element/HTMLModelElement.idl 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebCore/Modules/model-element/HTMLModelElement.idl 2021-11-30 20:40:10 UTC (rev 286317)
@@ -34,21 +34,21 @@
undefined enterFullscreen();
- [Conditional=MODEL_ELEMENT_CAMERA_CONTROL] Promise<HTMLModelElementCamera> getCamera();
- [Conditional=MODEL_ELEMENT_CAMERA_CONTROL] Promise<undefined> setCamera(HTMLModelElementCamera camera);
+ Promise<HTMLModelElementCamera> getCamera();
+ Promise<undefined> setCamera(HTMLModelElementCamera camera);
- [Conditional=MODEL_ELEMENT_ANIMATION_CONTROL] Promise<boolean> isPlayingAnimation();
- [Conditional=MODEL_ELEMENT_ANIMATION_CONTROL] Promise<undefined> playAnimation();
- [Conditional=MODEL_ELEMENT_ANIMATION_CONTROL] Promise<undefined> pauseAnimation();
+ Promise<boolean> isPlayingAnimation();
+ Promise<undefined> playAnimation();
+ Promise<undefined> pauseAnimation();
- [Conditional=MODEL_ELEMENT_ANIMATION_CONTROL] Promise<boolean> isLoopingAnimation();
- [Conditional=MODEL_ELEMENT_ANIMATION_CONTROL] Promise<undefined> setIsLoopingAnimation(boolean looping);
+ Promise<boolean> isLoopingAnimation();
+ Promise<undefined> setIsLoopingAnimation(boolean looping);
- [Conditional=MODEL_ELEMENT_ANIMATION_CONTROL] Promise<double> animationDuration();
- [Conditional=MODEL_ELEMENT_ANIMATION_CONTROL] Promise<double> animationCurrentTime();
- [Conditional=MODEL_ELEMENT_ANIMATION_CONTROL] Promise<undefined> setAnimationCurrentTime(double currentTime);
+ Promise<double> animationDuration();
+ Promise<double> animationCurrentTime();
+ Promise<undefined> setAnimationCurrentTime(double currentTime);
- [Conditional=MODEL_ELEMENT_AUDIO_CONTROL] Promise<boolean> hasAudio();
- [Conditional=MODEL_ELEMENT_AUDIO_CONTROL] Promise<boolean> isMuted();
- [Conditional=MODEL_ELEMENT_AUDIO_CONTROL] Promise<undefined> setIsMuted(boolean isMuted);
+ Promise<boolean> hasAudio();
+ Promise<boolean> isMuted();
+ Promise<undefined> setIsMuted(boolean isMuted);
};
Modified: trunk/Source/WebCore/Modules/model-element/ModelPlayer.h (286316 => 286317)
--- trunk/Source/WebCore/Modules/model-element/ModelPlayer.h 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebCore/Modules/model-element/ModelPlayer.h 2021-11-30 20:40:10 UTC (rev 286317)
@@ -50,11 +50,8 @@
virtual void handleMouseDown(const LayoutPoint&, MonotonicTime) = 0;
virtual void handleMouseMove(const LayoutPoint&, MonotonicTime) = 0;
virtual void handleMouseUp(const LayoutPoint&, MonotonicTime) = 0;
-#if ENABLE(MODEL_ELEMENT_CAMERA_CONTROL)
virtual void getCamera(CompletionHandler<void(std::optional<HTMLModelElementCamera>&&)>&&) = 0;
virtual void setCamera(HTMLModelElementCamera, CompletionHandler<void(bool success)>&&) = 0;
-#endif
-#if ENABLE(MODEL_ELEMENT_ANIMATION_CONTROL)
virtual void isPlayingAnimation(CompletionHandler<void(std::optional<bool>&&)>&&) = 0;
virtual void setAnimationIsPlaying(bool, CompletionHandler<void(bool success)>&&) = 0;
virtual void isLoopingAnimation(CompletionHandler<void(std::optional<bool>&&)>&&) = 0;
@@ -62,12 +59,9 @@
virtual void animationDuration(CompletionHandler<void(std::optional<Seconds>&&)>&&) = 0;
virtual void animationCurrentTime(CompletionHandler<void(std::optional<Seconds>&&)>&&) = 0;
virtual void setAnimationCurrentTime(Seconds, CompletionHandler<void(bool success)>&&) = 0;
-#endif
-#if ENABLE(MODEL_ELEMENT_AUDIO_CONTROL)
virtual void hasAudio(CompletionHandler<void(std::optional<bool>&&)>&&) = 0;
virtual void isMuted(CompletionHandler<void(std::optional<bool>&&)>&&) = 0;
virtual void setIsMuted(bool, CompletionHandler<void(bool success)>&&) = 0;
-#endif
};
}
Modified: trunk/Source/WebCore/Modules/model-element/dummy/DummyModelPlayer.cpp (286316 => 286317)
--- trunk/Source/WebCore/Modules/model-element/dummy/DummyModelPlayer.cpp 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebCore/Modules/model-element/dummy/DummyModelPlayer.cpp 2021-11-30 20:40:10 UTC (rev 286317)
@@ -70,7 +70,6 @@
{
}
-#if ENABLE(MODEL_ELEMENT_CAMERA_CONTROL)
void DummyModelPlayer::getCamera(CompletionHandler<void(std::optional<WebCore::HTMLModelElementCamera>&&)>&&)
{
}
@@ -78,9 +77,7 @@
void DummyModelPlayer::setCamera(WebCore::HTMLModelElementCamera, CompletionHandler<void(bool success)>&&)
{
}
-#endif
-#if ENABLE(MODEL_ELEMENT_ANIMATION_CONTROL)
void DummyModelPlayer::isPlayingAnimation(CompletionHandler<void(std::optional<bool>&&)>&&)
{
}
@@ -108,9 +105,7 @@
void DummyModelPlayer::setAnimationCurrentTime(Seconds, CompletionHandler<void(bool success)>&&)
{
}
-#endif
-#if ENABLE(MODEL_ELEMENT_AUDIO_CONTROL)
void DummyModelPlayer::hasAudio(CompletionHandler<void(std::optional<bool>&&)>&&)
{
}
@@ -122,6 +117,5 @@
void DummyModelPlayer::setIsMuted(bool, CompletionHandler<void(bool success)>&&)
{
}
-#endif
}
Modified: trunk/Source/WebCore/Modules/model-element/dummy/DummyModelPlayer.h (286316 => 286317)
--- trunk/Source/WebCore/Modules/model-element/dummy/DummyModelPlayer.h 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebCore/Modules/model-element/dummy/DummyModelPlayer.h 2021-11-30 20:40:10 UTC (rev 286317)
@@ -47,11 +47,8 @@
void handleMouseDown(const LayoutPoint&, MonotonicTime) override;
void handleMouseMove(const LayoutPoint&, MonotonicTime) override;
void handleMouseUp(const LayoutPoint&, MonotonicTime) override;
-#if ENABLE(MODEL_ELEMENT_CAMERA_CONTROL)
void getCamera(CompletionHandler<void(std::optional<WebCore::HTMLModelElementCamera>&&)>&&) override;
void setCamera(WebCore::HTMLModelElementCamera, CompletionHandler<void(bool success)>&&) override;
-#endif
-#if ENABLE(MODEL_ELEMENT_ANIMATION_CONTROL)
void isPlayingAnimation(CompletionHandler<void(std::optional<bool>&&)>&&) override;
void setAnimationIsPlaying(bool, CompletionHandler<void(bool success)>&&) override;
void isLoopingAnimation(CompletionHandler<void(std::optional<bool>&&)>&&) override;
@@ -59,12 +56,9 @@
void animationDuration(CompletionHandler<void(std::optional<Seconds>&&)>&&) override;
void animationCurrentTime(CompletionHandler<void(std::optional<Seconds>&&)>&&) override;
void setAnimationCurrentTime(Seconds, CompletionHandler<void(bool success)>&&) override;
-#endif
-#if ENABLE(MODEL_ELEMENT_AUDIO_CONTROL)
void hasAudio(CompletionHandler<void(std::optional<bool>&&)>&&) override;
void isMuted(CompletionHandler<void(std::optional<bool>&&)>&&) override;
void setIsMuted(bool, CompletionHandler<void(bool success)>&&) override;
-#endif
WeakPtr<ModelPlayerClient> m_client;
};
Modified: trunk/Source/WebCore/Modules/model-element/scenekit/SceneKitModelPlayer.h (286316 => 286317)
--- trunk/Source/WebCore/Modules/model-element/scenekit/SceneKitModelPlayer.h 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebCore/Modules/model-element/scenekit/SceneKitModelPlayer.h 2021-11-30 20:40:10 UTC (rev 286317)
@@ -61,11 +61,8 @@
void handleMouseDown(const LayoutPoint&, MonotonicTime) override;
void handleMouseMove(const LayoutPoint&, MonotonicTime) override;
void handleMouseUp(const LayoutPoint&, MonotonicTime) override;
-#if ENABLE(MODEL_ELEMENT_CAMERA_CONTROL)
void getCamera(CompletionHandler<void(std::optional<HTMLModelElementCamera>&&)>&&) override;
void setCamera(HTMLModelElementCamera, CompletionHandler<void(bool success)>&&) override;
-#endif
-#if ENABLE(MODEL_ELEMENT_ANIMATION_CONTROL)
void isPlayingAnimation(CompletionHandler<void(std::optional<bool>&&)>&&) override;
void setAnimationIsPlaying(bool, CompletionHandler<void(bool success)>&&) override;
void isLoopingAnimation(CompletionHandler<void(std::optional<bool>&&)>&&) override;
@@ -73,12 +70,9 @@
void animationDuration(CompletionHandler<void(std::optional<Seconds>&&)>&&) override;
void animationCurrentTime(CompletionHandler<void(std::optional<Seconds>&&)>&&) override;
void setAnimationCurrentTime(Seconds, CompletionHandler<void(bool success)>&&) override;
-#endif
-#if ENABLE(MODEL_ELEMENT_AUDIO_CONTROL)
void hasAudio(CompletionHandler<void(std::optional<bool>&&)>&&) override;
void isMuted(CompletionHandler<void(std::optional<bool>&&)>&&) override;
void setIsMuted(bool, CompletionHandler<void(bool success)>&&) override;
-#endif
// SceneKitModelLoaderClient overrides.
virtual void didFinishLoading(SceneKitModelLoader&, Ref<SceneKitModel>) override;
Modified: trunk/Source/WebCore/Modules/model-element/scenekit/SceneKitModelPlayer.mm (286316 => 286317)
--- trunk/Source/WebCore/Modules/model-element/scenekit/SceneKitModelPlayer.mm 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebCore/Modules/model-element/scenekit/SceneKitModelPlayer.mm 2021-11-30 20:40:10 UTC (rev 286317)
@@ -88,7 +88,6 @@
{
}
-#if ENABLE(MODEL_ELEMENT_CAMERA_CONTROL)
void SceneKitModelPlayer::getCamera(CompletionHandler<void(std::optional<HTMLModelElementCamera>&&)>&&)
{
}
@@ -96,9 +95,7 @@
void SceneKitModelPlayer::setCamera(HTMLModelElementCamera, CompletionHandler<void(bool success)>&&)
{
}
-#endif
-#if ENABLE(MODEL_ELEMENT_ANIMATION_CONTROL)
void SceneKitModelPlayer::isPlayingAnimation(CompletionHandler<void(std::optional<bool>&&)>&&)
{
}
@@ -126,9 +123,7 @@
void SceneKitModelPlayer::setAnimationCurrentTime(Seconds, CompletionHandler<void(bool success)>&&)
{
}
-#endif
-#if ENABLE(MODEL_ELEMENT_AUDIO_CONTROL)
void SceneKitModelPlayer::hasAudio(CompletionHandler<void(std::optional<bool>&&)>&&)
{
}
@@ -140,7 +135,6 @@
void SceneKitModelPlayer::setIsMuted(bool, CompletionHandler<void(bool success)>&&)
{
}
-#endif
// MARK: - SceneKitModelLoaderClient overrides.
Modified: trunk/Source/WebCore/PAL/ChangeLog (286316 => 286317)
--- trunk/Source/WebCore/PAL/ChangeLog 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebCore/PAL/ChangeLog 2021-11-30 20:40:10 UTC (rev 286317)
@@ -1,3 +1,17 @@
+2021-11-30 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r286227.
+ https://bugs.webkit.org/show_bug.cgi?id=233652
+
+ Broke some Apple-internal builds
+
+ Reverted changeset:
+
+ "[Model] clean up compile-time flags and condition IDL methods
+ behind them"
+ https://bugs.webkit.org/show_bug.cgi?id=233407
+ https://commits.webkit.org/r286227
+
2021-11-29 Chris Fleizach <[email protected]>
AX: Unify speech synthesizer platform usage for Mac/iOS
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/QuartzCoreSPI.h (286316 => 286317)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/QuartzCoreSPI.h 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/QuartzCoreSPI.h 2021-11-30 20:40:10 UTC (rev 286317)
@@ -55,7 +55,9 @@
#ifdef __OBJC__
typedef struct _CARenderContext CARenderContext;
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
@class CAFenceHandle;
+#endif
@interface CAContext : NSObject
@end
@@ -90,7 +92,9 @@
@property CGColorSpaceRef colorSpace;
@property (readonly) CARenderContext* renderContext;
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
-(BOOL)addFence:(CAFenceHandle *)handle;
+#endif
@end
Modified: trunk/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h (286316 => 286317)
--- trunk/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h 2021-11-30 20:40:10 UTC (rev 286317)
@@ -33,7 +33,7 @@
#import <AssetViewer/ASVThumbnailView.h>
#endif
-#if HAVE(ASV_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
#import <AssetViewer/ASVInlinePreview.h>
#endif
@@ -82,7 +82,7 @@
#endif
-#if HAVE(ASV_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
#import <simd/simd.h>
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/SystemPreviewSPI.h (286316 => 286317)
--- trunk/Source/WebCore/PAL/pal/spi/mac/SystemPreviewSPI.h 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/SystemPreviewSPI.h 2021-11-30 20:40:10 UTC (rev 286317)
@@ -25,13 +25,13 @@
#if USE(APPLE_INTERNAL_SDK)
-#if HAVE(ASV_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
#import <AssetViewer/ASVInlinePreview.h>
#endif
#else // USE(APPLE_INTERNAL_SDK)
-#if HAVE(ASV_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
#import <simd/simd.h>
@@ -72,6 +72,6 @@
NS_ASSUME_NONNULL_END
-#endif // HAVE(ASV_INLINE_PREVIEW_MAC)
+#endif // ENABLE(ARKIT_INLINE_PREVIEW_MAC)
#endif // USE(APPLE_INTERNAL_SDK)
Modified: trunk/Source/WebKit/ChangeLog (286316 => 286317)
--- trunk/Source/WebKit/ChangeLog 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebKit/ChangeLog 2021-11-30 20:40:10 UTC (rev 286317)
@@ -1,3 +1,17 @@
+2021-11-30 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r286227.
+ https://bugs.webkit.org/show_bug.cgi?id=233652
+
+ Broke some Apple-internal builds
+
+ Reverted changeset:
+
+ "[Model] clean up compile-time flags and condition IDL methods
+ behind them"
+ https://bugs.webkit.org/show_bug.cgi?id=233407
+ https://commits.webkit.org/r286227
+
2021-11-30 BJ Burg <[email protected]>
[Cocoa] Web Inspector: fix bundle identifier lookup for enabling remote inspection
Modified: trunk/Source/WebKit/Shared/ModelIdentifier.h (286316 => 286317)
--- trunk/Source/WebKit/Shared/ModelIdentifier.h 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebKit/Shared/ModelIdentifier.h 2021-11-30 20:40:10 UTC (rev 286317)
@@ -29,14 +29,14 @@
#if ENABLE(ARKIT_INLINE_PREVIEW)
-#if HAVE(ASV_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
#import <WebCore/GraphicsLayer.h>
#endif
struct ModelIdentifier {
-#if HAVE(ASV_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
String uuid;
-#elif HAVE(ASV_INLINE_PREVIEW_IOS)
+#elif ENABLE(ARKIT_INLINE_PREVIEW_IOS)
WebCore::GraphicsLayer::PlatformLayerID layerIdentifier;
#endif
@@ -46,9 +46,9 @@
template<class Encoder> void ModelIdentifier::encode(Encoder& encoder) const
{
-#if HAVE(ASV_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
encoder << uuid;
-#elif HAVE(ASV_INLINE_PREVIEW_IOS)
+#elif ENABLE(ARKIT_INLINE_PREVIEW_IOS)
encoder << layerIdentifier;
#endif
}
@@ -55,13 +55,13 @@
template<class Decoder> std::optional<ModelIdentifier> ModelIdentifier::decode(Decoder& decoder)
{
-#if HAVE(ASV_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
std::optional<String> uuid;
decoder >> uuid;
if (!uuid)
return std::nullopt;
return { { WTFMove(*uuid) } };
-#elif HAVE(ASV_INLINE_PREVIEW_IOS)
+#elif ENABLE(ARKIT_INLINE_PREVIEW_IOS)
std::optional<WebCore::GraphicsLayer::PlatformLayerID> layerIdentifier;
decoder >> layerIdentifier;
if (!layerIdentifier)
Modified: trunk/Source/WebKit/UIProcess/Cocoa/ModelElementControllerCocoa.mm (286316 => 286317)
--- trunk/Source/WebKit/UIProcess/Cocoa/ModelElementControllerCocoa.mm 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebKit/UIProcess/Cocoa/ModelElementControllerCocoa.mm 2021-11-30 20:40:10 UTC (rev 286317)
@@ -33,14 +33,11 @@
#import <WebCore/LayoutPoint.h>
#import <WebCore/LayoutUnit.h>
#import <WebCore/ResourceError.h>
+#import <simd/simd.h>
#import <wtf/MainThread.h>
#import <wtf/MonotonicTime.h>
-#if HAVE(ASV_INLINE_PREVIEW_CAMERA_CONTROL)
-#import <simd/simd.h>
-#endif
-
-#if HAVE(ASV_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
#import "APIUIClient.h"
#import "RemoteLayerTreeDrawingAreaProxy.h"
#import "RemoteLayerTreeHost.h"
@@ -50,7 +47,7 @@
#import <pal/spi/ios/SystemPreviewSPI.h>
#endif
-#if HAVE(ASV_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
#import <pal/spi/mac/SystemPreviewSPI.h>
#endif
@@ -59,7 +56,7 @@
namespace WebKit {
-#if HAVE(ASV_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
WKModelView * ModelElementController::modelViewForModelIdentifier(ModelIdentifier modelIdentifier)
{
@@ -136,7 +133,7 @@
#endif
-#if HAVE(ASV_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
ASVInlinePreview * ModelElementController::previewForModelIdentifier(ModelIdentifier modelIdentifier)
{
@@ -234,11 +231,11 @@
#endif
-#if ENABLE(MODEL_ELEMENT_CAMERA_CONTROL)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
static bool previewHasCameraSupport(ASVInlinePreview *preview)
{
-#if HAVE(ASV_INLINE_PREVIEW_CAMERA_CONTROL)
+#if ENABLE(ARKIT_INLINE_PREVIEW_CAMERA_TRANSFORM)
return [preview respondsToSelector:@selector(getCameraTransform:)];
#else
return false;
@@ -253,7 +250,7 @@
return;
}
-#if HAVE(ASV_INLINE_PREVIEW_CAMERA_CONTROL)
+#if ENABLE(ARKIT_INLINE_PREVIEW_CAMERA_TRANSFORM)
[preview getCameraTransform:makeBlockPtr([weakThis = WeakPtr { *this }, completionHandler = WTFMove(completionHandler)] (simd_float3 cameraTransform, NSError *error) mutable {
if (error) {
callOnMainRunLoop([weakThis = WTFMove(weakThis), completionHandler = WTFMove(completionHandler)] () mutable {
@@ -281,7 +278,7 @@
return;
}
-#if HAVE(ASV_INLINE_PREVIEW_CAMERA_CONTROL)
+#if ENABLE(ARKIT_INLINE_PREVIEW_CAMERA_TRANSFORM)
[preview setCameraTransform:simd_make_float3(camera.pitch, camera.yaw, camera.scale)];
completionHandler(true);
#else
@@ -289,13 +286,9 @@
#endif
}
-#endif // ENABLE(MODEL_ELEMENT_CAMERA_CONTROL)
-
-#if ENABLE(MODEL_ELEMENT_ANIMATION_CONTROL)
-
static bool previewHasAnimationSupport(ASVInlinePreview *preview)
{
-#if HAVE(ASV_INLINE_PREVIEW_ANIMATION_CONTROL)
+#if ENABLE(ARKIT_INLINE_PREVIEW_ANIMATIONS_CONTROL)
return [preview respondsToSelector:@selector(isPlaying)];
#else
return false;
@@ -310,7 +303,7 @@
return;
}
-#if HAVE(ASV_INLINE_PREVIEW_ANIMATION_CONTROL)
+#if ENABLE(ARKIT_INLINE_PREVIEW_ANIMATIONS_CONTROL)
completionHandler([preview isPlaying]);
#else
ASSERT_NOT_REACHED();
@@ -325,7 +318,7 @@
return;
}
-#if HAVE(ASV_INLINE_PREVIEW_ANIMATION_CONTROL)
+#if ENABLE(ARKIT_INLINE_PREVIEW_ANIMATIONS_CONTROL)
[preview setIsPlaying:isPlaying reply:makeBlockPtr([weakThis = WeakPtr { *this }, completionHandler = WTFMove(completionHandler)] (BOOL, NSError *error) mutable {
callOnMainRunLoop([error, weakThis = WTFMove(weakThis), completionHandler = WTFMove(completionHandler)] () mutable {
if (weakThis)
@@ -345,7 +338,7 @@
return;
}
-#if HAVE(ASV_INLINE_PREVIEW_ANIMATION_CONTROL)
+#if ENABLE(ARKIT_INLINE_PREVIEW_ANIMATIONS_CONTROL)
completionHandler([preview isLooping]);
#else
ASSERT_NOT_REACHED();
@@ -360,7 +353,7 @@
return;
}
-#if HAVE(ASV_INLINE_PREVIEW_ANIMATION_CONTROL)
+#if ENABLE(ARKIT_INLINE_PREVIEW_ANIMATIONS_CONTROL)
preview.isLooping = isLooping;
completionHandler(true);
#else
@@ -376,7 +369,7 @@
return;
}
-#if HAVE(ASV_INLINE_PREVIEW_ANIMATION_CONTROL)
+#if ENABLE(ARKIT_INLINE_PREVIEW_ANIMATIONS_CONTROL)
completionHandler(Seconds([preview duration]));
#else
ASSERT_NOT_REACHED();
@@ -391,7 +384,7 @@
return;
}
-#if HAVE(ASV_INLINE_PREVIEW_ANIMATION_CONTROL)
+#if ENABLE(ARKIT_INLINE_PREVIEW_ANIMATIONS_CONTROL)
completionHandler(Seconds([preview currentTime]));
#else
ASSERT_NOT_REACHED();
@@ -406,7 +399,7 @@
return;
}
-#if HAVE(ASV_INLINE_PREVIEW_ANIMATION_CONTROL)
+#if ENABLE(ARKIT_INLINE_PREVIEW_ANIMATIONS_CONTROL)
preview.currentTime = currentTime.seconds();
completionHandler(true);
#else
@@ -414,13 +407,9 @@
#endif
}
-#endif // ENABLE(MODEL_ELEMENT_ANIMATION_CONTROL)
-
-#if ENABLE(MODEL_ELEMENT_AUDIO_CONTROL)
-
static bool previewHasAudioSupport(ASVInlinePreview *preview)
{
-#if HAVE(ASV_INLINE_PREVIEW_AUDIO_CONTROL)
+#if ENABLE(ARKIT_INLINE_PREVIEW_AUDIO_CONTROL)
return [preview respondsToSelector:@selector(hasAudio)];
#else
return false;
@@ -435,7 +424,7 @@
return;
}
-#if HAVE(ASV_INLINE_PREVIEW_AUDIO_CONTROL)
+#if ENABLE(ARKIT_INLINE_PREVIEW_AUDIO_CONTROL)
completionHandler([preview hasAudio]);
#else
ASSERT_NOT_REACHED();
@@ -450,7 +439,7 @@
return;
}
-#if HAVE(ASV_INLINE_PREVIEW_AUDIO_CONTROL)
+#if ENABLE(ARKIT_INLINE_PREVIEW_AUDIO_CONTROL)
completionHandler([preview isMuted]);
#else
ASSERT_NOT_REACHED();
@@ -465,7 +454,7 @@
return;
}
-#if HAVE(ASV_INLINE_PREVIEW_AUDIO_CONTROL)
+#if ENABLE(ARKIT_INLINE_PREVIEW_AUDIO_CONTROL)
preview.isMuted = isMuted;
completionHandler(true);
#else
@@ -473,8 +462,8 @@
#endif
}
-#endif // ENABLE(MODEL_ELEMENT_AUDIO_CONTROL)
+#endif
}
-#endif // ENABLE(ARKIT_INLINE_PREVIEW)
+#endif
Modified: trunk/Source/WebKit/UIProcess/ModelElementController.h (286316 => 286317)
--- trunk/Source/WebKit/UIProcess/ModelElementController.h 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebKit/UIProcess/ModelElementController.h 2021-11-30 20:40:10 UTC (rev 286317)
@@ -36,7 +36,7 @@
OBJC_CLASS ASVInlinePreview;
-#if HAVE(ASV_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
OBJC_CLASS WKModelView;
#endif
@@ -52,11 +52,8 @@
WebPageProxy& page() { return m_webPageProxy; }
#if ENABLE(ARKIT_INLINE_PREVIEW)
-#if ENABLE(MODEL_ELEMENT_CAMERA_CONTROL)
void getCameraForModelElement(ModelIdentifier, CompletionHandler<void(Expected<WebCore::HTMLModelElementCamera, WebCore::ResourceError>)>&&);
void setCameraForModelElement(ModelIdentifier, WebCore::HTMLModelElementCamera, CompletionHandler<void(bool)>&&);
-#endif
-#if ENABLE(MODEL_ELEMENT_ANIMATION_CONTROL)
void isPlayingAnimationForModelElement(ModelIdentifier, CompletionHandler<void(Expected<bool, WebCore::ResourceError>)>&&);
void setAnimationIsPlayingForModelElement(ModelIdentifier, bool, CompletionHandler<void(bool)>&&);
void isLoopingAnimationForModelElement(ModelIdentifier, CompletionHandler<void(Expected<bool, WebCore::ResourceError>)>&&);
@@ -64,17 +61,14 @@
void animationDurationForModelElement(ModelIdentifier, CompletionHandler<void(Expected<Seconds, WebCore::ResourceError>)>&&);
void animationCurrentTimeForModelElement(ModelIdentifier, CompletionHandler<void(Expected<Seconds, WebCore::ResourceError>)>&&);
void setAnimationCurrentTimeForModelElement(ModelIdentifier, Seconds, CompletionHandler<void(bool)>&&);
-#endif
-#if ENABLE(MODEL_ELEMENT_AUDIO_CONTROL)
void hasAudioForModelElement(ModelIdentifier, CompletionHandler<void(Expected<bool, WebCore::ResourceError>)>&&);
void isMutedForModelElement(ModelIdentifier, CompletionHandler<void(Expected<bool, WebCore::ResourceError>)>&&);
void setIsMutedForModelElement(ModelIdentifier, bool, CompletionHandler<void(bool)>&&);
#endif
-#endif // ENABLE(ARKIT_INLINE_PREVIEW)
-#if HAVE(ASV_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
void takeModelElementFullscreen(ModelIdentifier);
#endif
-#if HAVE(ASV_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
void modelElementDidCreatePreview(URL, String, WebCore::FloatSize, CompletionHandler<void(Expected<std::pair<String, uint32_t>, WebCore::ResourceError>)>&&);
void handleMouseDownForModelElement(const String&, const WebCore::LayoutPoint&, MonotonicTime);
void handleMouseMoveForModelElement(const String&, const WebCore::LayoutPoint&, MonotonicTime);
@@ -86,12 +80,12 @@
ASVInlinePreview * previewForModelIdentifier(ModelIdentifier);
#endif
-#if HAVE(ASV_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
WKModelView * modelViewForModelIdentifier(ModelIdentifier);
#endif
WebPageProxy& m_webPageProxy;
-#if HAVE(ASV_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
RetainPtr<ASVInlinePreview> previewForUUID(const String&);
HashMap<String, RetainPtr<ASVInlinePreview>> m_inlinePreviews;
#endif
Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm (286316 => 286317)
--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm 2021-11-30 20:40:10 UTC (rev 286317)
@@ -35,7 +35,7 @@
#import <UIKit/UIScrollView.h>
#import <pal/spi/cocoa/QuartzCoreSPI.h>
-#if HAVE(ASV_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
#import "WKModelView.h"
#endif
@@ -100,7 +100,7 @@
case PlatformCALayer::LayerTypeModelLayer:
#if ENABLE(SEPARATED_MODEL)
return makeWithView(adoptNS([[WKSeparatedModelView alloc] initWithModel:*properties.model]));
-#elif HAVE(ASV_INLINE_PREVIEW_IOS)
+#elif ENABLE(ARKIT_INLINE_PREVIEW_IOS)
return makeWithView(adoptNS([[WKModelView alloc] initWithModel:*properties.model]));
#else
return makeWithView(adoptNS([[WKCompositingView alloc] init]));
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (286316 => 286317)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-11-30 20:40:10 UTC (rev 286317)
@@ -10838,7 +10838,6 @@
#endif
#if ENABLE(ARKIT_INLINE_PREVIEW)
-#if ENABLE(MODEL_ELEMENT_CAMERA_CONTROL)
void WebPageProxy::modelElementGetCamera(ModelIdentifier modelIdentifier, CompletionHandler<void(Expected<WebCore::HTMLModelElementCamera, ResourceError>)>&& completionHandler)
{
modelElementController()->getCameraForModelElement(modelIdentifier, WTFMove(completionHandler));
@@ -10848,9 +10847,7 @@
{
modelElementController()->setCameraForModelElement(modelIdentifier, camera, WTFMove(completionHandler));
}
-#endif
-#if ENABLE(MODEL_ELEMENT_ANIMATION_CONTROL)
void WebPageProxy::modelElementIsPlayingAnimation(ModelIdentifier modelIdentifier, CompletionHandler<void(Expected<bool, ResourceError>)>&& completionHandler)
{
modelElementController()->isPlayingAnimationForModelElement(modelIdentifier, WTFMove(completionHandler));
@@ -10885,9 +10882,7 @@
{
modelElementController()->setAnimationCurrentTimeForModelElement(modelIdentifier, currentTime, WTFMove(completionHandler));
}
-#endif
-#if ENABLE(MODEL_ELEMENT_AUDIO_CONTROL)
void WebPageProxy::modelElementHasAudio(ModelIdentifier modelIdentifier, CompletionHandler<void(Expected<bool, ResourceError>)>&& completionHandler)
{
modelElementController()->hasAudioForModelElement(modelIdentifier, WTFMove(completionHandler));
@@ -10903,9 +10898,8 @@
modelElementController()->setIsMutedForModelElement(modelIdentifier, isMuted, WTFMove(completionHandler));
}
#endif
-#endif // ENABLE(ARKIT_INLINE_PREVIEW)
-#if HAVE(ASV_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
void WebPageProxy::takeModelElementFullscreen(ModelIdentifier modelIdentifier)
{
modelElementController()->takeModelElementFullscreen(modelIdentifier);
@@ -10912,7 +10906,7 @@
}
#endif
-#if HAVE(ASV_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
void WebPageProxy::modelElementDidCreatePreview(const URL& url, const String& uuid, const FloatSize& size, CompletionHandler<void(Expected<std::pair<String, uint32_t>, ResourceError>)>&& completionHandler)
{
modelElementController()->modelElementDidCreatePreview(url, uuid, size, WTFMove(completionHandler));
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (286316 => 286317)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2021-11-30 20:40:10 UTC (rev 286317)
@@ -588,11 +588,8 @@
#if ENABLE(ARKIT_INLINE_PREVIEW)
ModelElementController* modelElementController() { return m_modelElementController.get(); }
-#if ENABLE(MODEL_ELEMENT_CAMERA_CONTROL)
void modelElementGetCamera(ModelIdentifier, CompletionHandler<void(Expected<WebCore::HTMLModelElementCamera, WebCore::ResourceError>)>&&);
void modelElementSetCamera(ModelIdentifier, WebCore::HTMLModelElementCamera, CompletionHandler<void(bool)>&&);
-#endif
-#if ENABLE(MODEL_ELEMENT_ANIMATION_CONTROL)
void modelElementIsPlayingAnimation(ModelIdentifier, CompletionHandler<void(Expected<bool, WebCore::ResourceError>)>&&);
void modelElementSetAnimationIsPlaying(ModelIdentifier, bool, CompletionHandler<void(bool)>&&);
void modelElementIsLoopingAnimation(ModelIdentifier, CompletionHandler<void(Expected<bool, WebCore::ResourceError>)>&&);
@@ -600,17 +597,14 @@
void modelElementAnimationDuration(ModelIdentifier, CompletionHandler<void(Expected<Seconds, WebCore::ResourceError>)>&&);
void modelElementAnimationCurrentTime(ModelIdentifier, CompletionHandler<void(Expected<Seconds, WebCore::ResourceError>)>&&);
void modelElementSetAnimationCurrentTime(ModelIdentifier, Seconds, CompletionHandler<void(bool)>&&);
-#endif
-#if ENABLE(MODEL_ELEMENT_AUDIO_CONTROL)
void modelElementHasAudio(ModelIdentifier, CompletionHandler<void(Expected<bool, WebCore::ResourceError>)>&&);
void modelElementIsMuted(ModelIdentifier, CompletionHandler<void(Expected<bool, WebCore::ResourceError>)>&&);
void modelElementSetIsMuted(ModelIdentifier, bool, CompletionHandler<void(bool)>&&);
#endif
-#endif // ENABLE(ARKIT_INLINE_PREVIEW)
-#if HAVE(ASV_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
void takeModelElementFullscreen(ModelIdentifier);
#endif
-#if HAVE(ASV_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
void modelElementDidCreatePreview(const URL&, const String&, const WebCore::FloatSize&, CompletionHandler<void(Expected<std::pair<String, uint32_t>, WebCore::ResourceError>)>&&);
void handleMouseDownForModelElement(const String&, const WebCore::LayoutPoint&, MonotonicTime);
void handleMouseMoveForModelElement(const String&, const WebCore::LayoutPoint&, MonotonicTime);
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in (286316 => 286317)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2021-11-30 20:40:10 UTC (rev 286317)
@@ -586,20 +586,18 @@
ChangeUniversalAccessZoomFocus(WebCore::IntRect viewRect, WebCore::IntRect caretRect)
#endif
-#if HAVE(ASV_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
TakeModelElementFullscreen(struct WebKit::ModelIdentifier modelIdentifier)
#endif
-#if HAVE(ASV_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
ModelElementDidCreatePreview(URL url, String uuid, WebCore::FloatSize size) -> (Expected<std::pair<String, uint32_t>, WebCore::ResourceError> result) Async
HandleMouseDownForModelElement(String uuid, WebCore::LayoutPoint locationInPageCoordinates, MonotonicTime timestamp)
HandleMouseMoveForModelElement(String uuid, WebCore::LayoutPoint locationInPageCoordinates, MonotonicTime timestamp)
HandleMouseUpForModelElement(String uuid, WebCore::LayoutPoint locationInPageCoordinates, MonotonicTime timestamp)
#endif
-#if ENABLE(MODEL_ELEMENT_CAMERA_CONTROL)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
ModelElementGetCamera(struct WebKit::ModelIdentifier modelIdentifier) -> (Expected<WebCore::HTMLModelElementCamera, WebCore::ResourceError> result) Async
ModelElementSetCamera(struct WebKit::ModelIdentifier modelIdentifier, struct WebCore::HTMLModelElementCamera camera) -> (bool success) Async
-#endif
-#if ENABLE(MODEL_ELEMENT_ANIMATION_CONTROL)
ModelElementIsPlayingAnimation(struct WebKit::ModelIdentifier modelIdentifier) -> (Expected<bool, WebCore::ResourceError> result) Async
ModelElementSetAnimationIsPlaying(struct WebKit::ModelIdentifier modelIdentifier, bool isPlaying) -> (bool success) Async
ModelElementIsLoopingAnimation(struct WebKit::ModelIdentifier modelIdentifier) -> (Expected<bool, WebCore::ResourceError> result) Async
@@ -607,8 +605,6 @@
ModelElementAnimationDuration(struct WebKit::ModelIdentifier modelIdentifier) -> (Expected<Seconds, WebCore::ResourceError> result) Async
ModelElementAnimationCurrentTime(struct WebKit::ModelIdentifier modelIdentifier) -> (Expected<Seconds, WebCore::ResourceError> result) Async
ModelElementSetAnimationCurrentTime(struct WebKit::ModelIdentifier modelIdentifier, Seconds currentTime) -> (bool success) Async
-#endif
-#if ENABLE(MODEL_ELEMENT_AUDIO_CONTROL)
ModelElementHasAudio(struct WebKit::ModelIdentifier modelIdentifier) -> (Expected<bool, WebCore::ResourceError> result) Async
ModelElementIsMuted(struct WebKit::ModelIdentifier modelIdentifier) -> (Expected<bool, WebCore::ResourceError> result) Async
ModelElementSetIsMuted(struct WebKit::ModelIdentifier modelIdentifier, bool isMuted) -> (bool success) Async
Modified: trunk/Source/WebKit/UIProcess/ios/WKModelInteractionGestureRecognizer.h (286316 => 286317)
--- trunk/Source/WebKit/UIProcess/ios/WKModelInteractionGestureRecognizer.h 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebKit/UIProcess/ios/WKModelInteractionGestureRecognizer.h 2021-11-30 20:40:10 UTC (rev 286317)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if HAVE(ASV_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
#import "UIKitSPI.h"
Modified: trunk/Source/WebKit/UIProcess/ios/WKModelInteractionGestureRecognizer.mm (286316 => 286317)
--- trunk/Source/WebKit/UIProcess/ios/WKModelInteractionGestureRecognizer.mm 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebKit/UIProcess/ios/WKModelInteractionGestureRecognizer.mm 2021-11-30 20:40:10 UTC (rev 286317)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKModelInteractionGestureRecognizer.h"
-#if HAVE(ASV_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
#import "RemoteLayerTreeViews.h"
#import "WKModelView.h"
Modified: trunk/Source/WebKit/UIProcess/ios/WKModelView.h (286316 => 286317)
--- trunk/Source/WebKit/UIProcess/ios/WKModelView.h 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebKit/UIProcess/ios/WKModelView.h 2021-11-30 20:40:10 UTC (rev 286317)
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if HAVE(ASV_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
#import "RemoteLayerTreeViews.h"
Modified: trunk/Source/WebKit/UIProcess/ios/WKModelView.mm (286316 => 286317)
--- trunk/Source/WebKit/UIProcess/ios/WKModelView.mm 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebKit/UIProcess/ios/WKModelView.mm 2021-11-30 20:40:10 UTC (rev 286317)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKModelView.h"
-#if HAVE(ASV_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
#import "Logging.h"
#import "RemoteLayerTreeViews.h"
Modified: trunk/Source/WebKit/WebProcess/Model/ARKitInlinePreviewModelPlayer.h (286316 => 286317)
--- trunk/Source/WebKit/WebProcess/Model/ARKitInlinePreviewModelPlayer.h 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebKit/WebProcess/Model/ARKitInlinePreviewModelPlayer.h 2021-11-30 20:40:10 UTC (rev 286317)
@@ -53,11 +53,8 @@
void load(WebCore::Model&, WebCore::LayoutSize) override;
PlatformLayer* layer() override;
void enterFullscreen() override;
-#if ENABLE(MODEL_ELEMENT_CAMERA_CONTROL)
void getCamera(CompletionHandler<void(std::optional<WebCore::HTMLModelElementCamera>&&)>&&) override;
void setCamera(WebCore::HTMLModelElementCamera, CompletionHandler<void(bool success)>&&) override;
-#endif
-#if ENABLE(MODEL_ELEMENT_ANIMATION_CONTROL)
void isPlayingAnimation(CompletionHandler<void(std::optional<bool>&&)>&&) override;
void setAnimationIsPlaying(bool, CompletionHandler<void(bool success)>&&) override;
void isLoopingAnimation(CompletionHandler<void(std::optional<bool>&&)>&&) override;
@@ -65,12 +62,9 @@
void animationDuration(CompletionHandler<void(std::optional<Seconds>&&)>&&) override;
void animationCurrentTime(CompletionHandler<void(std::optional<Seconds>&&)>&&) override;
void setAnimationCurrentTime(Seconds, CompletionHandler<void(bool success)>&&) override;
-#endif
-#if ENABLE(MODEL_ELEMENT_AUDIO_CONTROL)
void hasAudio(CompletionHandler<void(std::optional<bool>&&)>&&) override;
void isMuted(CompletionHandler<void(std::optional<bool>&&)>&&) override;
void setIsMuted(bool, CompletionHandler<void(bool success)>&&) override;
-#endif
WeakPtr<WebPage> m_page;
WeakPtr<WebCore::ModelPlayerClient> m_client;
Modified: trunk/Source/WebKit/WebProcess/Model/ARKitInlinePreviewModelPlayer.mm (286316 => 286317)
--- trunk/Source/WebKit/WebProcess/Model/ARKitInlinePreviewModelPlayer.mm 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebKit/WebProcess/Model/ARKitInlinePreviewModelPlayer.mm 2021-11-30 20:40:10 UTC (rev 286317)
@@ -55,7 +55,6 @@
{
}
-#if ENABLE(MODEL_ELEMENT_CAMERA_CONTROL)
void ARKitInlinePreviewModelPlayer::getCamera(CompletionHandler<void(std::optional<WebCore::HTMLModelElementCamera>&&)>&& completionHandler)
{
auto modelIdentifier = this->modelIdentifier();
@@ -102,9 +101,7 @@
strongPage->sendWithAsyncReply(Messages::WebPageProxy::ModelElementSetCamera(*modelIdentifier, camera), WTFMove(remoteCompletionHandler));
}
-#endif // ENABLE(MODEL_ELEMENT_CAMERA_CONTROL)
-#if ENABLE(MODEL_ELEMENT_ANIMATION_CONTROL)
void ARKitInlinePreviewModelPlayer::isPlayingAnimation(CompletionHandler<void(std::optional<bool>&&)>&& completionHandler)
{
auto modelIdentifier = this->modelIdentifier();
@@ -271,9 +268,7 @@
strongPage->sendWithAsyncReply(Messages::WebPageProxy::ModelElementSetAnimationCurrentTime(*modelIdentifier, currentTime), WTFMove(remoteCompletionHandler));
}
-#endif // ENABLE(MODEL_ELEMENT_ANIMATION_CONTROL)
-#if ENABLE(MODEL_ELEMENT_AUDIO_CONTROL)
void ARKitInlinePreviewModelPlayer::hasAudio(CompletionHandler<void(std::optional<bool>&&)>&& completionHandler)
{
auto modelIdentifier = this->modelIdentifier();
@@ -346,7 +341,6 @@
strongPage->sendWithAsyncReply(Messages::WebPageProxy::ModelElementSetIsMuted(*modelIdentifier, isMuted), WTFMove(remoteCompletionHandler));
}
-#endif // ENABLE(MODEL_ELEMENT_AUDIO_CONTROL)
}
Modified: trunk/Source/WebKit/WebProcess/Model/WebModelPlayerProvider.cpp (286316 => 286317)
--- trunk/Source/WebKit/WebProcess/Model/WebModelPlayerProvider.cpp 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebKit/WebProcess/Model/WebModelPlayerProvider.cpp 2021-11-30 20:40:10 UTC (rev 286317)
@@ -29,11 +29,11 @@
#include "WebPage.h"
#include <WebCore/ModelPlayer.h>
-#if HAVE(ASV_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
#include "ARKitInlinePreviewModelPlayerMac.h"
#endif
-#if HAVE(ASV_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
#include "ARKitInlinePreviewModelPlayerIOS.h"
#endif
@@ -55,7 +55,7 @@
RefPtr<WebCore::ModelPlayer> WebModelPlayerProvider::createModelPlayer(WebCore::ModelPlayerClient& client)
{
-#if HAVE(ASV_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
if (m_page.useARKitForModel())
return ARKitInlinePreviewModelPlayerMac::create(m_page, client);
#endif
@@ -63,7 +63,7 @@
if (m_page.useSceneKitForModel())
return WebCore::SceneKitModelPlayer::create(client);
#endif
-#if HAVE(ASV_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
return ARKitInlinePreviewModelPlayerIOS::create(m_page, client);
#endif
Modified: trunk/Source/WebKit/WebProcess/Model/ios/ARKitInlinePreviewModelPlayerIOS.h (286316 => 286317)
--- trunk/Source/WebKit/WebProcess/Model/ios/ARKitInlinePreviewModelPlayerIOS.h 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebKit/WebProcess/Model/ios/ARKitInlinePreviewModelPlayerIOS.h 2021-11-30 20:40:10 UTC (rev 286317)
@@ -25,7 +25,7 @@
#pragma once
-#if HAVE(ASV_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
#include "ARKitInlinePreviewModelPlayer.h"
#include <WebCore/ModelPlayer.h>
Modified: trunk/Source/WebKit/WebProcess/Model/ios/ARKitInlinePreviewModelPlayerIOS.mm (286316 => 286317)
--- trunk/Source/WebKit/WebProcess/Model/ios/ARKitInlinePreviewModelPlayerIOS.mm 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebKit/WebProcess/Model/ios/ARKitInlinePreviewModelPlayerIOS.mm 2021-11-30 20:40:10 UTC (rev 286317)
@@ -26,7 +26,7 @@
#import "config.h"
#import "ARKitInlinePreviewModelPlayerIOS.h"
-#if HAVE(ASV_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
#import "WebPage.h"
#import "WebPageProxyMessages.h"
Modified: trunk/Source/WebKit/WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.h (286316 => 286317)
--- trunk/Source/WebKit/WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.h 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebKit/WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.h 2021-11-30 20:40:10 UTC (rev 286317)
@@ -25,7 +25,7 @@
#pragma once
-#if HAVE(ASV_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
#include "ARKitInlinePreviewModelPlayer.h"
#include <WebCore/ModelPlayer.h>
Modified: trunk/Source/WebKit/WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.mm (286316 => 286317)
--- trunk/Source/WebKit/WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.mm 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebKit/WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.mm 2021-11-30 20:40:10 UTC (rev 286317)
@@ -26,7 +26,7 @@
#import "config.h"
#import "ARKitInlinePreviewModelPlayerMac.h"
-#if HAVE(ASV_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
#import "WebPage.h"
#import "WebPageProxyMessages.h"
@@ -179,7 +179,7 @@
bool ARKitInlinePreviewModelPlayerMac::supportsMouseInteraction()
{
-#if HAVE(ASV_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
return true;
#endif
return false;
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (286316 => 286317)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2021-11-30 20:39:07 UTC (rev 286316)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2021-11-30 20:40:10 UTC (rev 286317)
@@ -145,7 +145,7 @@
#include <wtf/URLParser.h>
#include <wtf/text/StringHash.h>
-#if HAVE(ASV_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
#include "ARKitInlinePreviewModelPlayerMac.h"
#endif
@@ -603,7 +603,7 @@
WebCore::HTMLMediaElement::setMediaCacheDirectory(parameters.mediaCacheDirectory);
#endif
-#if HAVE(ASV_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
if (!parameters.modelElementCacheDirectory.isEmpty())
ARKitInlinePreviewModelPlayerMac::setModelElementCacheDirectory(parameters.modelElementCacheDirectory);
#endif
