Diff
Modified: trunk/Source/WTF/ChangeLog (282566 => 282567)
--- trunk/Source/WTF/ChangeLog 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WTF/ChangeLog 2021-09-16 18:47:45 UTC (rev 282567)
@@ -1,3 +1,20 @@
+2021-09-16 Tim Horton <timothy_hor...@apple.com>
+
+ Adjust ARKIT_INLINE_PREVIEW* compile time flags
+ https://bugs.webkit.org/show_bug.cgi?id=230332
+
+ Reviewed by Sam Weinig.
+
+ * wtf/PlatformEnableCocoa.h:
+ Make these ENABLE()s instead of HAVE()s (as they control a WebKit feature).
+ Also, disable the ASVInlinePreview version if WKSeparatedModelView is enabled,
+ we don't need both, and we currently always make a WKSeparatedModelView
+ in that case anyway.
+
+ * wtf/PlatformHave.h:
+ Stop using __has_include in favor of version checks, now that
+ the header has been around for a while.
+
2021-09-16 Youenn Fablet <you...@apple.com>
Enable RTCRtpScriptTransform by default
Modified: trunk/Source/WTF/wtf/PlatformEnableCocoa.h (282566 => 282567)
--- trunk/Source/WTF/wtf/PlatformEnableCocoa.h 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WTF/wtf/PlatformEnableCocoa.h 2021-09-16 18:47:45 UTC (rev 282567)
@@ -718,3 +718,15 @@
#if !defined(ENABLE_PREDEFINED_COLOR_SPACE_DISPLAY_P3) && HAVE(CORE_ANIMATION_FIX_FOR_RADAR_78402035)
#define ENABLE_PREDEFINED_COLOR_SPACE_DISPLAY_P3 1
#endif
+
+#if PLATFORM(IOS_FAMILY) && HAVE(ASV_INLINE_PREVIEW) && !ENABLE(SEPARATED_MODEL)
+#define ENABLE_ARKIT_INLINE_PREVIEW_IOS 1
+#endif
+
+#if PLATFORM(MAC) && HAVE(ASV_INLINE_PREVIEW)
+#define ENABLE_ARKIT_INLINE_PREVIEW_MAC 1
+#endif
+
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS) || ENABLE(ARKIT_INLINE_PREVIEW_MAC)
+#define ENABLE_ARKIT_INLINE_PREVIEW 1
+#endif
Modified: trunk/Source/WTF/wtf/PlatformHave.h (282566 => 282567)
--- trunk/Source/WTF/wtf/PlatformHave.h 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2021-09-16 18:47:45 UTC (rev 282567)
@@ -1010,20 +1010,12 @@
#define HAVE_IMAGE_RESTRICTED_DECODING 1
#endif
-#if defined __has_include && __has_include(<AssetViewer/ASVInlinePreview.h>)
-#if (PLATFORM(IOS) || PLATFORM(MACCATALYST)) && !PLATFORM(IOS_SIMULATOR) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000
-#define HAVE_ARKIT_INLINE_PREVIEW_IOS 1
+#if (PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
+ || (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 PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000
-#define HAVE_ARKIT_INLINE_PREVIEW_MAC 1
-#endif
-
-#if defined(HAVE_ARKIT_INLINE_PREVIEW_IOS) || defined(HAVE_ARKIT_INLINE_PREVIEW_MAC)
-#define HAVE_ARKIT_INLINE_PREVIEW 1
-#endif
-#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 (282566 => 282567)
--- trunk/Source/WebCore/ChangeLog 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebCore/ChangeLog 2021-09-16 18:47:45 UTC (rev 282567)
@@ -1,3 +1,24 @@
+2021-09-16 Tim Horton <timothy_hor...@apple.com>
+
+ Adjust ARKIT_INLINE_PREVIEW* compile time flags
+ https://bugs.webkit.org/show_bug.cgi?id=230332
+
+ Reviewed by Sam Weinig.
+
+ * Modules/model-element/HTMLModelElement.cpp:
+ (WebCore::HTMLModelElement::~HTMLModelElement):
+ (WebCore::HTMLModelElement::setSourceURL):
+ (WebCore::HTMLModelElement::notifyFinished):
+ (WebCore::HTMLModelElement::enterFullscreen):
+ * Modules/model-element/HTMLModelElement.h:
+ * Modules/model-element/HTMLModelElementCocoa.mm:
+ * loader/EmptyClients.cpp:
+ * loader/EmptyClients.h:
+ * page/ChromeClient.h:
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateConfiguration):
+ Adopt the new name.
+
2021-09-16 Simon Fraser <simon.fra...@apple.com>
Fix some WEBCORE_EXPORTS on FrameView
Modified: trunk/Source/WebCore/Modules/model-element/HTMLModelElement.cpp (282566 => 282567)
--- trunk/Source/WebCore/Modules/model-element/HTMLModelElement.cpp 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebCore/Modules/model-element/HTMLModelElement.cpp 2021-09-16 18:47:45 UTC (rev 282567)
@@ -42,7 +42,7 @@
#include <wtf/IsoMallocInlines.h>
#include <wtf/URL.h>
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
#include "Chrome.h"
#include "ChromeClient.h"
#include "Document.h"
@@ -70,7 +70,7 @@
m_resource = nullptr;
}
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
clearFile();
#endif
}
@@ -136,7 +136,7 @@
m_readyPromise = makeUniqueRef<ReadyPromise>(*this, &HTMLModelElement::readyPromiseResolve);
if (m_sourceURL.isEmpty()) {
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
clearFile();
#endif
return;
@@ -167,7 +167,7 @@
return *this;
}
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
static String& sharedModelElementCacheDirectory()
{
static NeverDestroyed<String> sharedModelElementCacheDirectory;
@@ -235,7 +235,7 @@
m_readyPromise->resolve(*this);
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
modelDidChange();
#endif
}
@@ -242,7 +242,7 @@
void HTMLModelElement::enterFullscreen()
{
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
auto* page = document().page();
if (!page)
return;
Modified: trunk/Source/WebCore/Modules/model-element/HTMLModelElement.h (282566 => 282567)
--- trunk/Source/WebCore/Modules/model-element/HTMLModelElement.h 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebCore/Modules/model-element/HTMLModelElement.h 2021-09-16 18:47:45 UTC (rev 282567)
@@ -35,7 +35,7 @@
#include "SharedBuffer.h"
#include <wtf/UniqueRef.h>
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
#include "PlatformLayer.h"
OBJC_CLASS ASVInlinePreview;
#endif
@@ -61,12 +61,12 @@
RefPtr<SharedBuffer> modelData() const;
RefPtr<Model> model() const;
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
WEBCORE_EXPORT static void setModelElementCacheDirectory(const String&);
WEBCORE_EXPORT static const String& modelElementCacheDirectory();
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
PlatformLayer* platformLayer() const;
WEBCORE_EXPORT void inlinePreviewDidObtainContextId(const String& uuid, uint32_t contextId);
#endif
@@ -79,7 +79,7 @@
void setSourceURL(const URL&);
HTMLModelElement& readyPromiseResolve();
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
void clearFile();
void createFile();
void modelDidChange();
@@ -102,7 +102,7 @@
UniqueRef<ReadyPromise> m_readyPromise;
bool m_dataComplete { false };
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
String m_filePath;
RetainPtr<ASVInlinePreview> m_inlinePreview;
#endif
Modified: trunk/Source/WebCore/Modules/model-element/HTMLModelElementCocoa.mm (282566 => 282567)
--- trunk/Source/WebCore/Modules/model-element/HTMLModelElementCocoa.mm 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebCore/Modules/model-element/HTMLModelElementCocoa.mm 2021-09-16 18:47:45 UTC (rev 282567)
@@ -26,7 +26,7 @@
#include "config.h"
#include "HTMLModelElement.h"
-#if ENABLE(MODEL_ELEMENT) && HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(MODEL_ELEMENT) && ENABLE(ARKIT_INLINE_PREVIEW_MAC)
#include "Chrome.h"
#include "ChromeClient.h"
@@ -130,4 +130,4 @@
}
-#endif // ENABLE(MODEL_ELEMENT) && HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#endif // ENABLE(MODEL_ELEMENT) && ENABLE(ARKIT_INLINE_PREVIEW_MAC)
Modified: trunk/Source/WebCore/PAL/ChangeLog (282566 => 282567)
--- trunk/Source/WebCore/PAL/ChangeLog 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebCore/PAL/ChangeLog 2021-09-16 18:47:45 UTC (rev 282567)
@@ -1,3 +1,14 @@
+2021-09-16 Tim Horton <timothy_hor...@apple.com>
+
+ Adjust ARKIT_INLINE_PREVIEW* compile time flags
+ https://bugs.webkit.org/show_bug.cgi?id=230332
+
+ Reviewed by Sam Weinig.
+
+ * pal/spi/ios/SystemPreviewSPI.h:
+ * pal/spi/mac/SystemPreviewSPI.h:
+ Adopt the new name.
+
2021-09-15 Devin Rousso <drou...@apple.com>
[Payment Request] Clean up some WKA hooks
Modified: trunk/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h (282566 => 282567)
--- trunk/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h 2021-09-16 18:47:45 UTC (rev 282567)
@@ -25,7 +25,7 @@
#if USE(APPLE_INTERNAL_SDK)
-#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
#import <AssetViewer/ARQuickLookWebKitItem.h>
#endif
@@ -33,7 +33,7 @@
#import <AssetViewer/ASVThumbnailView.h>
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
#import <AssetViewer/ASVInlinePreview.h>
#endif
@@ -57,7 +57,7 @@
@end
#endif
-#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
#import <ARKit/ARKit.h>
@protocol ARQuickLookWebKitItemDelegate
@@ -72,7 +72,7 @@
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
@class ASVInlinePreview;
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/SystemPreviewSPI.h (282566 => 282567)
--- trunk/Source/WebCore/PAL/pal/spi/mac/SystemPreviewSPI.h 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/SystemPreviewSPI.h 2021-09-16 18:47:45 UTC (rev 282567)
@@ -25,13 +25,13 @@
#if USE(APPLE_INTERNAL_SDK)
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
#import <AssetViewer/ASVInlinePreview.h>
#endif
#else
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
@class ASVInlinePreview;
Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (282566 => 282567)
--- trunk/Source/WebCore/loader/EmptyClients.cpp 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2021-09-16 18:47:45 UTC (rev 282567)
@@ -581,13 +581,13 @@
{
}
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
void EmptyChromeClient::takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID) const
{
}
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
void EmptyChromeClient::modelElementDidCreatePreview(WebCore::HTMLModelElement&, const URL&, const String&, const WebCore::FloatSize&) const
{
}
Modified: trunk/Source/WebCore/loader/EmptyClients.h (282566 => 282567)
--- trunk/Source/WebCore/loader/EmptyClients.h 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2021-09-16 18:47:45 UTC (rev 282567)
@@ -217,13 +217,13 @@
void didAssociateFormControls(const Vector<RefPtr<Element>>&, Frame&) final { }
bool shouldNotifyOnFormChanges() final { return false; }
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
void takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID) const final;
#endif
RefPtr<Icon> createIconForFiles(const Vector<String>& /* filenames */) final { return nullptr; }
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
void modelElementDidCreatePreview(WebCore::HTMLModelElement&, const URL&, const String&, const WebCore::FloatSize&) const final;
#endif
};
Modified: trunk/Source/WebCore/page/ChromeClient.h (282566 => 282567)
--- trunk/Source/WebCore/page/ChromeClient.h 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebCore/page/ChromeClient.h 2021-09-16 18:47:45 UTC (rev 282567)
@@ -78,7 +78,7 @@
#include "MediaUsageInfo.h"
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
class HTMLModelElement;
#endif
@@ -604,10 +604,10 @@
virtual void textAutosizingUsesIdempotentModeChanged() { }
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
virtual void takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID) const { }
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
virtual void modelElementDidCreatePreview(WebCore::HTMLModelElement&, const URL&, const String&, const WebCore::FloatSize&) const { };
#endif
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (282566 => 282567)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2021-09-16 18:47:45 UTC (rev 282567)
@@ -1097,7 +1097,7 @@
#if ENABLE(MODEL_ELEMENT)
else if (is<RenderModel>(renderer())) {
auto element = downcast<HTMLModelElement>(renderer().element());
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
if (auto* platformLayer = element->platformLayer())
m_graphicsLayer->setContentsToPlatformLayer(platformLayer, GraphicsLayer::ContentsLayerPurpose::Model);
#else
Modified: trunk/Source/WebKit/ChangeLog (282566 => 282567)
--- trunk/Source/WebKit/ChangeLog 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/ChangeLog 2021-09-16 18:47:45 UTC (rev 282567)
@@ -1,3 +1,49 @@
+2021-09-16 Tim Horton <timothy_hor...@apple.com>
+
+ Adjust ARKIT_INLINE_PREVIEW* compile time flags
+ https://bugs.webkit.org/show_bug.cgi?id=230332
+
+ Reviewed by Sam Weinig.
+
+ * Shared/WebProcessDataStoreParameters.h:
+ (WebKit::WebProcessDataStoreParameters::encode const):
+ (WebKit::WebProcessDataStoreParameters::decode):
+ * UIProcess/Cocoa/ModelElementControllerCocoa.mm:
+ * UIProcess/Cocoa/SystemPreviewControllerCocoa.mm:
+ * UIProcess/ModelElementController.cpp:
+ * UIProcess/ModelElementController.h:
+ * UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm:
+ (WebKit::RemoteLayerTreeHost::makeNode):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didAttachToRunningProcess):
+ (WebKit::WebPageProxy::resetState):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::webProcessDataStoreParameters):
+ * UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::resolveDirectoriesIfNecessary):
+ * UIProcess/WebsiteData/WebsiteDataStore.h:
+ * UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp:
+ (WebKit::WebsiteDataStoreConfiguration::WebsiteDataStoreConfiguration):
+ (WebKit::WebsiteDataStoreConfiguration::copy const):
+ * UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h:
+ * UIProcess/ios/WKModelInteractionGestureRecognizer.h:
+ * UIProcess/ios/WKModelInteractionGestureRecognizer.mm:
+ * UIProcess/ios/WKModelView.h:
+ * UIProcess/ios/WKModelView.mm:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::setWebsiteDataStoreParameters):
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformSetWebsiteDataStoreParameters):
+ Adopt the new name.
+
2021-09-16 Carlos Garcia Campos <cgar...@igalia.com>
[GTK][WPE] test animations/steps-transform-rendering-updates.html fails
Modified: trunk/Source/WebKit/Shared/WebProcessDataStoreParameters.h (282566 => 282567)
--- trunk/Source/WebKit/Shared/WebProcessDataStoreParameters.h 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/Shared/WebProcessDataStoreParameters.h 2021-09-16 18:47:45 UTC (rev 282567)
@@ -51,7 +51,7 @@
HashSet<WebCore::RegistrableDomain> domainsWithUserInteraction;
HashMap<TopFrameDomain, SubResourceDomain> domainsWithStorageAccessQuirk;
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
String modelElementCacheDirectory;
SandboxExtension::Handle modelElementCacheDirectoryExtensionHandle;
#endif
@@ -79,7 +79,7 @@
encoder << domainsWithUserInteraction;
encoder << domainsWithStorageAccessQuirk;
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
encoder << modelElementCacheDirectory;
encoder << modelElementCacheDirectoryExtensionHandle;
#endif
@@ -150,7 +150,7 @@
if (!domainsWithStorageAccessQuirk)
return std::nullopt;
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
String modelElementCacheDirectory;
if (!decoder.decode(modelElementCacheDirectory))
return std::nullopt;
@@ -181,7 +181,7 @@
WTFMove(*domainsWithUserInteraction),
WTFMove(*domainsWithStorageAccessQuirk),
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
WTFMove(modelElementCacheDirectory),
WTFMove(*modelElementCacheDirectoryExtensionHandle),
#endif
Modified: trunk/Source/WebKit/UIProcess/Cocoa/ModelElementControllerCocoa.mm (282566 => 282567)
--- trunk/Source/WebKit/UIProcess/Cocoa/ModelElementControllerCocoa.mm 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/UIProcess/Cocoa/ModelElementControllerCocoa.mm 2021-09-16 18:47:45 UTC (rev 282567)
@@ -26,12 +26,12 @@
#import "config.h"
#import "ModelElementController.h"
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
#import "Logging.h"
#import "WebPageProxy.h"
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
#import "APIUIClient.h"
#import "RemoteLayerTreeDrawingAreaProxy.h"
#import "RemoteLayerTreeHost.h"
@@ -41,7 +41,7 @@
#import <pal/spi/ios/SystemPreviewSPI.h>
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
#import <pal/spi/mac/SystemPreviewSPI.h>
#import <wtf/MainThread.h>
#endif
@@ -51,7 +51,7 @@
namespace WebKit {
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
void ModelElementController::takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID contentLayerId)
{
@@ -122,7 +122,7 @@
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
void ModelElementController::modelElementDidCreatePreview(const WebCore::ElementContext& context, const URL& fileURL, const String& uuid, const WebCore::FloatSize& size)
{
Modified: trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm (282566 => 282567)
--- trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm 2021-09-16 18:47:45 UTC (rev 282567)
@@ -39,7 +39,7 @@
#import <pal/spi/ios/QuickLookSPI.h>
#import <wtf/WeakObjCPtr.h>
-#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
#import <pal/spi/ios/SystemPreviewSPI.h>
SOFT_LINK_PRIVATE_FRAMEWORK(ARKit);
SOFT_LINK_CLASS(ARKit, ARQuickLookPreviewItem);
@@ -57,7 +57,7 @@
@interface _WKPreviewControllerDataSource : NSObject <QLPreviewControllerDataSource> {
#endif
RetainPtr<NSItemProvider> _itemProvider;
-#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
RetainPtr<ARQuickLookWebKitItem> _item;
#else
RetainPtr<QLItem> _item;
@@ -108,7 +108,7 @@
// means we don't actually know the real MIME type yet.
NSString *contentType = WebCore::UTIFromMIMEType("model/vnd.usdz+zip"_s);
-#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
auto previewItem = adoptNS([allocARQuickLookPreviewItemInstance() initWithFileAtURL:_downloadedURL]);
[previewItem setCanonicalWebPageURL:_originatingPageURL];
@@ -159,7 +159,7 @@
self.completionHandler(nil, error);
}
-#if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
+#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
- (void)previewItem:(ARQuickLookWebKitItem *)previewItem didReceiveMessage:(NSDictionary *)message
{
if (!_previewController)
Modified: trunk/Source/WebKit/UIProcess/ModelElementController.cpp (282566 => 282567)
--- trunk/Source/WebKit/UIProcess/ModelElementController.cpp 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/UIProcess/ModelElementController.cpp 2021-09-16 18:47:45 UTC (rev 282567)
@@ -26,7 +26,7 @@
#include "config.h"
#include "ModelElementController.h"
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
#include "WebPageProxy.h"
Modified: trunk/Source/WebKit/UIProcess/ModelElementController.h (282566 => 282567)
--- trunk/Source/WebKit/UIProcess/ModelElementController.h 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/UIProcess/ModelElementController.h 2021-09-16 18:47:45 UTC (rev 282567)
@@ -25,7 +25,7 @@
#pragma once
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
#include <WebCore/ElementContext.h>
#include <WebCore/GraphicsLayer.h>
@@ -33,7 +33,7 @@
#include <wtf/URL.h>
#include <wtf/WeakPtr.h>
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
OBJC_CLASS ASVInlinePreview;
#endif
@@ -48,16 +48,16 @@
WebPageProxy& page() { return m_webPageProxy; }
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
void takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID contentLayerId);
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
void modelElementDidCreatePreview(const WebCore::ElementContext&, const URL&, const String&, const WebCore::FloatSize&);
#endif
private:
WebPageProxy& m_webPageProxy;
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
HashMap<String, RetainPtr<ASVInlinePreview>> m_inlinePreviews;
#endif
};
Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm (282566 => 282567)
--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm 2021-09-16 18:47:45 UTC (rev 282567)
@@ -35,7 +35,7 @@
#import <UIKit/UIScrollView.h>
#import <pal/spi/cocoa/QuartzCoreSPI.h>
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
#import "WKModelView.h"
#endif
@@ -99,7 +99,7 @@
case PlatformCALayer::LayerTypeModelLayer:
#if ENABLE(SEPARATED_MODEL)
return makeWithView(adoptNS([[WKSeparatedModelView alloc] initWithModel:*properties.model]));
-#elif HAVE(ARKIT_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 (282566 => 282567)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-09-16 18:47:45 UTC (rev 282567)
@@ -1034,7 +1034,7 @@
m_systemPreviewController = makeUnique<SystemPreviewController>(*this);
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
if (m_preferences->modelElementEnabled()) {
ASSERT(!m_modelElementController);
m_modelElementController = makeUnique<ModelElementController>(*this);
@@ -7896,7 +7896,7 @@
m_systemPreviewController = nullptr;
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
m_modelElementController = nullptr;
#endif
@@ -10831,7 +10831,7 @@
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
void WebPageProxy::takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID contentLayerId)
{
modelElementController()->takeModelElementFullscreen(contentLayerId);
@@ -10838,7 +10838,7 @@
}
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
void WebPageProxy::modelElementDidCreatePreview(const WebCore::ElementContext& context, const URL& url, const String& uuid, const FloatSize& size)
{
modelElementController()->modelElementDidCreatePreview(context, url, uuid, size);
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (282566 => 282567)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2021-09-16 18:47:45 UTC (rev 282567)
@@ -192,7 +192,7 @@
#include "PlatformXRSystem.h"
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
#include "ModelElementController.h"
#endif
@@ -578,13 +578,13 @@
void systemPreviewActionTriggered(const WebCore::SystemPreviewInfo&, const String&);
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
ModelElementController* modelElementController() { return m_modelElementController.get(); }
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
void takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID contentLayerId);
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
void modelElementDidCreatePreview(const WebCore::ElementContext&, const URL&, const String&, const WebCore::FloatSize&);
void modelElementPreviewDidObtainContextId(const WebCore::ElementContext&, const String&, uint32_t);
#endif
@@ -2637,7 +2637,7 @@
std::unique_ptr<SystemPreviewController> m_systemPreviewController;
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
std::unique_ptr<ModelElementController> m_modelElementController;
#endif
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in (282566 => 282567)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2021-09-16 18:47:45 UTC (rev 282567)
@@ -594,10 +594,10 @@
ChangeUniversalAccessZoomFocus(WebCore::IntRect viewRect, WebCore::IntRect caretRect)
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
TakeModelElementFullscreen(uint64_t contentLayerID)
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
ModelElementDidCreatePreview(struct WebCore::ElementContext elementContext, URL url, String uuid, WebCore::FloatSize size)
#endif
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (282566 => 282567)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2021-09-16 18:47:45 UTC (rev 282567)
@@ -706,7 +706,7 @@
_javascript_ConfigurationDirectoryExtensionHandle = WTFMove(*handle);
}
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
auto modelElementCacheDirectory = websiteDataStore.resolvedModelElementCacheDirectory();
SandboxExtension::Handle modelElementCacheDirectoryExtensionHandle;
if (!modelElementCacheDirectory.isEmpty()) {
@@ -731,7 +731,7 @@
m_domainsWithUserInteraction,
m_domainsWithCrossPageStorageAccessQuirk,
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
WTFMove(modelElementCacheDirectory),
WTFMove(modelElementCacheDirectoryExtensionHandle),
#endif
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm (282566 => 282567)
--- trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm 2021-09-16 18:47:45 UTC (rev 282567)
@@ -331,7 +331,7 @@
return tempDirectoryFileSystemRepresentation("_javascript_CoreDebug", ShouldCreateDirectory::No);
}
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
String WebsiteDataStore::defaultModelElementCacheDirectory()
{
return tempDirectoryFileSystemRepresentation("ModelElement", ShouldCreateDirectory::No);
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (282566 => 282567)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2021-09-16 18:47:45 UTC (rev 282567)
@@ -273,7 +273,7 @@
m_resolvedConfiguration->setHSTSStorageDirectory(resolvePathForSandboxExtension(m_configuration->hstsStorageDirectory()));
if (!m_configuration->generalStorageDirectory().isEmpty())
m_resolvedConfiguration->setGeneralStorageDirectory(resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration->generalStorageDirectory()));
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
if (!m_configuration->modelElementCacheDirectory().isEmpty())
m_resolvedConfiguration->setModelElementCacheDirectory(resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration->modelElementCacheDirectory()));
#endif
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h (282566 => 282567)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h 2021-09-16 18:47:45 UTC (rev 282567)
@@ -256,7 +256,7 @@
const String& resolvedServiceWorkerRegistrationDirectory() const { return m_resolvedConfiguration->serviceWorkerRegistrationDirectory(); }
const String& resolvedResourceLoadStatisticsDirectory() const { return m_resolvedConfiguration->resourceLoadStatisticsDirectory(); }
const String& resolvedHSTSStorageDirectory() const { return m_resolvedConfiguration->hstsStorageDirectory(); }
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
const String& resolvedModelElementCacheDirectory() const { return m_resolvedConfiguration->modelElementCacheDirectory(); }
#endif
@@ -340,7 +340,7 @@
#if USE(GLIB)
static WTF::String defaultHSTSDirectory();
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
static WTF::String defaultModelElementCacheDirectory();
#endif
static WTF::String defaultIndexedDBDatabaseDirectory();
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp (282566 => 282567)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp 2021-09-16 18:47:45 UTC (rev 282567)
@@ -48,7 +48,7 @@
setResourceLoadStatisticsDirectory(WebsiteDataStore::defaultResourceLoadStatisticsDirectory());
setDeviceIdHashSaltsStorageDirectory(WebsiteDataStore::defaultDeviceIdHashSaltsStorageDirectory());
setJavaScriptConfigurationDirectory(WebsiteDataStore::defaultJavaScriptConfigurationDirectory());
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
setModelElementCacheDirectory(WebsiteDataStore::defaultModelElementCacheDirectory());
#endif
// FIXME: Give m_pcmMachServiceName a default value and remove PCM::ManagerInterface once rdar://80701098 is closed.
@@ -106,7 +106,7 @@
if (m_proxyConfiguration)
copy->m_proxyConfiguration = adoptCF(CFDictionaryCreateCopy(nullptr, this->m_proxyConfiguration.get()));
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
copy->m_modelElementCacheDirectory = this->m_modelElementCacheDirectory;
#endif
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h (282566 => 282567)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h 2021-09-16 18:47:45 UTC (rev 282567)
@@ -74,7 +74,7 @@
const String& localStorageDirectory() const { return m_localStorageDirectory; }
void setLocalStorageDirectory(String&& directory) { m_localStorageDirectory = WTFMove(directory); }
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
const String& modelElementCacheDirectory() const { return m_modelElementCacheDirectory; }
void setModelElementCacheDirectory(String&& directory) { m_modelElementCacheDirectory = WTFMove(directory); }
#endif
@@ -197,7 +197,7 @@
String m_serviceWorkerRegistrationDirectory;
String m_webSQLDatabaseDirectory;
String m_hstsStorageDirectory;
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
String m_modelElementCacheDirectory;
#endif
#if USE(GLIB)
Modified: trunk/Source/WebKit/UIProcess/ios/WKModelInteractionGestureRecognizer.h (282566 => 282567)
--- trunk/Source/WebKit/UIProcess/ios/WKModelInteractionGestureRecognizer.h 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/UIProcess/ios/WKModelInteractionGestureRecognizer.h 2021-09-16 18:47:45 UTC (rev 282567)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
#import "UIKitSPI.h"
Modified: trunk/Source/WebKit/UIProcess/ios/WKModelInteractionGestureRecognizer.mm (282566 => 282567)
--- trunk/Source/WebKit/UIProcess/ios/WKModelInteractionGestureRecognizer.mm 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/UIProcess/ios/WKModelInteractionGestureRecognizer.mm 2021-09-16 18:47:45 UTC (rev 282567)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKModelInteractionGestureRecognizer.h"
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
#import "RemoteLayerTreeViews.h"
#import "WKModelView.h"
Modified: trunk/Source/WebKit/UIProcess/ios/WKModelView.h (282566 => 282567)
--- trunk/Source/WebKit/UIProcess/ios/WKModelView.h 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/UIProcess/ios/WKModelView.h 2021-09-16 18:47:45 UTC (rev 282567)
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
#import "RemoteLayerTreeViews.h"
Modified: trunk/Source/WebKit/UIProcess/ios/WKModelView.mm (282566 => 282567)
--- trunk/Source/WebKit/UIProcess/ios/WKModelView.mm 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/UIProcess/ios/WKModelView.mm 2021-09-16 18:47:45 UTC (rev 282567)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKModelView.h"
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
#import "Logging.h"
#import "RemoteLayerTreeViews.h"
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp (282566 => 282567)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp 2021-09-16 18:47:45 UTC (rev 282567)
@@ -1526,7 +1526,7 @@
}
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
void WebChromeClient::takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID contentLayerId) const
{
m_page.takeModelElementFullscreen(contentLayerId);
@@ -1533,7 +1533,7 @@
}
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
void WebChromeClient::modelElementDidCreatePreview(WebCore::HTMLModelElement& element, const URL& url, const String& uuid, const WebCore::FloatSize& size) const
{
m_page.modelElementDidCreatePreview(element, url, uuid, size);
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h (282566 => 282567)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h 2021-09-16 18:47:45 UTC (rev 282567)
@@ -455,10 +455,10 @@
void enumerateImmersiveXRDevices(CompletionHandler<void(const PlatformXR::Instance::DeviceList&)>&&) final;
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
void takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID contentLayerId) const final;
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
void modelElementDidCreatePreview(WebCore::HTMLModelElement&, const URL&, const String&, const WebCore::FloatSize&) const final;
#endif
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (282566 => 282567)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2021-09-16 18:47:45 UTC (rev 282567)
@@ -274,7 +274,7 @@
#include <WebCore/AppHighlightStorage.h>
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
#include <WebCore/HTMLModelElement.h>
#endif
@@ -7722,7 +7722,7 @@
}
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
void WebPage::takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID contentLayerId)
{
send(Messages::WebPageProxy::TakeModelElementFullscreen(contentLayerId));
@@ -7729,7 +7729,7 @@
}
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
void WebPage::modelElementDidCreatePreview(WebCore::HTMLModelElement& element, const URL& url, const String& uuid, const WebCore::FloatSize& size)
{
if (auto elementContext = contextForElement(element))
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (282566 => 282567)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2021-09-16 18:47:45 UTC (rev 282567)
@@ -215,7 +215,7 @@
class TextCheckingRequest;
class VisiblePosition;
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
class HTMLModelElement;
#endif
@@ -1473,10 +1473,10 @@
PlatformXRSystemProxy& xrSystemProxy();
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_IOS)
+#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
void takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID contentLayerId);
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
void modelElementDidCreatePreview(WebCore::HTMLModelElement&, const URL&, const String&, const WebCore::FloatSize&);
void modelElementPreviewDidObtainContextId(const WebCore::ElementContext&, const String&, uint32_t);
#endif
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in (282566 => 282567)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2021-09-16 18:47:45 UTC (rev 282567)
@@ -639,7 +639,7 @@
ScrollToRect(WebCore::FloatRect targetRect, WebCore::FloatPoint origin)
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
ModelElementPreviewDidObtainContextId(struct WebCore::ElementContext elementContext, String uuid, uint32_t contextId)
#endif
}
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (282566 => 282567)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2021-09-16 18:47:45 UTC (rev 282567)
@@ -144,7 +144,7 @@
#include <wtf/URLParser.h>
#include <wtf/text/StringHash.h>
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
#include <WebCore/HTMLModelElement.h>
#endif
@@ -579,7 +579,7 @@
WebCore::HTMLMediaElement::setMediaCacheDirectory(parameters.mediaCacheDirectory);
#endif
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
if (!parameters.modelElementCacheDirectory.isEmpty())
WebCore::HTMLModelElement::setModelElementCacheDirectory(parameters.modelElementCacheDirectory);
#endif
Modified: trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (282566 => 282567)
--- trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2021-09-16 18:35:52 UTC (rev 282566)
+++ trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2021-09-16 18:47:45 UTC (rev 282567)
@@ -479,7 +479,7 @@
SandboxExtension::consumePermanently(parameters.mediaCacheDirectoryExtensionHandle);
SandboxExtension::consumePermanently(parameters.mediaKeyStorageDirectoryExtensionHandle);
SandboxExtension::consumePermanently(parameters._javascript_ConfigurationDirectoryExtensionHandle);
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
SandboxExtension::consumePermanently(parameters.modelElementCacheDirectoryExtensionHandle);
#endif
#endif
