Diff
Modified: trunk/ChangeLog (172092 => 172093)
--- trunk/ChangeLog 2014-08-05 22:27:33 UTC (rev 172092)
+++ trunk/ChangeLog 2014-08-05 22:28:19 UTC (rev 172093)
@@ -1,3 +1,13 @@
+2014-08-05 Alex Christensen <achristen...@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 <benja...@webkit.org>
Add a flag for the CSS Selectors level 4 implementation
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (172092 => 172093)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2014-08-05 22:27:33 UTC (rev 172092)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2014-08-05 22:28:19 UTC (rev 172093)
@@ -260,6 +260,7 @@
inspector/ConsoleMessage.cpp
inspector/ContentSearchUtilities.cpp
+ inspector/EventLoop.cpp
inspector/IdentifiersFactory.cpp
inspector/InjectedScript.cpp
inspector/InjectedScriptBase.cpp
@@ -269,8 +270,11 @@
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/_javascript_CallFrame.cpp
@@ -279,11 +283,16 @@
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 @@
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 @@
WEBKIT_WRAP_SOURCELIST(${_javascript_Core_SOURCES})
include_directories(${_javascript_Core_INCLUDE_DIRECTORIES})
-add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
add_library(_javascript_Core ${_javascript_Core_LIBRARY_TYPE} ${_javascript_Core_HEADERS} ${_javascript_Core_SOURCES})
target_link_libraries(_javascript_Core ${_javascript_Core_LIBRARIES})
set_target_properties(_javascript_Core PROPERTIES COMPILE_DEFINITIONS "BUILDING_JavaScriptCore")
Modified: trunk/Source/_javascript_Core/ChangeLog (172092 => 172093)
--- trunk/Source/_javascript_Core/ChangeLog 2014-08-05 22:27:33 UTC (rev 172092)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-08-05 22:28:19 UTC (rev 172093)
@@ -1,3 +1,20 @@
+2014-08-05 Alex Christensen <achristen...@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 <prando...@apple.com>
Rename MAC_LONG_PRESS feature flag to LONG_MOUSE_PRESS.
Modified: trunk/Source/_javascript_Core/PlatformEfl.cmake (172092 => 172093)
--- trunk/Source/_javascript_Core/PlatformEfl.cmake 2014-08-05 22:27:33 UTC (rev 172092)
+++ trunk/Source/_javascript_Core/PlatformEfl.cmake 2014-08-05 22:28:19 UTC (rev 172093)
@@ -3,3 +3,4 @@
${EINA_INCLUDE_DIRS}
${EO_INCLUDE_DIRS}
)
+add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
Modified: trunk/Source/_javascript_Core/PlatformGTK.cmake (172092 => 172093)
--- trunk/Source/_javascript_Core/PlatformGTK.cmake 2014-08-05 22:27:33 UTC (rev 172092)
+++ trunk/Source/_javascript_Core/PlatformGTK.cmake 2014-08-05 22:28:19 UTC (rev 172093)
@@ -29,3 +29,11 @@
install(FILES ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.typelib
DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
)
+add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
+
+list(APPEND _javascript_Core_LIBRARIES
+ ${GLIB_LIBRARIES}
+)
+list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
+ ${GLIB_INCLUDE_DIRS}
+)
Modified: trunk/Source/_javascript_Core/PlatformMac.cmake (172092 => 172093)
--- trunk/Source/_javascript_Core/PlatformMac.cmake 2014-08-05 22:27:33 UTC (rev 172092)
+++ trunk/Source/_javascript_Core/PlatformMac.cmake 2014-08-05 22:28:19 UTC (rev 172093)
@@ -17,4 +17,10 @@
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)
Modified: trunk/Source/WebCore/CMakeLists.txt (172092 => 172093)
--- trunk/Source/WebCore/CMakeLists.txt 2014-08-05 22:27:33 UTC (rev 172092)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-08-05 22:28:19 UTC (rev 172093)
@@ -559,6 +559,7 @@
loader/appcache/DOMApplicationCache.idl
+ page/AbstractView.idl
page/BarProp.idl
page/Crypto.idl
page/DOMSecurityPolicy.idl
@@ -581,6 +582,9 @@
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
Modified: trunk/Source/WebCore/ChangeLog (172092 => 172093)
--- trunk/Source/WebCore/ChangeLog 2014-08-05 22:27:33 UTC (rev 172092)
+++ trunk/Source/WebCore/ChangeLog 2014-08-05 22:28:19 UTC (rev 172093)
@@ -1,3 +1,20 @@
+2014-08-05 Alex Christensen <achristen...@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 <b...@cs.washington.edu>
Web Inspector: ReplayManager shouldn't assume replay status when the inspector is opened
Modified: trunk/Source/WebCore/PlatformMac.cmake (172092 => 172093)
--- trunk/Source/WebCore/PlatformMac.cmake 2014-08-05 22:27:33 UTC (rev 172092)
+++ trunk/Source/WebCore/PlatformMac.cmake 2014-08-05 22:28:19 UTC (rev 172093)
@@ -12,8 +12,14 @@
"${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 @@
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
Modified: trunk/Source/WebCore/css/makeSelectorPseudoClassAndCompatibilityElementMap.py (172092 => 172093)
--- trunk/Source/WebCore/css/makeSelectorPseudoClassAndCompatibilityElementMap.py 2014-08-05 22:27:33 UTC (rev 172092)
+++ trunk/Source/WebCore/css/makeSelectorPseudoClassAndCompatibilityElementMap.py 2014-08-05 22:28:19 UTC (rev 172093)
@@ -209,7 +209,7 @@
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)
Modified: trunk/Source/WebCore/css/makeSelectorPseudoElementsMap.py (172092 => 172093)
--- trunk/Source/WebCore/css/makeSelectorPseudoElementsMap.py 2014-08-05 22:27:33 UTC (rev 172092)
+++ trunk/Source/WebCore/css/makeSelectorPseudoElementsMap.py 2014-08-05 22:28:19 UTC (rev 172093)
@@ -206,7 +206,7 @@
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)
Modified: trunk/Source/WebCore/page/Chrome.h (172092 => 172093)
--- trunk/Source/WebCore/page/Chrome.h 2014-08-05 22:27:33 UTC (rev 172092)
+++ trunk/Source/WebCore/page/Chrome.h 2014-08-05 22:28:19 UTC (rev 172093)
@@ -163,7 +163,7 @@
#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>);
Modified: trunk/Source/cmake/OptionsMac.cmake (172092 => 172093)
--- trunk/Source/cmake/OptionsMac.cmake 2014-08-05 22:27:33 UTC (rev 172092)
+++ trunk/Source/cmake/OptionsMac.cmake 2014-08-05 22:28:19 UTC (rev 172093)
@@ -215,4 +215,6 @@
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)
