Changeset 250579 in webkit


Ignore:
Timestamp:
Oct 1, 2019, 1:35:50 PM (6 years ago)
Author:
achristensen@apple.com
Message:

Progress towards successful CMake build on Mac
https://bugs.webkit.org/show_bug.cgi?id=202426

Rubber-stamped by Tim Horton.

Source/WebCore:

  • PlatformMac.cmake:

Source/WebCore/PAL:

  • pal/PlatformMac.cmake:

Source/WebKit:

  • Platform/cocoa/PaymentAuthorizationPresenter.h:
  • Platform/cocoa/PaymentAuthorizationPresenter.mm:
  • Platform/cocoa/PaymentAuthorizationViewController.h:
  • Platform/cocoa/PaymentAuthorizationViewController.mm:
  • Platform/cocoa/WKPaymentAuthorizationDelegate.mm:
  • PlatformMac.cmake:
  • Shared/SandboxExtension.h:

(WebKit::SandboxExtension::createHandleForReadByPid):

  • SourcesCocoa.txt:
  • UIProcess/API/Cocoa/WKWebView.mm:
  • UIProcess/API/Cocoa/WKWebsiteDataStore.mm:

(-[WKWebsiteDataStore _hasRegisteredServiceWorker]):

  • UIProcess/API/mac/WKView.mm:
  • UIProcess/Cocoa/SOAuthorization/PopUpSOAuthorizationSession.mm:
  • UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm:
  • UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm:
  • UIProcess/Cocoa/WKShareSheet.mm:

(-[WKShareSheet delegate]):
(-[WKShareSheet setDelegate:]):

  • UIProcess/Cocoa/WebProcessPoolCocoa.mm:
  • UIProcess/Cocoa/WebViewImpl.h:
  • WebKit.xcodeproj/project.pbxproj:
  • WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp:
  • WebProcess/WebCoreSupport/ios/WebPreviewLoaderClient.h:
  • WebProcess/WebPage/Cocoa/WebRemoteObjectRegistry.cpp:

Source/WebKitLegacy:

  • PlatformMac.cmake:

Source/WebKitLegacy/mac:

  • WebView/WebDataSource.mm:
Location:
trunk/Source
Files:
30 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified trunk/Source/WebCore/ChangeLog

    r250576 r250579  
     12019-10-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards successful CMake build on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=202426
     5
     6        Rubber-stamped by Tim Horton.
     7
     8        * PlatformMac.cmake:
     9
    1102019-10-01  Tim Horton  <timothy_horton@apple.com>
    211
  • TabularUnified trunk/Source/WebCore/PAL/ChangeLog

    r250566 r250579  
     12019-10-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards successful CMake build on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=202426
     5
     6        Rubber-stamped by Tim Horton.
     7
     8        * pal/PlatformMac.cmake:
     9
    1102019-10-01  Keith Rollin  <krollin@apple.com>
    211
  • TabularUnified trunk/Source/WebCore/PAL/pal/PlatformMac.cmake

    r250550 r250579  
    44    cf/CoreMediaSoftLink.h
    55
     6    cocoa/AppSSOSoftLink.h
    67    cocoa/AVFoundationSoftLink.h
    78    cocoa/PassKitSoftLink.h
     
    1920    spi/cg/ImageIOSPI.h
    2021
     22    spi/cocoa/AppSSOSPI.h
     23    spi/cocoa/AuthKitSPI.h
    2124    spi/cocoa/AVKitSPI.h
    2225    spi/cocoa/AudioToolboxSPI.h
     
    4649    spi/cocoa/NSURLDownloadSPI.h
    4750    spi/cocoa/NSURLFileTypeMappingsSPI.h
     51    spi/cocoa/NSXPCConnectionSPI.h
    4852    spi/cocoa/PassKitSPI.h
    4953    spi/cocoa/QuartzCoreSPI.h
     54    spi/cocoa/SecKeyProxySPI.h
    5055    spi/cocoa/ServersSPI.h
    5156    spi/cocoa/URLFormattingSPI.h
     
    106111    cf/CoreMediaSoftLink.cpp
    107112
     113    cocoa/AppSSOSoftLink.mm
    108114    cocoa/AVFoundationSoftLink.mm
    109115    cocoa/FileSizeFormatterCocoa.mm
  • TabularUnified trunk/Source/WebCore/PlatformMac.cmake

    r250550 r250579  
    451451
    452452    page/scrolling/ScrollingStateOverflowScrollProxyNode.h
     453
    453454    page/scrolling/cocoa/ScrollingTreeFixedNode.h
     455    page/scrolling/cocoa/ScrollingTreeOverflowScrollProxyNode.h
    454456    page/scrolling/cocoa/ScrollingTreePositionedNode.h
    455457    page/scrolling/cocoa/ScrollingTreeStickyNode.h
     
    487489    platform/graphics/avfoundation/MediaPlaybackTargetMac.h
    488490    platform/graphics/avfoundation/WebMediaSessionManagerMac.h
     491
     492    platform/graphics/avfoundation/objc/AVAssetMIMETypeCache.h
    489493
    490494    platform/graphics/ca/GraphicsLayerCA.h
  • TabularUnified trunk/Source/WebKit/ChangeLog

    r250576 r250579  
     12019-10-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards successful CMake build on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=202426
     5
     6        Rubber-stamped by Tim Horton.
     7
     8        * Platform/cocoa/PaymentAuthorizationPresenter.h:
     9        * Platform/cocoa/PaymentAuthorizationPresenter.mm:
     10        * Platform/cocoa/PaymentAuthorizationViewController.h:
     11        * Platform/cocoa/PaymentAuthorizationViewController.mm:
     12        * Platform/cocoa/WKPaymentAuthorizationDelegate.mm:
     13        * PlatformMac.cmake:
     14        * Shared/SandboxExtension.h:
     15        (WebKit::SandboxExtension::createHandleForReadByPid):
     16        * SourcesCocoa.txt:
     17        * UIProcess/API/Cocoa/WKWebView.mm:
     18        * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
     19        (-[WKWebsiteDataStore _hasRegisteredServiceWorker]):
     20        * UIProcess/API/mac/WKView.mm:
     21        * UIProcess/Cocoa/SOAuthorization/PopUpSOAuthorizationSession.mm:
     22        * UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm:
     23        * UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm:
     24        * UIProcess/Cocoa/WKShareSheet.mm:
     25        (-[WKShareSheet delegate]):
     26        (-[WKShareSheet setDelegate:]):
     27        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
     28        * UIProcess/Cocoa/WebViewImpl.h:
     29        * WebKit.xcodeproj/project.pbxproj:
     30        * WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp:
     31        * WebProcess/WebCoreSupport/ios/WebPreviewLoaderClient.h:
     32        * WebProcess/WebPage/Cocoa/WebRemoteObjectRegistry.cpp:
     33
    1342019-10-01  Tim Horton  <timothy_horton@apple.com>
    235
  • TabularUnified trunk/Source/WebKit/Platform/cocoa/PaymentAuthorizationPresenter.h

    r250179 r250579  
    2626#pragma once
    2727
    28 #if USE(PASSKIT)
     28#if USE(PASSKIT) && ENABLE(APPLE_PAY)
    2929
    3030#include <WebCore/ApplePaySessionPaymentRequest.h>
     
    9292} // namespace WebKit
    9393
    94 #endif // USE(PASSKIT)
     94#endif // USE(PASSKIT) && ENABLE(APPLE_PAY)
  • TabularUnified trunk/Source/WebKit/Platform/cocoa/PaymentAuthorizationPresenter.mm

    r250179 r250579  
    2727#import "PaymentAuthorizationPresenter.h"
    2828
    29 #if USE(PASSKIT)
     29#if USE(PASSKIT) && ENABLE(APPLE_PAY)
    3030
    3131#import "WKPaymentAuthorizationDelegate.h"
     
    232232} // namespace WebKit
    233233
    234 #endif // USE(PASSKIT)
     234#endif // USE(PASSKIT) && ENABLE(APPLE_PAY)
  • TabularUnified trunk/Source/WebKit/Platform/cocoa/PaymentAuthorizationViewController.h

    r242616 r250579  
    2626#pragma once
    2727
    28 #if USE(PASSKIT)
     28#if USE(PASSKIT) && ENABLE(APPLE_PAY)
    2929
    3030#include "PaymentAuthorizationPresenter.h"
     
    5858} // namespace WebKit
    5959
    60 #endif // USE(PASSKIT)
     60#endif // USE(PASSKIT) && ENABLE(APPLE_PAY)
  • TabularUnified trunk/Source/WebKit/Platform/cocoa/PaymentAuthorizationViewController.mm

    r249314 r250579  
    2727#import "PaymentAuthorizationViewController.h"
    2828
    29 #if USE(PASSKIT)
     29#if USE(PASSKIT) && ENABLE(APPLE_PAY)
    3030
    3131#import "WKPaymentAuthorizationDelegate.h"
     
    151151} // namespace WebKit
    152152
    153 #endif // USE(PASSKIT)
     153#endif // USE(PASSKIT) && ENABLE(APPLE_PAY)
  • TabularUnified trunk/Source/WebKit/Platform/cocoa/WKPaymentAuthorizationDelegate.mm

    r250179 r250579  
    2727#import "WKPaymentAuthorizationDelegate.h"
    2828
    29 #if USE(PASSKIT)
     29#if USE(PASSKIT) && ENABLE(APPLE_PAY)
    3030
    3131#import <WebCore/Payment.h>
     
    217217@end
    218218
    219 #endif // USE(PASSKIT)
     219#endif // USE(PASSKIT) && ENABLE(APPLE_PAY)
  • TabularUnified trunk/Source/WebKit/PlatformMac.cmake

    r250550 r250579  
    1919endif ()
    2020
     21list(APPEND WebKit_UNIFIED_SOURCE_LIST_FILES
     22    "SourcesCocoa.txt"
     23)
     24
    2125list(APPEND WebKit_SOURCES
    2226    NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp
    2327    NetworkProcess/Classifier/WebResourceLoadStatisticsTelemetry.cpp
    2428
     29    NetworkProcess/cocoa/WebSocketTaskCocoa.mm
     30
    2531    NetworkProcess/Cookies/mac/WebCookieManagerMac.mm
    2632
     
    3238
    3339    NetworkProcess/Downloads/cocoa/DownloadCocoa.mm
     40    NetworkProcess/Downloads/cocoa/WKDownloadProgress.mm
    3441
    3542    NetworkProcess/WebStorage/StorageManager.cpp
     
    107114    Shared/Cocoa/DataDetectionResult.mm
    108115    Shared/Cocoa/LoadParametersCocoa.mm
     116    Shared/Cocoa/SandboxExtensionCocoa.mm
    109117    Shared/Cocoa/WKNSArray.mm
    110118    Shared/Cocoa/WKNSData.mm
     
    256264    UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm
    257265    UIProcess/Cocoa/WKReloadFrameErrorRecoveryAttempter.mm
     266    UIProcess/Cocoa/WKSafeBrowsingWarning.mm
     267    UIProcess/Cocoa/WKShareSheet.mm
    258268    UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm
    259269    UIProcess/Cocoa/WebPageProxyCocoa.mm
     
    385395    "${WEBKIT_DIR}/UIProcess/API/Cocoa"
    386396    "${WEBKIT_DIR}/UIProcess/API/mac"
     397    "${WEBKIT_DIR}/UIProcess/Authentication/cocoa"
    387398    "${WEBKIT_DIR}/UIProcess/Cocoa"
     399    "${WEBKIT_DIR}/UIProcess/Cocoa/SOAuthorization"
    388400    "${WEBKIT_DIR}/UIProcess/Launcher/mac"
    389401    "${WEBKIT_DIR}/UIProcess/RemoteLayerTree"
    390402    "${WEBKIT_DIR}/UIProcess/RemoteLayerTree/ios"
     403    "${WEBKIT_DIR}/UIProcess/RemoteLayerTree/mac"
    391404    "${WEBKIT_DIR}/UIProcess/ios"
    392405    "${WEBKIT_DIR}/Platform/cg"
     
    423436    "${WEBKIT_DIR}/WebProcess/WebPage/mac"
    424437    "${WEBKIT_DIR}/WebProcess/WebCoreSupport/mac"
     438    "${WEBKITLEGACY_DIR}"
    425439    "${FORWARDING_HEADERS_DIR}/WebCore"
    426440)
     
    469483    UIProcess/ViewGestureController.messages.in
    470484
     485    UIProcess/Cocoa/PlaybackSessionManagerProxy.messages.in
    471486    UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in
    472487
     
    475490    UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.messages.in
    476491
     492    UIProcess/ios/EditableImageController.messages.in
     493
    477494    UIProcess/mac/SecItemShimProxy.messages.in
    478495
     496    WebProcess/cocoa/PlaybackSessionManager.messages.in
     497    WebProcess/cocoa/VideoFullscreenManager.messages.in
     498
     499    WebProcess/WebPage/ViewGestureGeometryCollector.messages.in
     500
     501    WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.messages.in
     502
    479503    WebProcess/WebPage/RemoteLayerTree/RemoteScrollingCoordinator.messages.in
    480     WebProcess/WebPage/ViewGestureGeometryCollector.messages.in
    481504)
    482505
     
    738761file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WKImageCG.h "#import <WebKit/Shared/API/c/cg/WKImageCG.h>")
    739762
    740 set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
     763set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION} -weak_framework SafariSafeBrowsing -lsandbox -framework AuthKit -framework SecurityInterface")
    741764
    742765set(WebKit_OUTPUT_NAME WebKit)
  • TabularUnified trunk/Source/WebKit/SourcesCocoa.txt

    r250169 r250579  
    432432UIProcess/ios/WKSyntheticTapGestureRecognizer.mm
    433433UIProcess/ios/WKSystemPreviewView.mm
    434 UIProcess/ios/WKTouchActionGestureRecognizer.m
     434UIProcess/ios/WKTouchActionGestureRecognizer.mm
    435435UIProcess/ios/WKWebEvent.mm
    436436
  • TabularUnified trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm

    r250550 r250579  
    6060#import "WKBackForwardListItemInternal.h"
    6161#import "WKBrowsingContextHandleInternal.h"
    62 #import "WKDragDestinationAction.h"
    6362#import "WKErrorInternal.h"
    6463#import "WKHistoryDelegatePrivate.h"
     
    118117#import <WebCore/ViewportArguments.h>
    119118#import <WebCore/WritingMode.h>
     119#import <WebKit/WKDragDestinationAction.h>
    120120#import <pal/spi/cocoa/NSKeyedArchiverSPI.h>
    121121#import <pal/spi/mac/NSTextFinderSPI.h>
  • TabularUnified trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStore.mm

    r250352 r250579  
    509509- (bool)_hasRegisteredServiceWorker
    510510{
     511#if ENABLE(SERVICE_WORKER)
    511512    return FileSystem::fileExists(WebCore::serviceWorkerRegistrationDatabaseFilename(_websiteDataStore->serviceWorkerRegistrationDirectory()));
     513#else
     514    return NO;
     515#endif
    512516}
    513517
  • TabularUnified trunk/Source/WebKit/UIProcess/API/mac/WKView.mm

    r248846 r250579  
    3333#import "APIPageConfiguration.h"
    3434#import "WKBrowsingContextGroupPrivate.h"
    35 #import "WKDragDestinationAction.h"
    3635#import "WKNSData.h"
    3736#import "WKProcessGroupPrivate.h"
     
    4443#import "WebViewImpl.h"
    4544#import "_WKLinkIconParametersInternal.h"
     45#import <WebKit/WKDragDestinationAction.h>
    4646#import <pal/spi/cocoa/AVKitSPI.h>
    4747#import <wtf/BlockPtr.h>
  • TabularUnified trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/PopUpSOAuthorizationSession.mm

    r246701 r250579  
    2929#if HAVE(APP_SSO)
    3030
     31#import "APINavigationAction.h"
    3132#import "WKNavigationDelegatePrivate.h"
    3233#import "WKUIDelegate.h"
     
    3435#import "WKWebViewInternal.h"
    3536#import <WebCore/ResourceResponse.h>
    36 #import <WebKit/APINavigationAction.h>
    3737#import <wtf/BlockPtr.h>
    3838
  • TabularUnified trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.mm

    r247437 r250579  
    3636#import "WKUIDelegatePrivate.h"
    3737#import "WebPageProxy.h"
    38 #import "WebSiteDataStore.h"
     38#import "WebsiteDataStore.h"
    3939#import <WebCore/ResourceResponse.h>
    4040#import <WebCore/SecurityOrigin.h>
  • TabularUnified trunk/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm

    r244596 r250579  
    2929#if ENABLE(FULL_KEYBOARD_ACCESS)
    3030
     31#import "WebProcessPool.h"
     32
     33#if PLATFORM(IOS_FAMILY)
    3134#import "AccessibilitySupportSPI.h"
    32 #import "WebProcessPool.h"
     35#endif
    3336
    3437#if PLATFORM(MAC)
  • TabularUnified trunk/Source/WebKit/UIProcess/Cocoa/WKShareSheet.mm

    r244955 r250579  
    4949@implementation WKShareSheet {
    5050    WeakObjCPtr<WKWebView> _webView;
     51    WeakObjCPtr<id <WKShareSheetDelegate> > _delegate;
    5152    WTF::CompletionHandler<void(bool)> _completionHandler;
    5253
     
    5758    RetainPtr<UIViewController> _presentationViewController;
    5859#endif
     60}
     61
     62- (id<WKShareSheetDelegate>)delegate
     63{
     64    return _delegate.get().get();
     65}
     66
     67- (void)setDelegate:(id<WKShareSheetDelegate>)delegate
     68{
     69    _delegate = delegate;
    5970}
    6071
  • TabularUnified trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

    r250521 r250579  
    2727#import "WebProcessPool.h"
    2828
    29 #import "AccessibilitySupportSPI.h"
    3029#import "CookieStorageUtilsCF.h"
    3130#import "LegacyCustomProtocolManagerClient.h"
     
    6463#import <QuartzCore/CARemoteLayerServer.h>
    6564#else
     65#import "AccessibilitySupportSPI.h"
    6666#import "UIKitSPI.h"
    6767#endif
  • TabularUnified trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h

    r248697 r250579  
    3030#include "PluginComplexTextInputState.h"
    3131#include "ShareableBitmap.h"
    32 #include "WKDragDestinationAction.h"
    3332#include "WKLayoutMode.h"
    3433#include "_WKOverlayScrollbarStyle.h"
     
    3736#include <WebCore/TextIndicatorWindow.h>
    3837#include <WebCore/UserInterfaceLayoutDirection.h>
     38#include <WebKit/WKDragDestinationAction.h>
    3939#include <pal/spi/cocoa/AVKitSPI.h>
    4040#include <wtf/BlockPtr.h>
  • TabularUnified trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r250169 r250579  
    11571157                711725A9228D564300018514 /* WebsiteLegacyOverflowScrollingTouchPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 711725A8228D563A00018514 /* WebsiteLegacyOverflowScrollingTouchPolicy.h */; };
    11581158                71A676A622C62325007D6295 /* WKTouchActionGestureRecognizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A676A422C62318007D6295 /* WKTouchActionGestureRecognizer.h */; };
    1159                 71A676A722C6232F007D6295 /* WKTouchActionGestureRecognizer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 71A676A522C62318007D6295 /* WKTouchActionGestureRecognizer.mm */; };
    11601159                71FB810B2260627E00323677 /* WebsiteSimulatedMouseEventsDispatchPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 71FB810A2260627A00323677 /* WebsiteSimulatedMouseEventsDispatchPolicy.h */; };
    11611160                728E86F11795188C0087879E /* WebColorPickerMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 728E86EF1795188C0087879E /* WebColorPickerMac.h */; };
     
    1155411553                                1DB01944211CF005009FB3E8 /* WKShareSheet.mm in Sources */,
    1155511554                                7A78FF332241919B0096483E /* WKStorageAccessAlert.mm in Sources */,
    11556                                 71A676A722C6232F007D6295 /* WKTouchActionGestureRecognizer.mm in Sources */,
    1155711555                        );
    1155811556                        runOnlyForDeploymentPostprocessing = 0;
  • TabularUnified trunk/Source/WebKit/WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp

    r250003 r250579  
    2929#if ENABLE(RESOURCE_LOAD_STATISTICS)
    3030
     31#include "Logging.h"
    3132#include "NetworkConnectionToWebProcessMessages.h"
    3233#include "NetworkProcessConnection.h"
  • TabularUnified trunk/Source/WebKit/WebProcess/WebCoreSupport/ios/WebPreviewLoaderClient.h

    r246388 r250579  
    2525
    2626#pragma once
     27
     28#if USE(QUICK_LOOK)
    2729
    2830#include "QuickLookDocumentData.h"
     
    6062
    6163} // namespace WebKit
     64
     65#endif // USE(QUICK_LOOK)
  • TabularUnified trunk/Source/WebKit/WebProcess/WebPage/Cocoa/WebRemoteObjectRegistry.cpp

    r249435 r250579  
    2929#include "RemoteObjectRegistryMessages.h"
    3030#include "WebPage.h"
     31#include "WebProcess.h"
    3132
    3233namespace WebKit {
  • TabularUnified trunk/Source/WebKitLegacy/ChangeLog

    r250565 r250579  
     12019-10-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards successful CMake build on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=202426
     5
     6        Rubber-stamped by Tim Horton.
     7
     8        * PlatformMac.cmake:
     9
    1102019-10-01  Alex Christensen  <achristensen@webkit.org>
    211
  • TabularUnified trunk/Source/WebKitLegacy/PlatformMac.cmake

    r250550 r250579  
    33add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
    44add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
     5add_definitions(-DJSC_CLASS_AVAILABLE\\\(...\\\)=)
    56
    67list(APPEND WebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
     8    "${WEBKITLEGACY_DIR}"
    79    "${WEBKITLEGACY_DIR}/mac"
    810    "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
     
    1416    SourcesCocoa.txt
    1517)
     18WEBKIT_COMPUTE_SOURCES(WebKitLegacy)
    1619
    1720list(APPEND WebKitLegacy_SOURCES
     
    113116    mac/WebCoreSupport/WebSecurityOrigin.mm
    114117    mac/WebCoreSupport/WebSelectionServiceController.mm
     118    mac/WebCoreSupport/WebSwitchingGPUClient.cpp
    115119    mac/WebCoreSupport/WebValidationMessageClient.mm
    116120    mac/WebCoreSupport/WebVisitedLinkStore.mm
     
    133137    mac/WebView/WebIndicateLayer.mm
    134138    mac/WebView/WebJSPDFDoc.mm
     139    mac/WebView/WebMediaPlaybackTargetPicker.mm
    135140    mac/WebView/WebNavigationData.mm
    136141    mac/WebView/WebNotification.mm
     
    141146    mac/WebView/WebTextCompletionController.mm
    142147    mac/WebView/WebTextIterator.mm
     148    mac/WebView/WebVideoFullscreenController.mm
     149    mac/WebView/WebVideoFullscreenHUDWindowController.mm
    143150    mac/WebView/WebViewData.mm
    144 )
    145 
    146 set(WebKitLegacy_FORWARDING_HEADERS_FILES
     151    mac/WebView/WebWindowAnimation.mm
     152)
     153
     154set(WebKitLegacy_LEGACY_FORWARDING_HEADERS_FILES
    147155    mac/DOM/DOMHTMLHeadingElement.h
    148156    mac/DOM/DOMHTMLBaseFontElement.h
     
    623631endforeach ()
    624632
     633foreach (_file ${WebKitLegacy_LEGACY_FORWARDING_HEADERS_FILES})
     634    get_filename_component(_name "${_file}" NAME)
     635    set(_target_filename "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy/${_name}")
     636    if (NOT EXISTS ${_target_filename})
     637        file(WRITE ${_target_filename} "#import \"${_file}\"")
     638    endif ()
     639endforeach ()
     640
    625641file(COPY
    626642    mac/Plugins/Hosted/WebKitPluginAgent.defs
  • TabularUnified trunk/Source/WebKitLegacy/mac/ChangeLog

    r250565 r250579  
     12019-10-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards successful CMake build on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=202426
     5
     6        Rubber-stamped by Tim Horton.
     7
     8        * WebView/WebDataSource.mm:
     9
    1102019-10-01  Alex Christensen  <achristensen@webkit.org>
    211
  • TabularUnified trunk/Source/WebKitLegacy/mac/WebView/WebDataSource.mm

    r250565 r250579  
    5454#import <WebCore/LegacyWebArchive.h>
    5555#import <WebCore/MIMETypeRegistry.h>
    56 #import <WebCore/PreviewLoaderClient.h>
    5756#import <WebCore/ResourceRequest.h>
    5857#import <WebCore/SharedBuffer.h>
     
    7372
    7473#if USE(QUICK_LOOK)
     74#import <WebCore/PreviewLoaderClient.h>
    7575#import <WebCore/QuickLook.h>
    7676#endif
  • TabularUnified trunk/Source/cmake/OptionsMac.cmake

    r250550 r250579  
    3636WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE ON)
    3737WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RUBBER_BANDING PRIVATE ON)
     38WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SANDBOX_EXTENSIONS PRIVATE ON)
    3839WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_CONTROLS PRIVATE ON)
    3940WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PRIVATE ON)
Note: See TracChangeset for help on using the changeset viewer.