Changeset 282567 in webkit


Ignore:
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.

Location:
trunk/Source
Files:
41 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r282523 r282567  
     12021-09-16  Tim Horton  <[email protected]>
     2
     3        Adjust ARKIT_INLINE_PREVIEW* compile time flags
     4        https://bugs.webkit.org/show_bug.cgi?id=230332
     5
     6        Reviewed by Sam Weinig.
     7
     8        * wtf/PlatformEnableCocoa.h:
     9        Make these ENABLE()s instead of HAVE()s (as they control a WebKit feature).
     10        Also, disable the ASVInlinePreview version if WKSeparatedModelView is enabled,
     11        we don't need both, and we currently always make a WKSeparatedModelView
     12        in that case anyway.
     13
     14        * wtf/PlatformHave.h:
     15        Stop using __has_include in favor of version checks, now that
     16        the header has been around for a while.
     17
    1182021-09-16  Youenn Fablet  <[email protected]>
    219

  • trunk/Source/WTF/wtf/PlatformEnableCocoa.h

    r282513 r282567  
    719719#define ENABLE_PREDEFINED_COLOR_SPACE_DISPLAY_P3 1
    720720#endif
     721
     722#if PLATFORM(IOS_FAMILY) && HAVE(ASV_INLINE_PREVIEW) && !ENABLE(SEPARATED_MODEL)
     723#define ENABLE_ARKIT_INLINE_PREVIEW_IOS 1
     724#endif
     725
     726#if PLATFORM(MAC) && HAVE(ASV_INLINE_PREVIEW)
     727#define ENABLE_ARKIT_INLINE_PREVIEW_MAC 1
     728#endif
     729
     730#if ENABLE(ARKIT_INLINE_PREVIEW_IOS) || ENABLE(ARKIT_INLINE_PREVIEW_MAC)
     731#define ENABLE_ARKIT_INLINE_PREVIEW 1
     732#endif

  • trunk/Source/WTF/wtf/PlatformHave.h

    r282513 r282567  
    10111011#endif
    10121012
    1013 #if defined __has_include && __has_include(<AssetViewer/ASVInlinePreview.h>)
    1014 #if (PLATFORM(IOS) || PLATFORM(MACCATALYST)) && !PLATFORM(IOS_SIMULATOR) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000
    1015 #define HAVE_ARKIT_INLINE_PREVIEW_IOS 1
    1016 #endif
    1017 
    1018 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000
    1019 #define HAVE_ARKIT_INLINE_PREVIEW_MAC 1
    1020 #endif
    1021 
    1022 #if defined(HAVE_ARKIT_INLINE_PREVIEW_IOS) || defined(HAVE_ARKIT_INLINE_PREVIEW_MAC)
    1023 #define HAVE_ARKIT_INLINE_PREVIEW 1
    1024 #endif
     1013#if (PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
     1014    || (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
     1015    || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000)
     1016#define HAVE_ASV_INLINE_PREVIEW 1
    10251017#endif
    10261018

  • trunk/Source/WebCore/ChangeLog

    r282563 r282567  
     12021-09-16  Tim Horton  <[email protected]>
     2
     3        Adjust ARKIT_INLINE_PREVIEW* compile time flags
     4        https://bugs.webkit.org/show_bug.cgi?id=230332
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Modules/model-element/HTMLModelElement.cpp:
     9        (WebCore::HTMLModelElement::~HTMLModelElement):
     10        (WebCore::HTMLModelElement::setSourceURL):
     11        (WebCore::HTMLModelElement::notifyFinished):
     12        (WebCore::HTMLModelElement::enterFullscreen):
     13        * Modules/model-element/HTMLModelElement.h:
     14        * Modules/model-element/HTMLModelElementCocoa.mm:
     15        * loader/EmptyClients.cpp:
     16        * loader/EmptyClients.h:
     17        * page/ChromeClient.h:
     18        * rendering/RenderLayerBacking.cpp:
     19        (WebCore::RenderLayerBacking::updateConfiguration):
     20        Adopt the new name.
     21
    1222021-09-16  Simon Fraser  <[email protected]>
    223

  • trunk/Source/WebCore/Modules/model-element/HTMLModelElement.cpp

    r279477 r282567  
    4343#include <wtf/URL.h>
    4444
    45 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     45#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    4646#include "Chrome.h"
    4747#include "ChromeClient.h"
    … …  
    7171    }
    7272
    73 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     73#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    7474    clearFile();
    7575#endif
    … …  
    137137
    138138    if (m_sourceURL.isEmpty()) {
    139 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     139#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    140140        clearFile();
    141141#endif
    … …  
    168168}
    169169
    170 #if HAVE(ARKIT_INLINE_PREVIEW)
     170#if ENABLE(ARKIT_INLINE_PREVIEW)
    171171static String& sharedModelElementCacheDirectory()
    172172{
    … …  
    236236    m_readyPromise->resolve(*this);
    237237
    238 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     238#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    239239    modelDidChange();
    240240#endif
    … …  
    243243void HTMLModelElement::enterFullscreen()
    244244{
    245 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     245#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    246246    auto* page = document().page();
    247247    if (!page)

  • trunk/Source/WebCore/Modules/model-element/HTMLModelElement.h

    r279477 r282567  
    3636#include <wtf/UniqueRef.h>
    3737
    38 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     38#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    3939#include "PlatformLayer.h"
    4040OBJC_CLASS ASVInlinePreview;
    … …  
    6262    RefPtr<Model> model() const;
    6363
    64 #if HAVE(ARKIT_INLINE_PREVIEW)
     64#if ENABLE(ARKIT_INLINE_PREVIEW)
    6565    WEBCORE_EXPORT static void setModelElementCacheDirectory(const String&);
    6666    WEBCORE_EXPORT static const String& modelElementCacheDirectory();
    6767#endif
    6868
    69 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     69#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    7070    PlatformLayer* platformLayer() const;
    7171    WEBCORE_EXPORT void inlinePreviewDidObtainContextId(const String& uuid, uint32_t contextId);
    … …  
    8080    HTMLModelElement& readyPromiseResolve();
    8181
    82 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     82#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    8383    void clearFile();
    8484    void createFile();
    … …  
    103103    bool m_dataComplete { false };
    104104
    105 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     105#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    106106    String m_filePath;
    107107    RetainPtr<ASVInlinePreview> m_inlinePreview;

  • trunk/Source/WebCore/Modules/model-element/HTMLModelElementCocoa.mm

    r279477 r282567  
    2727#include "HTMLModelElement.h"
    2828
    29 #if ENABLE(MODEL_ELEMENT) && HAVE(ARKIT_INLINE_PREVIEW_MAC)
     29#if ENABLE(MODEL_ELEMENT) && ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    3030
    3131#include "Chrome.h"
    … …  
    131131}
    132132
    133 #endif // ENABLE(MODEL_ELEMENT) && HAVE(ARKIT_INLINE_PREVIEW_MAC)
     133#endif // ENABLE(MODEL_ELEMENT) && ENABLE(ARKIT_INLINE_PREVIEW_MAC)

  • trunk/Source/WebCore/PAL/ChangeLog

    r282464 r282567  
     12021-09-16  Tim Horton  <[email protected]>
     2
     3        Adjust ARKIT_INLINE_PREVIEW* compile time flags
     4        https://bugs.webkit.org/show_bug.cgi?id=230332
     5
     6        Reviewed by Sam Weinig.
     7
     8        * pal/spi/ios/SystemPreviewSPI.h:
     9        * pal/spi/mac/SystemPreviewSPI.h:
     10        Adopt the new name.
     11
    1122021-09-15  Devin Rousso  <[email protected]>
    213

  • trunk/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h

    r279420 r282567  
    2626#if USE(APPLE_INTERNAL_SDK)
    2727
    28 #if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
     28#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
    2929#import <AssetViewer/ARQuickLookWebKitItem.h>
    3030#endif
    … …  
    3434#endif
    3535
    36 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     36#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    3737#import <AssetViewer/ASVInlinePreview.h>
    3838#endif
    … …  
    5858#endif
    5959
    60 #if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
     60#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
    6161#import <ARKit/ARKit.h>
    6262
    … …  
    7373#endif
    7474
    75 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     75#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    7676
    7777@class ASVInlinePreview;

  • trunk/Source/WebCore/PAL/pal/spi/mac/SystemPreviewSPI.h

    r279451 r282567  
    2626#if USE(APPLE_INTERNAL_SDK)
    2727
    28 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     28#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    2929#import <AssetViewer/ASVInlinePreview.h>
    3030#endif
    … …  
    3232#else
    3333
    34 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     34#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    3535
    3636@class ASVInlinePreview;

  • trunk/Source/WebCore/loader/EmptyClients.cpp

    r282429 r282567  
    582582}
    583583
    584 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     584#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    585585void EmptyChromeClient::takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID) const
    586586{
    … …  
    588588#endif
    589589
    590 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     590#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    591591void EmptyChromeClient::modelElementDidCreatePreview(WebCore::HTMLModelElement&, const URL&, const String&, const WebCore::FloatSize&) const
    592592{

  • trunk/Source/WebCore/loader/EmptyClients.h

    r279988 r282567  
    218218    bool shouldNotifyOnFormChanges() final { return false; }
    219219
    220 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     220#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    221221    void takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID) const final;
    222222#endif
    … …  
    224224    RefPtr<Icon> createIconForFiles(const Vector<String>& /* filenames */) final { return nullptr; }
    225225
    226 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     226#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    227227    void modelElementDidCreatePreview(WebCore::HTMLModelElement&, const URL&, const String&, const WebCore::FloatSize&) const final;
    228228#endif

  • trunk/Source/WebCore/page/ChromeClient.h

    r282429 r282567  
    7979#endif
    8080
    81 #if HAVE(ARKIT_INLINE_PREVIEW)
     81#if ENABLE(ARKIT_INLINE_PREVIEW)
    8282class HTMLModelElement;
    8383#endif
    … …  
    605605#endif
    606606
    607 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     607#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    608608    virtual void takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID) const { }
    609609#endif
    610 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     610#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    611611    virtual void modelElementDidCreatePreview(WebCore::HTMLModelElement&, const URL&, const String&, const WebCore::FloatSize&) const { };
    612612#endif

  • trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

    r282335 r282567  
    10981098    else if (is<RenderModel>(renderer())) {
    10991099        auto element = downcast<HTMLModelElement>(renderer().element());
    1100 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     1100#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    11011101        if (auto* platformLayer = element->platformLayer())
    11021102            m_graphicsLayer->setContentsToPlatformLayer(platformLayer, GraphicsLayer::ContentsLayerPurpose::Model);

  • trunk/Source/WebKit/ChangeLog

    r282490 r282567  
     12021-09-16  Tim Horton  <[email protected]>
     2
     3        Adjust ARKIT_INLINE_PREVIEW* compile time flags
     4        https://bugs.webkit.org/show_bug.cgi?id=230332
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Shared/WebProcessDataStoreParameters.h:
     9        (WebKit::WebProcessDataStoreParameters::encode const):
     10        (WebKit::WebProcessDataStoreParameters::decode):
     11        * UIProcess/Cocoa/ModelElementControllerCocoa.mm:
     12        * UIProcess/Cocoa/SystemPreviewControllerCocoa.mm:
     13        * UIProcess/ModelElementController.cpp:
     14        * UIProcess/ModelElementController.h:
     15        * UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm:
     16        (WebKit::RemoteLayerTreeHost::makeNode):
     17        * UIProcess/WebPageProxy.cpp:
     18        (WebKit::WebPageProxy::didAttachToRunningProcess):
     19        (WebKit::WebPageProxy::resetState):
     20        * UIProcess/WebPageProxy.h:
     21        * UIProcess/WebPageProxy.messages.in:
     22        * UIProcess/WebProcessPool.cpp:
     23        (WebKit::WebProcessPool::webProcessDataStoreParameters):
     24        * UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm:
     25        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
     26        (WebKit::WebsiteDataStore::resolveDirectoriesIfNecessary):
     27        * UIProcess/WebsiteData/WebsiteDataStore.h:
     28        * UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp:
     29        (WebKit::WebsiteDataStoreConfiguration::WebsiteDataStoreConfiguration):
     30        (WebKit::WebsiteDataStoreConfiguration::copy const):
     31        * UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h:
     32        * UIProcess/ios/WKModelInteractionGestureRecognizer.h:
     33        * UIProcess/ios/WKModelInteractionGestureRecognizer.mm:
     34        * UIProcess/ios/WKModelView.h:
     35        * UIProcess/ios/WKModelView.mm:
     36        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
     37        * WebProcess/WebCoreSupport/WebChromeClient.h:
     38        * WebProcess/WebPage/WebPage.cpp:
     39        * WebProcess/WebPage/WebPage.h:
     40        * WebProcess/WebPage/WebPage.messages.in:
     41        * WebProcess/WebProcess.cpp:
     42        (WebKit::WebProcess::setWebsiteDataStoreParameters):
     43        * WebProcess/cocoa/WebProcessCocoa.mm:
     44        (WebKit::WebProcess::platformSetWebsiteDataStoreParameters):
     45        Adopt the new name.
     46
    1472021-09-16  Carlos Garcia Campos  <[email protected]>
    248

  • trunk/Source/WebKit/Shared/WebProcessDataStoreParameters.h

    r282429 r282567  
    5252    HashMap<TopFrameDomain, SubResourceDomain> domainsWithStorageAccessQuirk;
    5353#endif
    54 #if HAVE(ARKIT_INLINE_PREVIEW)
     54#if ENABLE(ARKIT_INLINE_PREVIEW)
    5555    String modelElementCacheDirectory;
    5656    SandboxExtension::Handle modelElementCacheDirectoryExtensionHandle;
    … …  
    8080    encoder << domainsWithStorageAccessQuirk;
    8181#endif
    82 #if HAVE(ARKIT_INLINE_PREVIEW)
     82#if ENABLE(ARKIT_INLINE_PREVIEW)
    8383    encoder << modelElementCacheDirectory;
    8484    encoder << modelElementCacheDirectoryExtensionHandle;
    … …  
    151151        return std::nullopt;
    152152#endif
    153 #if HAVE(ARKIT_INLINE_PREVIEW)
     153#if ENABLE(ARKIT_INLINE_PREVIEW)
    154154        String modelElementCacheDirectory;
    155155        if (!decoder.decode(modelElementCacheDirectory))
    … …  
    182182        WTFMove(*domainsWithStorageAccessQuirk),
    183183#endif
    184 #if HAVE(ARKIT_INLINE_PREVIEW)
     184#if ENABLE(ARKIT_INLINE_PREVIEW)
    185185        WTFMove(modelElementCacheDirectory),
    186186        WTFMove(*modelElementCacheDirectoryExtensionHandle),

  • trunk/Source/WebKit/UIProcess/Cocoa/ModelElementControllerCocoa.mm

    r279501 r282567  
    2727#import "ModelElementController.h"
    2828
    29 #if HAVE(ARKIT_INLINE_PREVIEW)
     29#if ENABLE(ARKIT_INLINE_PREVIEW)
    3030
    3131#import "Logging.h"
    3232#import "WebPageProxy.h"
    3333
    34 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     34#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    3535#import "APIUIClient.h"
    3636#import "RemoteLayerTreeDrawingAreaProxy.h"
    … …  
    4242#endif
    4343
    44 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     44#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    4545#import <pal/spi/mac/SystemPreviewSPI.h>
    4646#import <wtf/MainThread.h>
    … …  
    5252namespace WebKit {
    5353
    54 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     54#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    5555
    5656void ModelElementController::takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID contentLayerId)
    … …  
    123123#endif
    124124
    125 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     125#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    126126
    127127void ModelElementController::modelElementDidCreatePreview(const WebCore::ElementContext& context, const URL& fileURL, const String& uuid, const WebCore::FloatSize& size)

  • trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm

    r272936 r282567  
    4040#import <wtf/WeakObjCPtr.h>
    4141
    42 #if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
     42#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
    4343#import <pal/spi/ios/SystemPreviewSPI.h>
    4444SOFT_LINK_PRIVATE_FRAMEWORK(ARKit);
    … …  
    5858#endif
    5959    RetainPtr<NSItemProvider> _itemProvider;
    60 #if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
     60#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
    6161    RetainPtr<ARQuickLookWebKitItem> _item;
    6262#else
    … …  
    109109    NSString *contentType = WebCore::UTIFromMIMEType("model/vnd.usdz+zip"_s);
    110110
    111 #if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
     111#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
    112112    auto previewItem = adoptNS([allocARQuickLookPreviewItemInstance() initWithFileAtURL:_downloadedURL]);
    113113    [previewItem setCanonicalWebPageURL:_originatingPageURL];
    … …  
    160160}
    161161
    162 #if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
     162#if ENABLE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
    163163- (void)previewItem:(ARQuickLookWebKitItem *)previewItem didReceiveMessage:(NSDictionary *)message
    164164{

  • trunk/Source/WebKit/UIProcess/ModelElementController.cpp

    r279477 r282567  
    2727#include "ModelElementController.h"
    2828
    29 #if HAVE(ARKIT_INLINE_PREVIEW)
     29#if ENABLE(ARKIT_INLINE_PREVIEW)
    3030
    3131#include "WebPageProxy.h"

  • trunk/Source/WebKit/UIProcess/ModelElementController.h

    r279477 r282567  
    2626#pragma once
    2727
    28 #if HAVE(ARKIT_INLINE_PREVIEW)
     28#if ENABLE(ARKIT_INLINE_PREVIEW)
    2929
    3030#include <WebCore/ElementContext.h>
    … …  
    3434#include <wtf/WeakPtr.h>
    3535
    36 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     36#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    3737OBJC_CLASS ASVInlinePreview;
    3838#endif
    … …  
    4949    WebPageProxy& page() { return m_webPageProxy; }
    5050
    51 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     51#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    5252    void takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID contentLayerId);
    5353#endif
    54 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     54#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    5555    void modelElementDidCreatePreview(const WebCore::ElementContext&, const URL&, const String&, const WebCore::FloatSize&);
    5656#endif
    … …  
    5858private:
    5959    WebPageProxy& m_webPageProxy;
    60 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     60#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    6161    HashMap<String, RetainPtr<ASVInlinePreview>> m_inlinePreviews;
    6262#endif

  • trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm

    r279312 r282567  
    3636#import <pal/spi/cocoa/QuartzCoreSPI.h>
    3737
    38 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     38#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    3939#import "WKModelView.h"
    4040#endif
    … …  
    100100#if ENABLE(SEPARATED_MODEL)
    101101        return makeWithView(adoptNS([[WKSeparatedModelView alloc] initWithModel:*properties.model]));
    102 #elif HAVE(ARKIT_INLINE_PREVIEW_IOS)
     102#elif ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    103103        return makeWithView(adoptNS([[WKModelView alloc] initWithModel:*properties.model]));
    104104#else

  • trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

    r282429 r282567  
    10351035#endif
    10361036
    1037 #if HAVE(ARKIT_INLINE_PREVIEW)
     1037#if ENABLE(ARKIT_INLINE_PREVIEW)
    10381038    if (m_preferences->modelElementEnabled()) {
    10391039        ASSERT(!m_modelElementController);
    … …  
    78977897#endif
    78987898
    7899 #if HAVE(ARKIT_INLINE_PREVIEW)
     7899#if ENABLE(ARKIT_INLINE_PREVIEW)
    79007900    m_modelElementController = nullptr;
    79017901#endif
    … …  
    1083210832#endif
    1083310833
    10834 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     10834#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    1083510835void WebPageProxy::takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID contentLayerId)
    1083610836{
    … …  
    1083910839#endif
    1084010840
    10841 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     10841#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    1084210842void WebPageProxy::modelElementDidCreatePreview(const WebCore::ElementContext& context, const URL& url, const String& uuid, const FloatSize& size)
    1084310843{

  • trunk/Source/WebKit/UIProcess/WebPageProxy.h

    r282429 r282567  
    193193#endif
    194194
    195 #if HAVE(ARKIT_INLINE_PREVIEW)
     195#if ENABLE(ARKIT_INLINE_PREVIEW)
    196196#include "ModelElementController.h"
    197197#endif
    … …  
    579579#endif
    580580
    581 #if HAVE(ARKIT_INLINE_PREVIEW)
     581#if ENABLE(ARKIT_INLINE_PREVIEW)
    582582    ModelElementController* modelElementController() { return m_modelElementController.get(); }
    583583#endif
    584 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     584#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    585585    void takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID contentLayerId);
    586586#endif
    587 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     587#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    588588    void modelElementDidCreatePreview(const WebCore::ElementContext&, const URL&, const String&, const WebCore::FloatSize&);
    589589    void modelElementPreviewDidObtainContextId(const WebCore::ElementContext&, const String&, uint32_t);
    … …  
    26382638#endif
    26392639
    2640 #if HAVE(ARKIT_INLINE_PREVIEW)
     2640#if ENABLE(ARKIT_INLINE_PREVIEW)
    26412641    std::unique_ptr<ModelElementController> m_modelElementController;
    26422642#endif

  • trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in

    r282314 r282567  
    595595#endif
    596596
    597 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     597#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    598598    TakeModelElementFullscreen(uint64_t contentLayerID)
    599599#endif
    600 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     600#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    601601    ModelElementDidCreatePreview(struct WebCore::ElementContext elementContext, URL url, String uuid, WebCore::FloatSize size)
    602602#endif

  • trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

    r282429 r282567  
    707707    }
    708708
    709 #if HAVE(ARKIT_INLINE_PREVIEW)
     709#if ENABLE(ARKIT_INLINE_PREVIEW)
    710710    auto modelElementCacheDirectory = websiteDataStore.resolvedModelElementCacheDirectory();
    711711    SandboxExtension::Handle modelElementCacheDirectoryExtensionHandle;
    … …  
    732732        m_domainsWithCrossPageStorageAccessQuirk,
    733733#endif
    734 #if HAVE(ARKIT_INLINE_PREVIEW)
     734#if ENABLE(ARKIT_INLINE_PREVIEW)
    735735        WTFMove(modelElementCacheDirectory),
    736736        WTFMove(modelElementCacheDirectoryExtensionHandle),

  • trunk/Source/WebKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm

    r282429 r282567  
    332332}
    333333
    334 #if HAVE(ARKIT_INLINE_PREVIEW)
     334#if ENABLE(ARKIT_INLINE_PREVIEW)
    335335String WebsiteDataStore::defaultModelElementCacheDirectory()
    336336{

  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

    r282429 r282567  
    274274    if (!m_configuration->generalStorageDirectory().isEmpty())
    275275        m_resolvedConfiguration->setGeneralStorageDirectory(resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration->generalStorageDirectory()));
    276 #if HAVE(ARKIT_INLINE_PREVIEW)
     276#if ENABLE(ARKIT_INLINE_PREVIEW)
    277277    if (!m_configuration->modelElementCacheDirectory().isEmpty())
    278278        m_resolvedConfiguration->setModelElementCacheDirectory(resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration->modelElementCacheDirectory()));

  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h

    r282429 r282567  
    257257    const String& resolvedResourceLoadStatisticsDirectory() const { return m_resolvedConfiguration->resourceLoadStatisticsDirectory(); }
    258258    const String& resolvedHSTSStorageDirectory() const { return m_resolvedConfiguration->hstsStorageDirectory(); }
    259 #if HAVE(ARKIT_INLINE_PREVIEW)
     259#if ENABLE(ARKIT_INLINE_PREVIEW)
    260260    const String& resolvedModelElementCacheDirectory() const { return m_resolvedConfiguration->modelElementCacheDirectory(); }
    261261#endif
    … …  
    341341    static WTF::String defaultHSTSDirectory();
    342342#endif
    343 #if HAVE(ARKIT_INLINE_PREVIEW)
     343#if ENABLE(ARKIT_INLINE_PREVIEW)
    344344    static WTF::String defaultModelElementCacheDirectory();
    345345#endif

  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp

    r282368 r282567  
    4949        setDeviceIdHashSaltsStorageDirectory(WebsiteDataStore::defaultDeviceIdHashSaltsStorageDirectory());
    5050        setJavaScriptConfigurationDirectory(WebsiteDataStore::defaultJavaScriptConfigurationDirectory());
    51 #if HAVE(ARKIT_INLINE_PREVIEW)
     51#if ENABLE(ARKIT_INLINE_PREVIEW)
    5252        setModelElementCacheDirectory(WebsiteDataStore::defaultModelElementCacheDirectory());
    5353#endif
    … …  
    107107        copy->m_proxyConfiguration = adoptCF(CFDictionaryCreateCopy(nullptr, this->m_proxyConfiguration.get()));
    108108#endif
    109 #if HAVE(ARKIT_INLINE_PREVIEW)
     109#if ENABLE(ARKIT_INLINE_PREVIEW)
    110110    copy->m_modelElementCacheDirectory = this->m_modelElementCacheDirectory;
    111111#endif

  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h

    r282368 r282567  
    7575    void setLocalStorageDirectory(String&& directory) { m_localStorageDirectory = WTFMove(directory); }
    7676
    77 #if HAVE(ARKIT_INLINE_PREVIEW)
     77#if ENABLE(ARKIT_INLINE_PREVIEW)
    7878    const String& modelElementCacheDirectory() const { return m_modelElementCacheDirectory; }
    7979    void setModelElementCacheDirectory(String&& directory) { m_modelElementCacheDirectory = WTFMove(directory); }
    … …  
    198198    String m_webSQLDatabaseDirectory;
    199199    String m_hstsStorageDirectory;
    200 #if HAVE(ARKIT_INLINE_PREVIEW)
     200#if ENABLE(ARKIT_INLINE_PREVIEW)
    201201    String m_modelElementCacheDirectory;
    202202#endif

  • trunk/Source/WebKit/UIProcess/ios/WKModelInteractionGestureRecognizer.h

    r279402 r282567  
    2424 */
    2525
    26 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     26#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    2727
    2828#import "UIKitSPI.h"

  • trunk/Source/WebKit/UIProcess/ios/WKModelInteractionGestureRecognizer.mm

    r279402 r282567  
    2727#import "WKModelInteractionGestureRecognizer.h"
    2828
    29 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     29#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    3030
    3131#import "RemoteLayerTreeViews.h"

  • trunk/Source/WebKit/UIProcess/ios/WKModelView.h

    r279402 r282567  
    2424 */
    2525
    26 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     26#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    2727
    2828#import "RemoteLayerTreeViews.h"

  • trunk/Source/WebKit/UIProcess/ios/WKModelView.mm

    r279402 r282567  
    2727#import "WKModelView.h"
    2828
    29 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     29#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    3030
    3131#import "Logging.h"

  • trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp

    r282429 r282567  
    15271527#endif
    15281528
    1529 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     1529#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    15301530void WebChromeClient::takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID contentLayerId) const
    15311531{
    … …  
    15341534#endif
    15351535
    1536 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     1536#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    15371537void WebChromeClient::modelElementDidCreatePreview(WebCore::HTMLModelElement& element, const URL& url, const String& uuid, const WebCore::FloatSize& size) const
    15381538{

  • trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h

    r282429 r282567  
    456456#endif
    457457
    458 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     458#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    459459    void takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID contentLayerId) const final;
    460460#endif
    461 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     461#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    462462    void modelElementDidCreatePreview(WebCore::HTMLModelElement&, const URL&, const String&, const WebCore::FloatSize&) const final;
    463463#endif

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

    r282429 r282567  
    275275#endif
    276276
    277 #if HAVE(ARKIT_INLINE_PREVIEW)
     277#if ENABLE(ARKIT_INLINE_PREVIEW)
    278278#include <WebCore/HTMLModelElement.h>
    279279#endif
    … …  
    77237723#endif
    77247724
    7725 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     7725#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    77267726void WebPage::takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID contentLayerId)
    77277727{
    … …  
    77307730#endif
    77317731
    7732 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     7732#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    77337733void WebPage::modelElementDidCreatePreview(WebCore::HTMLModelElement& element, const URL& url, const String& uuid, const WebCore::FloatSize& size)
    77347734{

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

    r282429 r282567  
    216216class VisiblePosition;
    217217
    218 #if HAVE(ARKIT_INLINE_PREVIEW)
     218#if ENABLE(ARKIT_INLINE_PREVIEW)
    219219class HTMLModelElement;
    220220#endif
    … …  
    14741474#endif
    14751475
    1476 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
     1476#if ENABLE(ARKIT_INLINE_PREVIEW_IOS)
    14771477    void takeModelElementFullscreen(WebCore::GraphicsLayer::PlatformLayerID contentLayerId);
    14781478#endif
    1479 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     1479#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    14801480    void modelElementDidCreatePreview(WebCore::HTMLModelElement&, const URL&, const String&, const WebCore::FloatSize&);
    14811481    void modelElementPreviewDidObtainContextId(const WebCore::ElementContext&, const String&, uint32_t);

  • trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in

    r282429 r282567  
    640640    ScrollToRect(WebCore::FloatRect targetRect, WebCore::FloatPoint origin)
    641641
    642 #if HAVE(ARKIT_INLINE_PREVIEW_MAC)
     642#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
    643643    ModelElementPreviewDidObtainContextId(struct WebCore::ElementContext elementContext, String uuid, uint32_t contextId)
    644644#endif

  • trunk/Source/WebKit/WebProcess/WebProcess.cpp

    r282483 r282567  
    145145#include <wtf/text/StringHash.h>
    146146
    147 #if HAVE(ARKIT_INLINE_PREVIEW)
     147#if ENABLE(ARKIT_INLINE_PREVIEW)
    148148#include <WebCore/HTMLModelElement.h>
    149149#endif
    … …  
    580580#endif
    581581
    582 #if HAVE(ARKIT_INLINE_PREVIEW)
     582#if ENABLE(ARKIT_INLINE_PREVIEW)
    583583    if (!parameters.modelElementCacheDirectory.isEmpty())
    584584        WebCore::HTMLModelElement::setModelElementCacheDirectory(parameters.modelElementCacheDirectory);

  • trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

    r282364 r282567  
    480480    SandboxExtension::consumePermanently(parameters.mediaKeyStorageDirectoryExtensionHandle);
    481481    SandboxExtension::consumePermanently(parameters.javaScriptConfigurationDirectoryExtensionHandle);
    482 #if HAVE(ARKIT_INLINE_PREVIEW)
     482#if ENABLE(ARKIT_INLINE_PREVIEW)
    483483    SandboxExtension::consumePermanently(parameters.modelElementCacheDirectoryExtensionHandle);
    484484#endif
Note: See TracChangeset for help on using the changeset viewer.