- Revision
- 181601
- Author
- achristen...@apple.com
- Date
- 2015-03-16 17:29:55 -0700 (Mon, 16 Mar 2015)
Log Message
Progress towards CMake on Mac
https://bugs.webkit.org/show_bug.cgi?id=142747
Reviewed by Chris Dumez.
Source/_javascript_Core:
* CMakeLists.txt:
Include AugmentableInspectorController.h in CMake build.
Source/WebCore:
* CMakeLists.txt:
* PlatformMac.cmake:
Added more directories, interfaces, and forwarding headers.
Temporarily disabled the generating of ObjC bindings in CMake builds.
* platform/mac/PasteboardMac.mm:
Removed unused include.
Source/WebKit2:
* PlatformMac.cmake:
Started adding Mac-specific directories and headers.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (181600 => 181601)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2015-03-17 00:12:06 UTC (rev 181600)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2015-03-17 00:29:55 UTC (rev 181601)
@@ -15,6 +15,7 @@
"${_javascript_CORE_DIR}/debugger"
"${_javascript_CORE_DIR}/inspector"
"${_javascript_CORE_DIR}/inspector/agents"
+ "${_javascript_CORE_DIR}/inspector/augmentable"
"${_javascript_CORE_DIR}/inspector/remote"
"${_javascript_CORE_DIR}/interpreter"
"${_javascript_CORE_DIR}/jit"
@@ -902,6 +903,7 @@
heap
inspector
inspector/agents
+ inspector/augmentable
inspector/remote
interpreter
jit
@@ -964,6 +966,8 @@
assembler/MacroAssemblerCodeRef.h
assembler/MacroAssemblerCodeRef.h
+ inspector/augmentable/AugmentableInspectorController.h
+
inspector/remote/RemoteInspector.h
inspector/remote/RemoteInspectorConstants.h
inspector/remote/RemoteInspectorDebuggable.h
Modified: trunk/Source/_javascript_Core/ChangeLog (181600 => 181601)
--- trunk/Source/_javascript_Core/ChangeLog 2015-03-17 00:12:06 UTC (rev 181600)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-03-17 00:29:55 UTC (rev 181601)
@@ -1,3 +1,13 @@
+2015-03-16 Alex Christensen <achristen...@webkit.org>
+
+ Progress towards CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=142747
+
+ Reviewed by Chris Dumez.
+
+ * CMakeLists.txt:
+ Include AugmentableInspectorController.h in CMake build.
+
2015-03-16 Csaba Osztrogonác <o...@webkit.org>
[ARM] Enable generating idiv instructions if it is supported
Modified: trunk/Source/WebCore/CMakeLists.txt (181600 => 181601)
--- trunk/Source/WebCore/CMakeLists.txt 2015-03-17 00:12:06 UTC (rev 181600)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-03-17 00:29:55 UTC (rev 181601)
@@ -80,6 +80,7 @@
"${WEBCORE_DIR}/platform/image-decoders/webp"
"${WEBCORE_DIR}/platform/mediastream"
"${WEBCORE_DIR}/platform/mock"
+ "${WEBCORE_DIR}/platform/mock/mediasource"
"${WEBCORE_DIR}/platform/network"
"${WEBCORE_DIR}/platform/sql"
"${WEBCORE_DIR}/platform/text"
@@ -575,6 +576,20 @@
html/canvas/WebGLVertexArrayObject.idl
html/canvas/WebGLVertexArrayObjectOES.idl
+ html/track/AudioTrack.idl
+ html/track/AudioTrackList.idl
+ html/track/DataCue.idl
+ html/track/TextTrack.idl
+ html/track/TextTrackCue.idl
+ html/track/TextTrackCueList.idl
+ html/track/TextTrackList.idl
+ html/track/TrackEvent.idl
+ html/track/VTTCue.idl
+ html/track/VTTRegion.idl
+ html/track/VTTRegionList.idl
+ html/track/VideoTrack.idl
+ html/track/VideoTrackList.idl
+
inspector/CommandLineAPIHost.idl
inspector/InspectorFrontendHost.idl
inspector/ScriptProfile.idl
@@ -3142,6 +3157,7 @@
testing/Internals.idl
testing/MallocStatistics.idl
testing/MemoryInfo.idl
+ testing/MockContentFilterSettings.idl
testing/TypeConversions.idl
)
Modified: trunk/Source/WebCore/ChangeLog (181600 => 181601)
--- trunk/Source/WebCore/ChangeLog 2015-03-17 00:12:06 UTC (rev 181600)
+++ trunk/Source/WebCore/ChangeLog 2015-03-17 00:29:55 UTC (rev 181601)
@@ -1,3 +1,17 @@
+2015-03-16 Alex Christensen <achristen...@webkit.org>
+
+ Progress towards CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=142747
+
+ Reviewed by Chris Dumez.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+ Added more directories, interfaces, and forwarding headers.
+ Temporarily disabled the generating of ObjC bindings in CMake builds.
+ * platform/mac/PasteboardMac.mm:
+ Removed unused include.
+
2015-03-16 Joanmarie Diggs <jdi...@igalia.com>
AX: Crash viewing http://www.last.fm/
Modified: trunk/Source/WebCore/PlatformMac.cmake (181600 => 181601)
--- trunk/Source/WebCore/PlatformMac.cmake 2015-03-17 00:12:06 UTC (rev 181600)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-03-17 00:29:55 UTC (rev 181601)
@@ -2,6 +2,7 @@
"${WEBCORE_DIR}/accessibility/mac"
"${WEBCORE_DIR}/bindings/objc"
"${WEBCORE_DIR}/bridge/objc"
+ "${WEBCORE_DIR}/editing/mac"
"${WEBCORE_DIR}/loader/archive/cf"
"${WEBCORE_DIR}/loader/cf"
"${WEBCORE_DIR}/loader/mac"
@@ -144,7 +145,6 @@
platform/mac/WebCoreNSURLExtras.mm
platform/mac/WebCoreObjCExtras.mm
platform/mac/WebCoreSystemInterface.mm
- platform/mac/WebCoreView.m
platform/mac/WebNSAttributedStringExtras.mm
platform/mac/WebVideoFullscreenController.mm
platform/mac/WebVideoFullscreenHUDWindowController.mm
@@ -209,28 +209,88 @@
)
set(WebCore_FORWARDING_HEADERS_FILES
+ bindings/js/SerializedScriptValue.h
+ bindings/objc/WebKitAvailability.h
+
+ bridge/IdentifierRep.h
+ bridge/npruntime_internal.h
+
+ contentextensions/CompiledContentExtension.h
+
+ editing/FindOptions.h
+
html/HTMLMediaElement.h
- bindings/objc/WebKitAvailability.h
+
+ loader/FrameLoaderTypes.h
+ loader/LoaderStrategy.h
+ loader/ResourceLoaderOptions.h
+
+ Modules/indexeddb/IDBKeyData.h
+ Modules/indexeddb/IDBKeyPath.h
+ Modules/webdatabase/DatabaseDetails.h
+
+ page/ContextMenuContext.h
+ page/SecurityOrigin.h
+ page/SessionID.h
+ page/TextIndicator.h
+ page/UserScript.h
+ page/UserStyleSheet.h
+
+ platform/PlatformExportMacros.h
platform/DisplaySleepDisabler.h
+
+ platform/audio/AudioHardwareListener.h
+
+ platform/cocoa/MachSendRight.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/graphics/cocoa/IOSurface.h
+
+ platform/graphics/transforms/AffineTransform.h
+
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/cf/CertificateInfo.h
platform/network/cf/ResourceResponse.h
+
platform/spi/cg/CoreGraphicsSPI.h
+
+ plugins/PluginData.h
+ plugins/npruntime.h
)
WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebCore_FORWARDING_HEADERS_FILES})
-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})
+# 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})
Modified: trunk/Source/WebCore/platform/mac/PasteboardMac.mm (181600 => 181601)
--- trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2015-03-17 00:12:06 UTC (rev 181600)
+++ trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2015-03-17 00:29:55 UTC (rev 181601)
@@ -27,7 +27,6 @@
#import "Pasteboard.h"
#import "CachedImage.h"
-#import "DOMRangeInternal.h"
#import "Document.h"
#import "DocumentFragment.h"
#import "DocumentLoader.h"
Modified: trunk/Source/WebKit2/ChangeLog (181600 => 181601)
--- trunk/Source/WebKit2/ChangeLog 2015-03-17 00:12:06 UTC (rev 181600)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-17 00:29:55 UTC (rev 181601)
@@ -1,3 +1,13 @@
+2015-03-16 Alex Christensen <achristen...@webkit.org>
+
+ Progress towards CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=142747
+
+ Reviewed by Chris Dumez.
+
+ * PlatformMac.cmake:
+ Started adding Mac-specific directories and headers.
+
2015-03-16 Alexey Proskuryakov <a...@apple.com>
ASSERT(m_plugin) on plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image.html
Modified: trunk/Source/WebKit2/PlatformMac.cmake (181600 => 181601)
--- trunk/Source/WebKit2/PlatformMac.cmake 2015-03-17 00:12:06 UTC (rev 181600)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2015-03-17 00:29:55 UTC (rev 181601)
@@ -1,5 +1,21 @@
#FIXME: Add Mac-specific sources here.
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
+
+list(APPEND WebKit2_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/platform/mac"
+ "${WEBCORE_DIR}/platform/network/cf"
+ "${WEBCORE_DIR}/platform/graphics/opentype"
+ "${WEBKIT2_DIR}/UIProcess/mac"
+ "${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"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
+)
+
set(WEBKIT2_EXTRA_DEPENDENCIES
WebKit2-forwarding-headers
)
