Changeset 282567 in webkit for trunk/Source/WebKit/UIProcess/ModelElementController.h

Timestamp:

Sep 16, 2021, 11:47:45 AM (4 years ago)

Author:

[email protected]

Message:

Adjust ARKIT_INLINE_PREVIEW* compile time flags
​https://bugs.webkit.org/show_bug.cgi?id=230332

Reviewed by Sam Weinig.

Source/WebCore:

• 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.

Source/WebCore/PAL:

• pal/spi/ios/SystemPreviewSPI.h:
• pal/spi/mac/SystemPreviewSPI.h:

Adopt the new name.

Source/WebKit:

• 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.

Source/WTF:

• 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.

File:

• trunk/Source/WebKit/UIProcess/ModelElementController.h (modified) (4 diffs)

trunk/Source/WebKit/UIProcess/ModelElementController.h

@@ -26 +26 @@
 #pragma once
 
-#if HAVE(ARKIT_INLINE_PREVIEW)
+#if ENABLE(ARKIT_INLINE_PREVIEW)
 
 #include <WebCore/ElementContext.h>
@@ -34 +34 @@
 #include <wtf/WeakPtr.h>
 
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
 OBJC_CLASS ASVInlinePreview;
 #endif
@@ -49 +49 @@
     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
@@ -58 +58 @@
 private:
     WebPageProxy& m_webPageProxy;
-#if HAVE(ARKIT_INLINE_PREVIEW_MAC)
+#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
     HashMap<String, RetainPtr<ASVInlinePreview>> m_inlinePreviews;
 #endif