Progress towards CMake on Mac.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 20 Mar 2015 18:18:41 +0000 (18:18 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 20 Mar 2015 18:18:41 +0000 (18:18 +0000)
https://bugs.webkit.org/show_bug.cgi?id=136003

Reviewed by Chris Dumez.

Source/WebCore:

* PlatformMac.cmake:
Added some directories to create forwarding headers from.
Generate ObjC bindings.

Source/WebKit:

* CMakeLists.txt:
* PlatformMac.cmake: Added.

Source/WebKit2:

* PlatformMac.cmake:
Add include directories and forwarding headers.
* Shared/API/APIObject.h:
(API::ObjectImpl::operator new):
* UIProcess/DrawingAreaProxy.h:
(WebKit::DrawingAreaProxy::intrinsicContentSizeDidChange):
* UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
Fix some unused parameter warnings.

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

Source/WebCore/ChangeLog
Source/WebCore/PlatformMac.cmake
Source/WebKit/CMakeLists.txt
Source/WebKit/ChangeLog
Source/WebKit/PlatformMac.cmake [new file with mode: 0644]
Source/WebKit2/ChangeLog
Source/WebKit2/PlatformMac.cmake
Source/WebKit2/Shared/API/APIObject.h
Source/WebKit2/UIProcess/DrawingAreaProxy.h
Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h

index bb38fb8..fec540f 100644 (file)
@@ -1,3 +1,14 @@
+2015-03-20  Alex Christensen  <achristensen@webkit.org>
+
+        Progress towards CMake on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=136003
+
+        Reviewed by Chris Dumez.
+
+        * PlatformMac.cmake:
+        Added some directories to create forwarding headers from.
+        Generate ObjC bindings.
+
 2015-03-20  Per Arne Vollan  <peavo@outlook.com>
 
         [WinCairo] Crash when leaving page while video is playing.
index f6b159b..0de3149 100644 (file)
@@ -130,7 +130,6 @@ list(APPEND WebCore_SOURCES
     platform/mac/ScrollbarThemeMac.mm
     platform/mac/SerializedPlatformRepresentationMac.mm
     platform/mac/SharedBufferMac.mm
-    platform/mac/SharedTimerMac.mm
     platform/mac/SoundMac.mm
     platform/mac/SuddenTermination.mm
     platform/mac/SystemSleepListenerMac.mm
@@ -200,59 +199,117 @@ list(APPEND WebCore_SOURCES
     platform/text/mac/TextCodecMac.cpp
 )
 
+# FIXME: We do not need everything from all of these directories.
+# Move some to WebCore_FORWARDING_HEADERS_FILES once people start actually maintaining this.
 set(WebCore_FORWARDING_HEADERS_DIRECTORIES
-    html
+    accessibility
+    bindings/js
     bindings/objc
+    bindings/generic
+    bridge
+    contentextensions
+    crypto
+    css
+    dom
+    editing
+    editing/cocoa
+    editing/mac
+    history
+    html
+    html/forms
+    html/parser
+    html/shadow
+    inspector
+    loader
+    loader/appcache
+    loader/archive
+    loader/archive/cf
+    loader/cache
+    Modules/indexeddb
+    Modules/geolocation
+    Modules/notifications
+    Modules/webdatabase
+    page
     platform
+    plugins
+    rendering
+    storage
+    style
+    svg
+
+    page/animation
+    page/mac
+    page/scrolling
+
+    platform/animation
+    platform/graphics
     platform/mac
+    platform/mock
+    platform/network
+    platform/sql
+    platform/text
+
+    platform/graphics/ca
+    platform/graphics/filters
+    platform/graphics/mac
+    platform/graphics/transforms
+
     platform/network/cf
+    platform/network/cocoa
+    platform/network/mac
+
+    platform/spi/cf
+    platform/spi/cg
+    platform/spi/cocoa
+    platform/spi/mac
+
+    rendering/line
+    rendering/style
+
+    svg/graphics
+    svg/properties
 )
 
 set(WebCore_FORWARDING_HEADERS_FILES
-    bindings/js/SerializedScriptValue.h
-    bindings/objc/WebKitAvailability.h
-
     bridge/IdentifierRep.h
+    bridge/npruntime_impl.h
     bridge/npruntime_internal.h
 
     contentextensions/CompiledContentExtension.h
 
+    editing/EditAction.h
+    editing/EditingBehaviorTypes.h
+    editing/EditingBoundary.h
     editing/FindOptions.h
+    editing/FrameSelection.h
+    editing/TextAffinity.h
+
+    editing/mac/TextAlternativeWithRange.h
+
+    history/BackForwardList.h
+    history/HistoryItem.h
+    history/PageCache.h
 
     html/HTMLMediaElement.h
 
-    loader/FrameLoaderTypes.h
-    loader/LoaderStrategy.h
-    loader/ResourceLoaderOptions.h
+    loader/appcache/ApplicationCacheStorage.h
 
-    Modules/indexeddb/IDBKeyData.h
-    Modules/indexeddb/IDBKeyPath.h
-    Modules/webdatabase/DatabaseDetails.h
+    loader/icon/IconDatabase.h
+    loader/icon/IconDatabaseBase.h
+    loader/icon/IconDatabaseClient.h
 
-    page/ContextMenuContext.h
-    page/SecurityOrigin.h
-    page/SessionID.h
-    page/TextIndicator.h
-    page/UserScript.h
-    page/UserStyleSheet.h
+    loader/mac/LoaderNSURLExtras.h
+
+    Modules/webdatabase/DatabaseDetails.h
 
-    platform/PlatformExportMacros.h
     platform/DisplaySleepDisabler.h
+    platform/PlatformExportMacros.h
 
     platform/audio/AudioHardwareListener.h
 
-    platform/cocoa/MachSendRight.h
+    platform/cf/RunLoopObserver.h
 
-    platform/graphics/Color.h
-    platform/graphics/FloatPoint.h
-    platform/graphics/FloatRect.h
-    platform/graphics/FloatSize.h
-    platform/graphics/GraphicsContext.h
-    platform/graphics/GraphicsLayer.h
-    platform/graphics/IntPoint.h
-    platform/graphics/IntRect.h
-    platform/graphics/IntSize.h
-    platform/graphics/NativeImagePtr.h
+    platform/cocoa/MachSendRight.h
 
     platform/graphics/cocoa/IOSurface.h
 
@@ -261,36 +318,36 @@ set(WebCore_FORWARDING_HEADERS_FILES
     platform/mac/SoftLinking.h
     platform/mac/WebCoreSystemInterface.h
 
-    platform/network/BlobDataFileReference.h
-    platform/network/BlobRegistryImpl.h
-    platform/network/HTTPHeaderMap.h
-    platform/network/NetworkStorageSession.h
-    platform/network/ResourceHandle.h
+    platform/network/mac/AuthenticationMac.h
 
     platform/network/cf/CertificateInfo.h
     platform/network/cf/ResourceResponse.h
 
-    platform/spi/cg/CoreGraphicsSPI.h
+    platform/sql/SQLiteDatabase.h
 
-    plugins/PluginData.h
-    plugins/npruntime.h
+    rendering/style/RenderStyleConstants.h
+)
+
+set(OBJC_BINDINGS_IDL_FILES
+    dom/EventListener.idl
+    ${WebCore_NON_SVG_IDL_FILES}
 )
 
 WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebCore_FORWARDING_HEADERS_FILES})
 
-# FIXME: Get Objective C bindings working.
-#set(FEATURE_DEFINES_OBJECTIVE_C "LANGUAGE_OBJECTIVE_C=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
-#set(ADDITIONAL_BINDINGS_DEPENDENCIES
-#    ${WINDOW_CONSTRUCTORS_FILE}
-#    ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
-#    ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
-#)
-#GENERATE_BINDINGS(WebCore_SOURCES
-#    "${WebCore_NON_SVG_IDL_FILES}"
-#    "${WEBCORE_DIR}"
-#    "${IDL_INCLUDES}"
-#    "${FEATURE_DEFINES_OBJECTIVE_C}"
-#    ${DERIVED_SOURCES_WEBCORE_DIR} DOM ObjC mm
-#    ${IDL_ATTRIBUTES_FILE}
-#    ${SUPPLEMENTAL_DEPENDENCY_FILE}
-#    ${ADDITIONAL_BINDINGS_DEPENDENCIES})
+set(FEATURE_DEFINES_OBJECTIVE_C "LANGUAGE_OBJECTIVE_C=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
+set(ADDITIONAL_BINDINGS_DEPENDENCIES
+    ${WINDOW_CONSTRUCTORS_FILE}
+    ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
+    ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
+)
+GENERATE_BINDINGS(OBJC_BINDINGS
+    "${OBJC_BINDINGS_IDL_FILES}"
+    "${WEBCORE_DIR}"
+    "${IDL_INCLUDES}"
+    "${FEATURE_DEFINES_OBJECTIVE_C}"
+    ${DERIVED_SOURCES_WEBCORE_DIR} DOM ObjC mm
+    ${IDL_ATTRIBUTES_FILE}
+    ${SUPPLEMENTAL_DEPENDENCY_FILE}
+    ${ADDITIONAL_BINDINGS_DEPENDENCIES})
+# FIXME: Add the needed ObjC bindings to WebCore_SOURCES.
index 9a32b6e..8abf6a5 100644 (file)
@@ -1,9 +1,16 @@
-# FIXME: Put Windows and Mac build files here.
-
 set(WebKit_SOURCES
 )
 
 set(WebKit_INCLUDE_DIRECTORIES
+    "${DERIVED_SOURCES_DIR}"
+    "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
+    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
+    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
+    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy"
+    "${JAVASCRIPTCORE_DIR}"
+    "${JAVASCRIPTCORE_DIR}/disassembler"
+    "${CMAKE_SOURCE_DIR}/Source"
+    "${WTF_DIR}"
 )
 
 set(WebKit_LIBRARIES
index 1f63247..8207086 100644 (file)
@@ -1,3 +1,13 @@
+2015-03-20  Alex Christensen  <achristensen@webkit.org>
+
+        Progress towards CMake on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=136003
+
+        Reviewed by Chris Dumez.
+
+        * CMakeLists.txt:
+        * PlatformMac.cmake: Added.
+
 2015-03-13  Alex Christensen  <achristensen@webkit.org>
 
         Progress towards CMake on Mac.
diff --git a/Source/WebKit/PlatformMac.cmake b/Source/WebKit/PlatformMac.cmake
new file mode 100644 (file)
index 0000000..1dc25bc
--- /dev/null
@@ -0,0 +1,290 @@
+list(APPEND WebKit_INCLUDE_DIRECTORIES
+    "${JAVASCRIPTCORE_DIR}/dfg"
+    "${WEBCORE_DIR}/accessibility/mac"
+    "${WEBCORE_DIR}/bindings/objc"
+    "${WEBCORE_DIR}/bridge"
+    "${WEBCORE_DIR}/bridge/jsc"
+    "${WEBCORE_DIR}/bridge/objc"
+    "${WEBCORE_DIR}/loader/archive/cf"
+    "${WEBCORE_DIR}/loader/cf"
+    "${WEBCORE_DIR}/loader/mac"
+    "${WEBCORE_DIR}/page/cocoa"
+    "${WEBCORE_DIR}/page/mac"
+    "${WEBCORE_DIR}/platform/cf"
+    "${WEBCORE_DIR}/platform/cocoa"
+    "${WEBCORE_DIR}/platform/graphics/avfoundation"
+    "${WEBCORE_DIR}/platform/graphics/avfoundation/cf"
+    "${WEBCORE_DIR}/platform/graphics/avfoundation/objc"
+    "${WEBCORE_DIR}/platform/graphics/ca"
+    "${WEBCORE_DIR}/platform/graphics/ca/mac"
+    "${WEBCORE_DIR}/platform/graphics/cocoa"
+    "${WEBCORE_DIR}/platform/graphics/cg"
+    "${WEBCORE_DIR}/platform/graphics/opentype"
+    "${WEBCORE_DIR}/platform/graphics/mac"
+    "${WEBCORE_DIR}/platform/mac"
+    "${WEBCORE_DIR}/platform/network/cocoa"
+    "${WEBCORE_DIR}/platform/network/cf"
+    "${WEBCORE_DIR}/platform/network/mac"
+    "${WEBCORE_DIR}/platform/text/cf"
+    "${WEBCORE_DIR}/platform/text/mac"
+    "${WEBCORE_DIR}/plugins/mac"
+
+    mac
+    mac/Carbon
+    mac/DefaultDelegates
+    mac/DOM
+    mac/History
+    mac/icu/unicode
+    mac/Misc
+    mac/Panels
+    mac/Plugins
+    mac/Plugins/Hosted
+    mac/Storage
+    mac/WebCoreSupport
+    mac/WebInspector
+    mac/WebView
+    Storage
+)
+
+list(APPEND WebKit_SOURCES
+    mac/Carbon/CarbonUtils.m
+    mac/Carbon/CarbonWindowAdapter.mm
+    mac/Carbon/CarbonWindowContentView.m
+    mac/Carbon/CarbonWindowFrame.m
+    mac/Carbon/HIViewAdapter.m
+    mac/Carbon/HIWebView.mm
+
+    mac/History/BinaryPropertyList.cpp
+    mac/History/HistoryPropertyList.mm
+    mac/History/WebBackForwardList.mm
+    mac/History/WebHistory.mm
+    mac/History/WebHistoryItem.mm
+    mac/History/WebURLsWithTitles.m
+
+    mac/Misc/OldWebAssertions.c
+    mac/Misc/WebCache.mm
+    mac/Misc/WebCoreStatistics.mm
+    mac/Misc/WebDownload.mm
+    mac/Misc/WebElementDictionary.mm
+    mac/Misc/WebIconDatabase.mm
+    mac/Misc/WebKitErrors.m
+    mac/Misc/WebKitLogging.m
+    mac/Misc/WebKitNSStringExtras.mm
+    mac/Misc/WebKitStatistics.m
+    mac/Misc/WebKitSystemBits.m
+    mac/Misc/WebKitVersionChecks.m
+    mac/Misc/WebLocalizableStrings.mm
+    mac/Misc/WebLocalizableStringsInternal.mm
+    mac/Misc/WebNSArrayExtras.m
+    mac/Misc/WebNSControlExtras.m
+    mac/Misc/WebNSDataExtras.m
+    mac/Misc/WebNSDictionaryExtras.m
+    mac/Misc/WebNSEventExtras.m
+    mac/Misc/WebNSFileManagerExtras.mm
+    mac/Misc/WebNSImageExtras.m
+    mac/Misc/WebNSObjectExtras.mm
+    mac/Misc/WebNSPasteboardExtras.mm
+    mac/Misc/WebNSPrintOperationExtras.m
+    mac/Misc/WebNSURLExtras.mm
+    mac/Misc/WebNSURLRequestExtras.m
+    mac/Misc/WebNSUserDefaultsExtras.mm
+    mac/Misc/WebNSViewExtras.m
+    mac/Misc/WebNSWindowExtras.m
+    mac/Misc/WebSharingServicePickerController.mm
+    mac/Misc/WebStringTruncator.mm
+    mac/Misc/WebUserContentURLPattern.mm
+
+    mac/Panels/WebAuthenticationPanel.m
+    mac/Panels/WebPanelAuthenticationHandler.m
+
+    mac/Plugins/WebBaseNetscapePluginView.mm
+    mac/Plugins/WebBasePluginPackage.mm
+    mac/Plugins/WebNetscapeContainerCheckContextInfo.mm
+    mac/Plugins/WebNetscapeContainerCheckPrivate.mm
+    mac/Plugins/WebNetscapePluginEventHandler.mm
+    mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm
+    mac/Plugins/WebNetscapePluginEventHandlerCocoa.mm
+    mac/Plugins/WebNetscapePluginPackage.mm
+    mac/Plugins/WebNetscapePluginStream.mm
+    mac/Plugins/WebNetscapePluginView.mm
+    mac/Plugins/WebPluginContainerCheck.mm
+    mac/Plugins/WebPluginController.mm
+    mac/Plugins/WebPluginDatabase.mm
+    mac/Plugins/WebPluginPackage.mm
+    mac/Plugins/WebPluginRequest.m
+    mac/Plugins/WebPluginsPrivate.m
+    mac/Plugins/npapi.mm
+
+    mac/Plugins/Hosted/HostedNetscapePluginStream.mm
+    mac/Plugins/Hosted/NetscapePluginHostManager.mm
+    mac/Plugins/Hosted/NetscapePluginHostProxy.mm
+    mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
+    mac/Plugins/Hosted/ProxyInstance.mm
+    mac/Plugins/Hosted/ProxyRuntimeObject.mm
+    mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
+    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/WebTextInputWindowController.m
+
+    mac/Storage/WebDatabaseManager.mm
+    mac/Storage/WebDatabaseManagerClient.mm
+    mac/Storage/WebDatabaseQuotaManager.mm
+    mac/Storage/WebStorageManager.mm
+    mac/Storage/WebStorageTrackerClient.mm
+
+    mac/WebCoreSupport/CorrectionPanel.mm
+    mac/WebCoreSupport/PopupMenuMac.mm
+    mac/WebCoreSupport/SearchPopupMenuMac.mm
+    mac/WebCoreSupport/WebAlternativeTextClient.mm
+    mac/WebCoreSupport/WebApplicationCache.mm
+    mac/WebCoreSupport/WebApplicationCacheQuotaManager.mm
+    mac/WebCoreSupport/WebChromeClient.mm
+    mac/WebCoreSupport/WebContextMenuClient.mm
+    mac/WebCoreSupport/WebDeviceOrientationClient.mm
+    mac/WebCoreSupport/WebDragClient.mm
+    mac/WebCoreSupport/WebEditorClient.mm
+    mac/WebCoreSupport/WebFrameLoaderClient.mm
+    mac/WebCoreSupport/WebFrameNetworkingContext.mm
+    mac/WebCoreSupport/WebGeolocationClient.mm
+    mac/WebCoreSupport/WebIconDatabaseClient.mm
+    mac/WebCoreSupport/WebInspectorClient.mm
+    mac/WebCoreSupport/WebJavaScriptTextInputPanel.m
+    mac/WebCoreSupport/WebKeyGenerator.mm
+    mac/WebCoreSupport/WebKitFullScreenListener.mm
+    mac/WebCoreSupport/WebNotificationClient.mm
+    mac/WebCoreSupport/WebOpenPanelResultListener.mm
+    mac/WebCoreSupport/WebPlatformStrategies.mm
+    mac/WebCoreSupport/WebProgressTrackerClient.mm
+    mac/WebCoreSupport/WebSecurityOrigin.mm
+    mac/WebCoreSupport/WebSystemInterface.mm
+    mac/WebCoreSupport/WebUserMediaClient.mm
+    mac/WebCoreSupport/WebViewGroup.mm
+
+    mac/WebInspector/WebInspector.mm
+    mac/WebInspector/WebInspectorFrontend.mm
+    mac/WebInspector/WebNodeHighlight.mm
+    mac/WebInspector/WebNodeHighlightView.mm
+    mac/WebInspector/WebNodeHighlighter.mm
+
+    mac/WebView/WebArchive.mm
+    mac/WebView/WebClipView.mm
+    mac/WebView/WebDashboardRegion.mm
+    mac/WebView/WebDataSource.mm
+    mac/WebView/WebDelegateImplementationCaching.mm
+    mac/WebView/WebDeviceOrientation.mm
+    mac/WebView/WebDeviceOrientationProviderMock.mm
+    mac/WebView/WebDocumentLoaderMac.mm
+    mac/WebView/WebDynamicScrollBarsView.mm
+    mac/WebView/WebFormDelegate.m
+    mac/WebView/WebFrame.mm
+    mac/WebView/WebFrameView.mm
+    mac/WebView/WebFullScreenController.mm
+    mac/WebView/WebGeolocationPosition.mm
+    mac/WebView/WebHTMLRepresentation.mm
+    mac/WebView/WebHTMLView.mm
+    mac/WebView/WebIndicateLayer.mm
+    mac/WebView/WebJSPDFDoc.mm
+    mac/WebView/WebNavigationData.mm
+    mac/WebView/WebNotification.mm
+    mac/WebView/WebPDFDocumentExtras.mm
+    mac/WebView/WebPDFRepresentation.mm
+    mac/WebView/WebPDFView.mm
+    mac/WebView/WebPolicyDelegate.mm
+    mac/WebView/WebPreferences.mm
+    mac/WebView/WebResource.mm
+    mac/WebView/WebScriptDebugDelegate.mm
+    mac/WebView/WebScriptDebugger.mm
+    mac/WebView/WebScriptWorld.mm
+    mac/WebView/WebTextCompletionController.mm
+    mac/WebView/WebTextIterator.mm
+    mac/WebView/WebView.mm
+    mac/WebView/WebViewData.mm
+)
+
+set(WebKit_LIBRARY_TYPE SHARED)
+
+set(WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES
+    mac/DOM
+    mac/History
+    mac/Misc
+    mac/Panels
+    mac/Plugins
+    mac/WebCoreSupport
+    mac/WebInspector
+    mac/WebView
+    ${DERIVED_SOURCES_WEBCORE_DIR}
+    ${WEBCORE_DIR}/bindings/objc
+    ${WEBCORE_DIR}/plugins
+)
+
+set(WebKitLegacy_FORWARDING_HEADERS_FILES
+    mac/DOM/WebDOMOperations.h
+
+    mac/History/WebHistory.h
+    mac/History/WebHistoryItem.h
+
+    mac/Misc/WebNSURLExtras.h
+
+    mac/Panels/WebPanelAuthenticationHandler.h
+
+    mac/Plugins/WebBasePluginPackage.h
+
+    mac/WebCoreSupport/WebKeyGenerator.h
+
+    mac/WebInspector/WebInspector.h
+
+    mac/WebView/WebFrame.h
+    mac/WebView/WebView.h
+
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMRange.h
+
+    ${WEBCORE_DIR}/bindings/objc/DOMCore.h
+    ${WEBCORE_DIR}/bindings/objc/DOMExtensions.h
+
+    ${WEBCORE_DIR}/plugins/npfunctions.h
+)
+
+add_definitions("-include WebKitPrefix.h")
+
+set_source_files_properties(
+    ${WEBKIT_DIR}/mac/Carbon/CarbonUtils.m
+    ${WEBKIT_DIR}/mac/Carbon/CarbonWindowContentView.m
+    ${WEBKIT_DIR}/mac/Carbon/CarbonWindowFrame.m
+    ${WEBKIT_DIR}/mac/Carbon/HIViewAdapter.m
+    mac/History/WebURLsWithTitles.m
+
+    mac/Misc/OldWebAssertions.c
+
+    mac/Misc/WebKitErrors.m
+    mac/Misc/WebKitLogging.m
+    mac/Misc/WebKitStatistics.m
+    mac/Misc/WebKitSystemBits.m
+    mac/Misc/WebKitVersionChecks.m
+    mac/Misc/WebNSArrayExtras.m
+    mac/Misc/WebNSControlExtras.m
+    mac/Misc/WebNSDataExtras.m
+    mac/Misc/WebNSDictionaryExtras.m
+    mac/Misc/WebNSEventExtras.m
+    mac/Misc/WebNSImageExtras.m
+    mac/Misc/WebNSPrintOperationExtras.m
+    mac/Misc/WebNSURLRequestExtras.m
+    mac/Misc/WebNSViewExtras.m
+    mac/Misc/WebNSWindowExtras.m
+
+    mac/Panels/WebAuthenticationPanel.m
+    mac/Panels/WebPanelAuthenticationHandler.m
+
+    mac/Plugins/WebPluginRequest.m
+    mac/Plugins/WebPluginsPrivate.m
+
+    mac/Plugins/Hosted/WebTextInputWindowController.m
+
+    mac/WebCoreSupport/WebJavaScriptTextInputPanel.m
+
+    mac/WebView/WebFormDelegate.m
+PROPERTIES COMPILE_FLAGS -std=c99)
+
+WEBKIT_CREATE_FORWARDING_HEADERS(WebKitLegacy DIRECTORIES ${WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES})
index d90a5cd..959c710 100644 (file)
@@ -1,3 +1,19 @@
+2015-03-20  Alex Christensen  <achristensen@webkit.org>
+
+        Progress towards CMake on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=136003
+
+        Reviewed by Chris Dumez.
+
+        * PlatformMac.cmake:
+        Add include directories and forwarding headers.
+        * Shared/API/APIObject.h:
+        (API::ObjectImpl::operator new):
+        * UIProcess/DrawingAreaProxy.h:
+        (WebKit::DrawingAreaProxy::intrinsicContentSizeDidChange):
+        * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
+        Fix some unused parameter warnings.
+
 2015-03-20  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 
         [CMake] Remove duplicated cmake function calls in WebKit2/CMakeLists.txt
index 6e2d956..062221e 100644 (file)
@@ -7,13 +7,21 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/network/cf"
     "${WEBCORE_DIR}/platform/graphics/opentype"
     "${WEBKIT2_DIR}/UIProcess/mac"
+    "${WEBKIT2_DIR}/UIProcess/API/C/mac"
+    "${WEBKIT2_DIR}/UIProcess/Cocoa"
+    "${WEBKIT2_DIR}/UIProcess/Scrolling"
     "${WEBKIT2_DIR}/Platform/mac"
     "${WEBKIT2_DIR}/Platform/IPC/mac"
     "${WEBKIT2_DIR}/Shared/API/Cocoa"
     "${WEBKIT2_DIR}/Shared/cf"
     "${WEBKIT2_DIR}/Shared/mac"
     "${WEBKIT2_DIR}/Shared/Plugins/mac"
+    "${WEBKIT2_DIR}/WebProcess/Plugins/PDF"
+    "${WEBKIT2_DIR}/WebProcess/Scrolling"
+    "${WEBKIT2_DIR}/WebProcess/WebPage/mac"
+    "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/mac"
     "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
+    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
 )
 
 set(WEBKIT2_EXTRA_DEPENDENCIES
@@ -22,3 +30,21 @@ set(WEBKIT2_EXTRA_DEPENDENCIES
 set(WebProcess_SOURCES
      WebProcess/mac/SecItemShimLibrary.mm
 )
+
+add_definitions("-include WebKit2Prefix.h")
+
+set(WebKit2_FORWARDING_HEADERS_FILES
+    Shared/API/c/WKDiagnosticLoggingResultType.h
+
+    UIProcess/API/C/WKPageDiagnosticLoggingClient.h
+    UIProcess/API/C/WKPageNavigationClient.h
+    UIProcess/API/C/WKPageRenderingProgressEvents.h
+)
+
+set(WebKit2_FORWARDING_HEADERS_DIRECTORIES
+    UIProcess/API/C
+    Shared/API/c
+    UIProcess/Cocoa
+)
+
+WEBKIT_CREATE_FORWARDING_HEADERS(WebKit FILES ${WebKit2_FORWARDING_HEADERS_FILES} DIRECTORIES ${WebKit2_FORWARDING_HEADERS_DIRECTORIES})
index 9ea381c..eaefff2 100644 (file)
@@ -245,7 +245,7 @@ protected:
 
 #if DELEGATE_REF_COUNTING_TO_COCOA
     void* operator new(size_t size) { return newObject(size, APIType); }
-    void* operator new(size_t size, void* value) { return value; }
+    void* operator new(size_t, void* value) { return value; }
 #endif
 };
 
index 18b3682..a1a6d26 100644 (file)
@@ -116,7 +116,7 @@ private:
     virtual void updateAcceleratedCompositingMode(uint64_t /* backingStoreStateID */, const LayerTreeContext&) { }
 #if PLATFORM(COCOA)
     virtual void didUpdateGeometry() { }
-    virtual void intrinsicContentSizeDidChange(const WebCore::IntSize& newIntrinsicContentSize) { }
+    virtual void intrinsicContentSizeDidChange(const WebCore::IntSize&) { }
 
 #if PLATFORM(MAC)
     RunLoop::Timer<DrawingAreaProxy> m_exposedRectChangedTimer;
index 50d93c9..0cf011e 100644 (file)
@@ -56,7 +56,7 @@ private:
 
     // Message handlers.
     virtual void didUpdateGeometry() override;
-    virtual void intrinsicContentSizeDidChange(const WebCore::IntSize& newIntrinsicContentSize) override;
+    virtual void intrinsicContentSizeDidChange(const WebCore::IntSize&) override;
 
     void sendUpdateGeometry();