More work on CMake.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 5 Aug 2014 22:28:19 +0000 (22:28 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 5 Aug 2014 22:28:19 +0000 (22:28 +0000)
https://bugs.webkit.org/show_bug.cgi?id=135620

.:
Reviewed by Laszlo Gombos.

* Source/cmake/OptionsMac.cmake:
Use UDIS86 by default on Mac.

Source/JavaScriptCore:
Reviewed by Laszlo Gombos.

* CMakeLists.txt:
Added missing source files.
* PlatformEfl.cmake:
* PlatformGTK.cmake:
Include glib directories and libraries to find glib.h in EventLoop.cpp.
* PlatformMac.cmake:
Moved STATICALLY_LINKED_WITH_WTF definition away from the common CMakeLists
because it should not be defined on Windows.
Added remote inspector source files.

Source/WebCore:
Reviewed by Reviewed by Laszlo Gombos.

* CMakeLists.txt:
Added missing idls.
* PlatformMac.cmake:
Added additional include directories and source files.
* css/makeSelectorPseudoClassAndCompatibilityElementMap.py:
* css/makeSelectorPseudoElementsMap.py:
The Windows distribution of gperf doesn't like single quotes for its key-positions parameters.
* page/Chrome.h:
Compile fix.

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

13 files changed:
ChangeLog
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/PlatformEfl.cmake
Source/JavaScriptCore/PlatformGTK.cmake
Source/JavaScriptCore/PlatformMac.cmake
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PlatformMac.cmake
Source/WebCore/css/makeSelectorPseudoClassAndCompatibilityElementMap.py
Source/WebCore/css/makeSelectorPseudoElementsMap.py
Source/WebCore/page/Chrome.h
Source/cmake/OptionsMac.cmake

index fda343c..76a867d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-08-05  Alex Christensen  <achristensen@webkit.org>
+
+        More work on CMake.
+        https://bugs.webkit.org/show_bug.cgi?id=135620
+
+        Reviewed by Laszlo Gombos.
+
+        * Source/cmake/OptionsMac.cmake:
+        Use UDIS86 by default on Mac.
+
 2014-08-04  Benjamin Poulain  <benjamin@webkit.org>
 
         Add a flag for the CSS Selectors level 4 implementation
index ea53dd0..13b59e9 100644 (file)
@@ -260,6 +260,7 @@ set(JavaScriptCore_SOURCES
 
     inspector/ConsoleMessage.cpp
     inspector/ContentSearchUtilities.cpp
+    inspector/EventLoop.cpp
     inspector/IdentifiersFactory.cpp
     inspector/InjectedScript.cpp
     inspector/InjectedScriptBase.cpp
@@ -269,8 +270,11 @@ set(JavaScriptCore_SOURCES
     inspector/InspectorAgentRegistry.cpp
     inspector/InspectorBackendDispatcher.cpp
     inspector/InspectorValues.cpp
+    inspector/JSConsoleClient.cpp
     inspector/JSInjectedScriptHost.cpp
     inspector/JSInjectedScriptHostPrototype.cpp
+    inspector/JSGlobalObjectInspectorController.cpp
+    inspector/JSGlobalObjectScriptDebugServer.cpp
     inspector/JSJavaScriptCallFrame.cpp
     inspector/JSJavaScriptCallFramePrototype.cpp
     inspector/JavaScriptCallFrame.cpp
@@ -279,11 +283,16 @@ set(JavaScriptCore_SOURCES
     inspector/ScriptCallStack.cpp
     inspector/ScriptCallStackFactory.cpp
     inspector/ScriptDebugServer.cpp
+
     inspector/agents/InspectorAgent.cpp
     inspector/agents/InspectorConsoleAgent.cpp
     inspector/agents/InspectorDebuggerAgent.cpp
     inspector/agents/InspectorProfilerAgent.cpp
     inspector/agents/InspectorRuntimeAgent.cpp
+    inspector/agents/JSGlobalObjectConsoleAgent.cpp
+    inspector/agents/JSGlobalObjectDebuggerAgent.cpp
+    inspector/agents/JSGlobalObjectProfilerAgent.cpp
+    inspector/agents/JSGlobalObjectRuntimeAgent.cpp
 
     interpreter/AbstractPC.cpp
     interpreter/CallFrame.cpp
@@ -415,6 +424,7 @@ set(JavaScriptCore_SOURCES
     runtime/JSArrayBufferView.cpp
     runtime/JSArrayIterator.cpp
     runtime/JSBoundFunction.cpp
+    runtime/JSGlobalObjectDebuggable.cpp
     runtime/JSCJSValue.cpp
     runtime/JSCell.cpp
     runtime/JSConsole.cpp
@@ -1019,7 +1029,6 @@ add_subdirectory(shell)
 
 WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
 include_directories(${JavaScriptCore_INCLUDE_DIRECTORIES})
-add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
 add_library(JavaScriptCore ${JavaScriptCore_LIBRARY_TYPE} ${JavaScriptCore_HEADERS} ${JavaScriptCore_SOURCES})
 target_link_libraries(JavaScriptCore ${JavaScriptCore_LIBRARIES})
 set_target_properties(JavaScriptCore PROPERTIES COMPILE_DEFINITIONS "BUILDING_JavaScriptCore")
index 8714695..bef6c73 100644 (file)
@@ -1,3 +1,20 @@
+2014-08-05  Alex Christensen  <achristensen@webkit.org>
+
+        More work on CMake.
+        https://bugs.webkit.org/show_bug.cgi?id=135620
+
+        Reviewed by Laszlo Gombos.
+
+        * CMakeLists.txt:
+        Added missing source files.
+        * PlatformEfl.cmake:
+        * PlatformGTK.cmake:
+        Include glib directories and libraries to find glib.h in EventLoop.cpp.
+        * PlatformMac.cmake:
+        Moved STATICALLY_LINKED_WITH_WTF definition away from the common CMakeLists
+        because it should not be defined on Windows.
+        Added remote inspector source files.
+
 2014-08-05  Peyton Randolph  <prandolph@apple.com>
 
         Rename MAC_LONG_PRESS feature flag to LONG_MOUSE_PRESS.
index 978c37f..44f27ca 100644 (file)
@@ -3,3 +3,4 @@ list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
     ${EINA_INCLUDE_DIRS}
     ${EO_INCLUDE_DIRS}
 )
+add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
index be016ec..1aa0ae9 100644 (file)
@@ -29,3 +29,11 @@ install(FILES ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
 install(FILES ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.typelib
         DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
 )
+add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
+
+list(APPEND JavaScriptCore_LIBRARIES
+    ${GLIB_LIBRARIES}
+)
+list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
+    ${GLIB_INCLUDE_DIRS}
+)
index 485471c..d511be1 100644 (file)
@@ -17,4 +17,10 @@ list(APPEND JavaScriptCore_SOURCES
     API/JSVirtualMachine.mm
     API/JSWrapperMap.mm
     API/ObjCCallbackFunction.mm
+
+    inspector/remote/RemoteInspector.mm
+    inspector/remote/RemoteInspectorDebuggable.cpp
+    inspector/remote/RemoteInspectorDebuggableConnection.mm
+    inspector/remote/RemoteInspectorXPCConnection.mm
 )
+add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
index b5384d1..fe8ae0c 100644 (file)
@@ -559,6 +559,7 @@ set(WebCore_IDL_FILES
 
     loader/appcache/DOMApplicationCache.idl
 
+    page/AbstractView.idl
     page/BarProp.idl
     page/Crypto.idl
     page/DOMSecurityPolicy.idl
@@ -581,6 +582,9 @@ set(WebCore_IDL_FILES
     page/SpeechInputResult.idl
     page/SpeechInputResultList.idl
     page/WebKitPoint.idl
+    page/WebKitNamespace.idl
+    page/UserMessageHandlersNamespace.idl
+    page/UserMessageHandler.idl
     page/WindowBase64.idl
     page/WindowTimers.idl
     page/WorkerNavigator.idl
index 9553127..eeb2ef9 100644 (file)
@@ -1,3 +1,20 @@
+2014-08-05  Alex Christensen  <achristensen@webkit.org>
+
+        More work on CMake.
+        https://bugs.webkit.org/show_bug.cgi?id=135620
+
+        Reviewed by Reviewed by Laszlo Gombos.
+
+        * CMakeLists.txt:
+        Added missing idls.
+        * PlatformMac.cmake:
+        Added additional include directories and source files.
+        * css/makeSelectorPseudoClassAndCompatibilityElementMap.py:
+        * css/makeSelectorPseudoElementsMap.py:
+        The Windows distribution of gperf doesn't like single quotes for its key-positions parameters.
+        * page/Chrome.h:
+        Compile fix.
+
 2014-08-05  Brian J. Burg  <burg@cs.washington.edu>
 
         Web Inspector: ReplayManager shouldn't assume replay status when the inspector is opened
index 94b0cc4..4804e49 100644 (file)
@@ -12,8 +12,14 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/graphics/cg"
     "${WEBCORE_DIR}/platform/graphics/opentype"
     "${WEBCORE_DIR}/platform/graphics/mac"
+    "${WEBCORE_DIR}/platform/network/cocoa"
+    "${WEBCORE_DIR}/platform/network/cf"
+    "${WEBCORE_DIR}/platform/network/mac"
     "${WEBCORE_DIR}/platform/mac"
     "${WEBCORE_DIR}/plugins/mac"
+
+    "/usr/include/libxslt"
+    "/usr/include/libxml2"
 )
 
 list(APPEND WebCore_SOURCES
@@ -152,6 +158,26 @@ list(APPEND WebCore_SOURCES
     platform/network/cocoa/ProtectionSpaceCocoa.mm
     platform/network/cocoa/ResourceRequestCocoa.mm
 
+    platform/network/cf/AuthenticationCF.cpp
+    platform/network/cf/CookieJarCFNet.cpp
+    platform/network/cf/CookieStorageCFNet.cpp
+    platform/network/cf/CredentialStorageCFNet.cpp
+    platform/network/cf/DNSCFNet.cpp
+    platform/network/cf/FormDataStreamCFNet.cpp
+    platform/network/cf/LoaderRunLoopCF.cpp
+    platform/network/cf/NetworkStorageSessionCFNet.cpp
+    platform/network/cf/ProtectionSpaceCFNet.cpp
+    platform/network/cf/ProxyServerCFNet.cpp
+    platform/network/cf/ResourceErrorCF.cpp
+    platform/network/cf/ResourceHandleCFNet.cpp
+    platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp
+    platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp
+    platform/network/cf/ResourceRequestCFNet.cpp
+    platform/network/cf/ResourceResponseCFNet.cpp
+    platform/network/cf/SocketStreamHandleCFNet.cpp
+    platform/network/cf/SynchronousLoaderClientCFNet.cpp
+    platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp
+
     platform/network/mac/AuthenticationMac.mm
     platform/network/mac/BlobDataFileReferenceMac.mm
     platform/network/mac/CertificateInfoMac.mm
index 081e8a8..a56f8a2 100644 (file)
@@ -209,7 +209,7 @@ gperf_command = 'gperf'
 if 'GPERF' in os.environ:
     gperf_command = os.environ['GPERF']
 
-gperf_return = os.system("%s --key-positions='*' -m 10 -s 2 SelectorPseudoClassAndCompatibilityElementMap.gperf --output-file=SelectorPseudoClassAndCompatibilityElementMap.cpp" % gperf_command)
+gperf_return = os.system("%s --key-positions=\"*\" -m 10 -s 2 SelectorPseudoClassAndCompatibilityElementMap.gperf --output-file=SelectorPseudoClassAndCompatibilityElementMap.cpp" % gperf_command)
 if gperf_return != 0:
     print("Error when generating SelectorPseudoClassAndCompatibilityElementMap.cpp from SelectorPseudoClassAndCompatibilityElementMap.gperf :(")
     sys.exit(gperf_return)
index ff814b0..825d3af 100644 (file)
@@ -206,7 +206,7 @@ gperf_command = 'gperf'
 if 'GPERF' in os.environ:
     gperf_command = os.environ['GPERF']
 
-gperf_return = os.system("%s --key-positions='*' -m 10 -s 2 SelectorPseudoElementTypeMap.gperf --output-file=SelectorPseudoElementTypeMap.cpp" % gperf_command)
+gperf_return = os.system("%s --key-positions=\"*\" -m 10 -s 2 SelectorPseudoElementTypeMap.gperf --output-file=SelectorPseudoElementTypeMap.cpp" % gperf_command)
 if gperf_return != 0:
     print("Error when generating SelectorPseudoElementTypeMap.cpp from SelectorPseudoElementTypeMap.gperf :(")
     sys.exit(gperf_return)
index c24583b..c2e8ef2 100644 (file)
@@ -163,7 +163,7 @@ public:
 #endif
 
 #if ENABLE(DATE_AND_TIME_INPUT_TYPES) && !PLATFORM(IOS)
-    PassRefPtr<DateTimeChooser> openDateTimeChooser(DateTimeChooserClient*, const DateTimeChooserParameters&)
+    PassRefPtr<DateTimeChooser> openDateTimeChooser(DateTimeChooserClient*, const DateTimeChooserParameters&);
 #endif
 
     void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
index 5d704a1..657f811 100644 (file)
@@ -215,4 +215,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_iphonesimulator OFF)
 
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT_C_LOOP OFF)
 
-WEBKIT_OPTION_END()
\ No newline at end of file
+WEBKIT_OPTION_END()
+
+set(WTF_USE_UDIS86 1)