Progress towards CMake on Mac.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 15 Apr 2015 22:45:51 +0000 (22:45 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 15 Apr 2015 22:45:51 +0000 (22:45 +0000)
https://bugs.webkit.org/show_bug.cgi?id=143785

Reviewed by Csaba Osztrogonác.

.:

* CMakeLists.txt:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/WebKitFS.cmake:

Source/WebCore:

* CMakeLists.txt:
* PlatformMac.cmake:

Source/WebKit:

* PlatformMac.cmake:

Source/WebKit/mac:

* WebView/WebPDFDocumentExtras.mm:
* WebView/WebPDFView.mm:

Source/WebKit2:

* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@182865 268f45cc-cd09-0410-ab3c-d52691b4dbfc

16 files changed:
CMakeLists.txt
ChangeLog
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PlatformMac.cmake
Source/WebKit/ChangeLog
Source/WebKit/PlatformMac.cmake
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm
Source/WebKit/mac/WebView/WebPDFView.mm
Source/WebKit2/CMakeLists.txt
Source/WebKit2/ChangeLog
Source/WebKit2/PlatformEfl.cmake
Source/WebKit2/PlatformGTK.cmake
Source/cmake/OptionsMac.cmake
Source/cmake/WebKitFS.cmake

index 3277f61..26d5c1f 100644 (file)
@@ -17,7 +17,7 @@ set(TOOLS_DIR "${CMAKE_SOURCE_DIR}/Tools")
 set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
 set(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore")
 set(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
-set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
+set(DERIVED_SOURCES_WEBKITLEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
 set(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
 set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
 set(DERIVED_SOURCES_WTF_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WTF")
index 6d8908f..0deadb7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2015-04-15  Alex Christensen  <achristensen@webkit.org>
+
+        Progress towards CMake on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=143785
+
+        Reviewed by Csaba Osztrogonác.
+
+        * CMakeLists.txt:
+        * Source/cmake/OptionsMac.cmake:
+        * Source/cmake/WebKitFS.cmake:
+
 2015-04-10  Jon Honeycutt  <jhoneycutt@apple.com>
 
         Cannot click "Next" button on Google two-factor auth setup page
index 290b331..a690515 100644 (file)
@@ -1214,6 +1214,21 @@ set(WebCore_SOURCES
 
     bridge/jsc/BridgeJSC.cpp
 
+    contentextensions/CombinedURLFilters.cpp
+    contentextensions/CompiledContentExtension.cpp
+    contentextensions/ContentExtension.cpp
+    contentextensions/ContentExtensionCompiler.cpp
+    contentextensions/ContentExtensionError.cpp
+    contentextensions/ContentExtensionParser.cpp
+    contentextensions/ContentExtensionRule.cpp
+    contentextensions/ContentExtensionsBackend.cpp
+    contentextensions/DFA.cpp
+    contentextensions/DFABytecodeCompiler.cpp
+    contentextensions/DFABytecodeInterpreter.cpp
+    contentextensions/NFA.cpp
+    contentextensions/NFAToDFA.cpp
+    contentextensions/URLFilterParser.cpp
+
     css/BasicShapeFunctions.cpp
     css/CSSAspectRatioValue.cpp
     css/CSSBasicShapes.cpp
@@ -1822,6 +1837,7 @@ set(WebCore_SOURCES
     inspector/WorkerRuntimeAgent.cpp
 
     loader/CookieJar.cpp
+    loader/ContentFilter.cpp
     loader/CrossOriginAccessControl.cpp
     loader/CrossOriginPreflightResultCache.cpp
     loader/DocumentLoadTiming.cpp
@@ -2035,6 +2051,7 @@ set(WebCore_SOURCES
     platform/ScrollbarThemeComposite.cpp
     platform/SharedBuffer.cpp
     platform/SharedBufferChunkReader.cpp
+    platform/Theme.cpp
     platform/ThreadGlobalData.cpp
     platform/ThreadTimers.cpp
     platform/Timer.cpp
@@ -2086,6 +2103,7 @@ set(WebCore_SOURCES
     platform/graphics/BitmapImage.cpp
     platform/graphics/Color.cpp
     platform/graphics/CrossfadeGeneratedImage.cpp
+    platform/graphics/DisplayRefreshMonitorClient.cpp
     platform/graphics/FloatPoint.cpp
     platform/graphics/FloatPoint3D.cpp
     platform/graphics/FloatPolygon.cpp
@@ -2929,6 +2947,8 @@ if (ENABLE_VIDEO_TRACK)
         html/track/VideoTrack.cpp
         html/track/VideoTrackList.cpp
         html/track/VTTCue.cpp
+        html/track/VTTRegion.cpp
+        html/track/VTTRegionList.cpp
         html/track/VTTScanner.cpp
         html/track/WebVTTElement.cpp
         html/track/WebVTTParser.cpp
index 3d5f345..fe24ee8 100644 (file)
@@ -1,3 +1,13 @@
+2015-04-15  Alex Christensen  <achristensen@webkit.org>
+
+        Progress towards CMake on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=143785
+
+        Reviewed by Csaba Osztrogonác.
+
+        * CMakeLists.txt:
+        * PlatformMac.cmake:
+
 2015-04-15  Daniel Bates  <dabates@apple.com>
 
         Clean up: Have SVGTextLayoutEngine::beginTextPathLayout() take a reference to a
index 6cd906a..054aa54 100644 (file)
@@ -2,6 +2,7 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/accessibility/mac"
     "${WEBCORE_DIR}/bindings/objc"
     "${WEBCORE_DIR}/bridge/objc"
+    "${WEBCORE_DIR}/editing/cocoa"
     "${WEBCORE_DIR}/editing/mac"
     "${WEBCORE_DIR}/icu"
     "${WEBCORE_DIR}/loader/archive/cf"
@@ -44,6 +45,22 @@ list(APPEND WebCore_SOURCES
     accessibility/mac/WebAccessibilityObjectWrapperBase.mm
     accessibility/mac/WebAccessibilityObjectWrapperMac.mm
 
+    bindings/objc/DOM.mm
+    bindings/objc/DOMAbstractView.mm
+    bindings/objc/DOMCSS.mm
+    bindings/objc/DOMCustomXPathNSResolver.mm
+    bindings/objc/DOMEvents.mm
+    bindings/objc/DOMHTML.mm
+    bindings/objc/DOMInternal.mm
+    bindings/objc/DOMObject.mm
+    bindings/objc/DOMUIKitExtensions.mm
+    bindings/objc/DOMUtility.mm
+    bindings/objc/DOMXPath.mm
+    bindings/objc/ExceptionHandlers.mm
+    bindings/objc/ObjCEventListener.mm
+    bindings/objc/ObjCNodeFilterCondition.mm
+    bindings/objc/WebScriptObject.mm
+
     crypto/CommonCryptoUtilities.cpp
     crypto/CryptoAlgorithm.cpp
     crypto/CryptoAlgorithmDescriptionBuilder.cpp
@@ -52,6 +69,48 @@ list(APPEND WebCore_SOURCES
     crypto/CryptoKeyPair.cpp
     crypto/SubtleCrypto.cpp
 
+    crypto/algorithms/CryptoAlgorithmAES_CBC.cpp
+    crypto/algorithms/CryptoAlgorithmAES_KW.cpp
+    crypto/algorithms/CryptoAlgorithmHMAC.cpp
+    crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp
+    crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp
+    crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp
+    crypto/algorithms/CryptoAlgorithmSHA1.cpp
+    crypto/algorithms/CryptoAlgorithmSHA224.cpp
+    crypto/algorithms/CryptoAlgorithmSHA256.cpp
+    crypto/algorithms/CryptoAlgorithmSHA384.cpp
+    crypto/algorithms/CryptoAlgorithmSHA512.cpp
+
+    crypto/keys/CryptoKeyAES.cpp
+    crypto/keys/CryptoKeyDataOctetSequence.cpp
+    crypto/keys/CryptoKeyDataRSAComponents.cpp
+    crypto/keys/CryptoKeyHMAC.cpp
+    crypto/keys/CryptoKeySerializationRaw.cpp
+
+    crypto/mac/CryptoAlgorithmAES_CBCMac.cpp
+    crypto/mac/CryptoAlgorithmAES_KWMac.cpp
+    crypto/mac/CryptoAlgorithmHMACMac.cpp
+    crypto/mac/CryptoAlgorithmRSAES_PKCS1_v1_5Mac.cpp
+    crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp
+    crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp
+    crypto/mac/CryptoAlgorithmRegistryMac.cpp
+    crypto/mac/CryptoDigestMac.cpp
+    crypto/mac/CryptoKeyMac.cpp
+    crypto/mac/CryptoKeyRSAMac.cpp
+    crypto/mac/SerializedCryptoKeyWrapMac.mm
+
+    editing/cocoa/HTMLConverter.mm
+
+    editing/mac/AlternativeTextUIController.mm
+    editing/mac/DataDetection.mm
+    editing/mac/DictionaryLookup.mm
+    editing/mac/EditorMac.mm
+    editing/mac/FrameSelectionMac.mm
+    editing/mac/TextAlternativeWithRange.mm
+    editing/mac/TextUndoInsertionMarkupMac.mm
+
+    history/mac/HistoryItemMac.mm
+
     loader/archive/cf/LegacyWebArchive.cpp
     loader/archive/cf/LegacyWebArchiveMac.mm
 
@@ -87,6 +146,7 @@ list(APPEND WebCore_SOURCES
     platform/cf/SharedTimerCF.cpp
     platform/cf/URLCF.cpp
 
+    platform/cocoa/ContentFilterUnblockHandlerCocoa.mm
     platform/cocoa/DisplaySleepDisablerCocoa.cpp
     platform/cocoa/KeyEventCocoa.mm
     platform/cocoa/MemoryPressureHandlerCocoa.mm
@@ -132,6 +192,14 @@ list(APPEND WebCore_SOURCES
     platform/graphics/ca/mac/PlatformCALayerMac.mm
     platform/graphics/ca/mac/WebTiledBackingLayer.mm
 
+    platform/graphics/cocoa/FontCascadeCocoa.mm
+    platform/graphics/cocoa/FontCocoa.mm
+    platform/graphics/cocoa/FontPlatformDataCocoa.mm
+    platform/graphics/cocoa/IOSurface.mm
+    platform/graphics/cocoa/IOSurfacePoolCocoa.mm
+    platform/graphics/cocoa/WebActionDisablingCALayerDelegate.mm
+    platform/graphics/cocoa/WebCoreCALayerExtras.mm
+
     platform/graphics/cg/BitmapImageCG.cpp
     platform/graphics/cg/ColorCG.cpp
     platform/graphics/cg/FloatPointCG.cpp
@@ -315,6 +383,7 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
     inspector
     loader
 
+    bridge/jsc
     loader/appcache
     loader/archive
     loader/archive/cf
@@ -336,6 +405,8 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
     page/mac
     page/scrolling
 
+    page/cocoa
+
     platform/animation
     platform/audio
     platform/graphics
@@ -438,7 +509,7 @@ set(ADDITIONAL_BINDINGS_DEPENDENCIES
     ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
     ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
 )
-GENERATE_BINDINGS(OBJC_BINDINGS
+GENERATE_BINDINGS(WebCore_SOURCES
     "${OBJC_BINDINGS_IDL_FILES}"
     "${WEBCORE_DIR}"
     "${IDL_INCLUDES}"
@@ -447,4 +518,135 @@ GENERATE_BINDINGS(OBJC_BINDINGS
     ${IDL_ATTRIBUTES_FILE}
     ${SUPPLEMENTAL_DEPENDENCY_FILE}
     ${ADDITIONAL_BINDINGS_DEPENDENCIES})
-# FIXME: Add the needed ObjC bindings to WebCore_SOURCES.
+
+list(REMOVE_ITEM WebCore_SOURCES
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAbstractView.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAbstractWorker.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAnalyserNode.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAudioBuffer.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAudioBufferSourceNode.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAudioContext.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAudioDestinationNode.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAudioNode.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAudioParam.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMBiquadFilterNode.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCanvasRenderingContext2D.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMChannelMergerNode.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMChannelSplitterNode.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMChildNode.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCommandLineAPIHost.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMConvolverNode.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCoordinates.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCrypto.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCryptoKey.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCustomEvent.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDataCue.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDataTransfer.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDedicatedWorkerGlobalScope.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDelayNode.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMCoreException.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMFormData.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMPath.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMSettableTokenList.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMStringMap.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMURL.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMURLMediaSource.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMURLMediaStream.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMWindow.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMWindowIndexedDatabase.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMWindowNotifications.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMWindowSpeechSynthesis.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMWindowWebDatabase.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDynamicsCompressorNode.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMEventListener.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMEventTarget.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMFileException.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMFileReader.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMFileReaderSync.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMGainNode.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMGeolocation.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHistory.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLFormControlsCollection.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLMediaElement.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLMediaElementMediaStream.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLTrackElement.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLVideoElement.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBAny.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBCursor.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBCursor.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBCursorWithValue.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBCursorWithValue.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBDatabase.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBDatabase.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBFactory.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBFactory.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBIndex.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBIndex.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBKeyRange.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBKeyRange.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBObjectStore.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBObjectStore.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBOpenDBRequest.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBOpenDBRequest.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBRequest.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBRequest.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBTransaction.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBTransaction.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBVersionChangeEvent.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBVersionChangeEvent.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMInspectorFrontendHost.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMLocation.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMediaControlsHost.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMediaElementAudioSourceNode.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMediaSource.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMutationObserver.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigator.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorBattery.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorContentUtils.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorGamepad.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorGeolocation.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorMediaDevices.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorUserMedia.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorVibration.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNodeFilter.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNotification.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMOfflineAudioContext.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMOscillatorNode.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMPannerNode.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMPopStateEvent.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMRadioNodeList.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMReadableStream.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMReadableStreamReader.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMScriptProcessorNode.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMScriptProfile.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMScriptProfileNode.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSourceBuffer.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSourceBufferList.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSQLError.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSQLException.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSQLResultSetRowList.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSQLStatementErrorCallback.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSQLTransaction.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSQLTransactionErrorCallback.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSubtleCrypto.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMTrackEvent.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMUIRequestEvent.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMURLUtils.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMVTTCue.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWaveShaperNode.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWebGL2RenderingContext.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWebGLRenderingContext.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWebGLRenderingContextBase.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWebSocket.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWindowBase64.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWindowIndexedDatabase.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWindowTimers.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWorker.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWorkerGlobalScope.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWorkerGlobalScopeIndexedDatabase.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWorkerGlobalScopeIndexedDatabase.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWorkerGlobalScopeNotifications.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMXMLHttpRequest.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMXMLHttpRequestProgressEvent.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMXPathNSResolver.mm
+)
index de6fc1f..03455e6 100644 (file)
@@ -1,3 +1,12 @@
+2015-04-15  Alex Christensen  <achristensen@webkit.org>
+
+        Progress towards CMake on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=143785
+
+        Reviewed by Csaba Osztrogonác.
+
+        * PlatformMac.cmake:
+
 2015-04-08  Alex Christensen  <achristensen@webkit.org> and Patrick Gansterer  <paroga@webkit.org>
 
         Add CMake build system for WinCairo port.
index da61096..8f2ab53 100644 (file)
@@ -1,15 +1,23 @@
 find_library(ACCELERATE_LIBRARY accelerate)
+find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
 find_library(AUDIOUNIT_LIBRARY AudioUnit)
 find_library(CARBON_LIBRARY Carbon)
 find_library(COCOA_LIBRARY Cocoa)
+find_library(COREAUDIO_LIBRARY CoreAudio)
 find_library(DISKARBITRATION_LIBRARY DiskArbitration)
 find_library(IOKIT_LIBRARY IOKit)
+find_library(IOSURFACE_LIBRARY IOSurface)
 find_library(OPENGL_LIBRARY OpenGL)
+find_library(QUARTZ_LIBRARY Quartz)
 find_library(QUARTZCORE_LIBRARY QuartzCore)
+find_library(SECURITY_LIBRARY Security)
 find_library(SQLITE3_LIBRARY sqlite3)
 find_library(XML2_LIBRARY XML2)
 find_package(ZLIB REQUIRED)
 
+find_library(PDFKIT_FRAMEWORK PDFKit HINTS ${QUARTZ_LIBRARY}/Versions/*/Frameworks)
+find_path(PDFKIT_INCLUDE_DIRECTORY PDFKit.h HINTS ${PDFKIT_FRAMEWORK}/Versions/*/Headers)
+
 if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
 set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
 else ()
@@ -19,26 +27,37 @@ link_directories(../../WebKitLibraries)
 
 list(APPEND WebKit_LIBRARIES
     ${ACCELERATE_LIBRARY}
+    ${AUDIOTOOLBOX_LIBRARY}
     ${AUDIOUNIT_LIBRARY}
     ${CARBON_LIBRARY}
     ${COCOA_LIBRARY}
+    ${COREAUDIO_LIBRARY}
     ${DISKARBITRATION_LIBRARY}
     ${IOKIT_LIBRARY}
+    ${IOSURFACE_LIBRARY}
     ${OPENGL_LIBRARY}
+    ${PDFKIT_FRAMEWORK}/PDFKit
+    ${QUARTZ_LIBRARY}
     ${QUARTZCORE_LIBRARY}
+    ${SECURITY_LIBRARY}
     ${SQLITE3_LIBRARY}
     ${WEBKITSYSTEMINTERFACE_LIBRARY}
     ${XML2_LIBRARY}
+    ${ZLIB_LIBRARIES}
 )
 
 list(APPEND WebKit_INCLUDE_DIRECTORIES
+    "${DERIVED_SOURCES_DIR}"
     "${DERIVED_SOURCES_WEBCORE_DIR}"
+    "${DERIVED_SOURCES_WEBKITLEGACY_DIR}"
     "${JAVASCRIPTCORE_DIR}/dfg"
+    "${PDFKIT_INCLUDE_DIRECTORY}"
     "${WEBCORE_DIR}/accessibility/mac"
     "${WEBCORE_DIR}/bindings/objc"
     "${WEBCORE_DIR}/bridge"
     "${WEBCORE_DIR}/bridge/jsc"
     "${WEBCORE_DIR}/bridge/objc"
+    "${WEBCORE_DIR}/ForwardingHeaders/inspector"
     "${WEBCORE_DIR}/loader/archive/cf"
     "${WEBCORE_DIR}/loader/cf"
     "${WEBCORE_DIR}/loader/mac"
@@ -78,6 +97,7 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES
     mac/WebInspector
     mac/WebView
     Storage
+    ../../WebKitLibraries
 )
 
 list(APPEND WebKit_SOURCES
@@ -236,6 +256,15 @@ list(APPEND WebKit_SOURCES
     mac/WebView/WebTextIterator.mm
     mac/WebView/WebView.mm
     mac/WebView/WebViewData.mm
+
+    Storage/StorageAreaImpl.cpp
+    Storage/StorageAreaSync.cpp
+    Storage/StorageNamespaceImpl.cpp
+    Storage/StorageSyncManager.cpp
+    Storage/StorageThread.cpp
+    Storage/StorageTracker.cpp
+    Storage/WebDatabaseProvider.cpp
+    Storage/WebStorageNamespaceProvider.cpp
 )
 
 set(WebKit_LIBRARY_TYPE SHARED)
@@ -321,4 +350,43 @@ set_source_files_properties(
     mac/WebView/WebFormDelegate.m
 PROPERTIES COMPILE_FLAGS -std=c99)
 
+file(COPY
+    mac/Plugins/Hosted/WebKitPluginAgent.defs
+    mac/Plugins/Hosted/WebKitPluginAgentReply.defs
+    mac/Plugins/Hosted/WebKitPluginClient.defs
+    mac/Plugins/Hosted/WebKitPluginHost.defs
+    mac/Plugins/Hosted/WebKitPluginHostTypes.defs
+    mac/Plugins/Hosted/WebKitPluginHostTypes.h
+DESTINATION ${DERIVED_SOURCES_WEBKITLEGACY_DIR})
+add_custom_command(
+    OUTPUT
+        ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentReplyServer.c
+        ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentReplyUser.c
+        ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentServer.c
+        ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentUser.c
+        ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostServer.c
+        ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostUser.c
+    MAIN_DEPENDENCY mac/Plugins/Hosted/WebKitPluginAgent.defs
+    WORKING_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR}
+    COMMAND mig -I.. WebKitPluginAgent.defs WebKitPluginAgentReply.defs WebKitPluginHost.defs
+    VERBATIM)
+add_custom_command(
+    OUTPUT
+        ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientServer.c
+        ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientUser.c
+    MAIN_DEPENDENCY mac/Plugins/Hosted/WebKitPluginAgent.defs
+    WORKING_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR}
+    COMMAND mig -I.. -sheader WebKitPluginClientServer.h WebKitPluginClient.defs
+    VERBATIM)
+list(APPEND WebKit_SOURCES
+    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentReplyServer.c
+    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentReplyUser.c
+    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentServer.c
+    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentUser.c
+    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientServer.c
+    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientUser.c
+    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostServer.c
+    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostUser.c
+)
+
 WEBKIT_CREATE_FORWARDING_HEADERS(WebKitLegacy DIRECTORIES ${WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES})
index 3d7e9e4..92cc299 100644 (file)
@@ -1,3 +1,13 @@
+2015-04-15  Alex Christensen  <achristensen@webkit.org>
+
+        Progress towards CMake on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=143785
+
+        Reviewed by Csaba Osztrogonác.
+
+        * WebView/WebPDFDocumentExtras.mm:
+        * WebView/WebPDFView.mm:
+
 2015-04-13  Jer Noble  <jer.noble@apple.com>
 
         [Fullscreen] ChromeClient::exitVideoFullscreen() should take a pointer to a HTMLVideoElement.
index 5a43f38..c8f3cea 100644 (file)
 #import <wtf/RetainPtr.h>
 
 #if !PLATFORM(IOS)
+#ifdef BUILDING_WITH_CMAKE
+#import <PDFDocument.h>
+#else
 #import <PDFKit/PDFDocument.h>
 #endif
+#endif
 
 static void appendValuesInPDFNameSubtreeToVector(CGPDFDictionaryRef subtree, Vector<CGPDFObjectRef>& values)
 {
index a81e4f0..57109e0 100644 (file)
@@ -49,7 +49,6 @@
 #import "WebUIDelegatePrivate.h"
 #import "WebView.h"
 #import "WebViewInternal.h"
-#import <PDFKit/PDFKit.h>
 #import <WebCore/DataTransfer.h>
 #import <WebCore/EventNames.h>
 #import <WebCore/FormState.h>
 #import <wtf/Assertions.h>
 #import <wtf/CurrentTime.h>
 
+#ifdef BUILDING_WITH_CMAKE
+#import <PDFKit.h>
+#else
+#import <PDFKit/PDFKit.h>
+#endif
+
 #ifdef __has_include
 #if __has_include(<ApplicationServices/ApplicationServicesPriv.h>)
 #import <ApplicationServices/ApplicationServicesPriv.h>
index 784fca1..0b6d687 100644 (file)
@@ -320,7 +320,6 @@ set(WebKit2_SOURCES
 
     Shared/WebsiteData/WebsiteData.cpp
 
-    UIProcess/BackingStore.cpp
     UIProcess/DrawingAreaProxy.cpp
     UIProcess/FrameLoadState.cpp
     UIProcess/GeolocationPermissionRequestManagerProxy.cpp
index 62ab7a6..5de03fd 100644 (file)
@@ -1,3 +1,14 @@
+2015-04-15  Alex Christensen  <achristensen@webkit.org>
+
+        Progress towards CMake on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=143785
+
+        Reviewed by Csaba Osztrogonác.
+
+        * CMakeLists.txt:
+        * PlatformEfl.cmake:
+        * PlatformGTK.cmake:
+
 2015-04-15  Anders Carlsson  <andersca@apple.com>
 
         Make WKWebsiteDataRecord public
index a1e36a4..47967eb 100644 (file)
@@ -58,6 +58,7 @@ list(APPEND WebKit2_SOURCES
 
     Shared/unix/ChildProcessMain.cpp
 
+    UIProcess/BackingStore.cpp
     UIProcess/DefaultUndoController.cpp
 
     UIProcess/API/C/CoordinatedGraphics/WKView.cpp
index bffbb82..e0ef71f 100644 (file)
@@ -77,6 +77,8 @@ list(APPEND WebKit2_SOURCES
 
     Shared/unix/ChildProcessMain.cpp
 
+    UIProcess/BackingStore.cpp
+
     UIProcess/Databases/gtk/DatabaseProcessProxyGtk.cpp
 
     UIProcess/DefaultUndoController.cpp
index e7d29cc..ce5402d 100644 (file)
@@ -167,9 +167,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TELEPHONE_NUMBER_DETECTION_iphonesimulat
 
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEMPLATE_ELEMENT ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEXT_AUTOSIZING OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS_iphoneos ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS_iphonesimulator ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_ICON_LOADING OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USERSELECT_ALL ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USER_MESSAGE_HANDLERS ON)
@@ -194,6 +191,10 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT ON)
 
 # FIXME: These are turned off temporarily to get CMake working easier. 
 # https://bugs.webkit.org/show_bug.cgi?id=135856
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS_iphoneos OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS_iphonesimulator OFF)
+
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_macosx OFF)
index 1c4c87d..55c8400 100644 (file)
@@ -10,3 +10,7 @@ file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol
 if (ENABLE_WEBKIT2)
     file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
 endif ()
+
+if (ENABLE_WEBKIT)
+    file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR})
+endif ()