Title: [169379] trunk
Revision
169379
Author
commit-qu...@webkit.org
Date
2014-05-27 04:31:17 -0700 (Tue, 27 May 2014)

Log Message

Allow building CMake based ports with WEB_REPLAY
https://bugs.webkit.org/show_bug.cgi?id=133154

Patch by Zsolt Borbely <zsborbely.u-sze...@partner.samsung.com> on 2014-05-27
Reviewed by Csaba Osztrogonác.

.:
* Source/cmake/WebKitFeatures.cmake:
* Source/cmakeconfig.h.cmake:

Source/_javascript_Core:
* CMakeLists.txt:

Source/WebCore:
* CMakeLists.txt:

Modified Paths

Diff

Modified: trunk/ChangeLog (169378 => 169379)


--- trunk/ChangeLog	2014-05-27 10:56:29 UTC (rev 169378)
+++ trunk/ChangeLog	2014-05-27 11:31:17 UTC (rev 169379)
@@ -1,3 +1,13 @@
+2014-05-27  Zsolt Borbely  <zsborbely.u-sze...@partner.samsung.com>
+
+        Allow building CMake based ports with WEB_REPLAY
+        https://bugs.webkit.org/show_bug.cgi?id=133154
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Source/cmake/WebKitFeatures.cmake:
+        * Source/cmakeconfig.h.cmake:
+
 2014-05-21  Zsolt Borbely  <zsborbely.u-sze...@partner.samsung.com>
 
         [EFL] Add include path of compact_unwind_encoding.h if FTL JIT is enabled

Modified: trunk/Source/_javascript_Core/CMakeLists.txt (169378 => 169379)


--- trunk/Source/_javascript_Core/CMakeLists.txt	2014-05-27 10:56:29 UTC (rev 169378)
+++ trunk/Source/_javascript_Core/CMakeLists.txt	2014-05-27 11:31:17 UTC (rev 169379)
@@ -21,6 +21,7 @@
     "${_javascript_CORE_DIR}/llvm"
     "${_javascript_CORE_DIR}/parser"
     "${_javascript_CORE_DIR}/profiler"
+    "${_javascript_CORE_DIR}/replay"
     "${_javascript_CORE_DIR}/runtime"
     "${_javascript_CORE_DIR}/tools"
     "${_javascript_CORE_DIR}/yarr"
@@ -809,6 +810,7 @@
     runtime/VM.h
 
     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h
+    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSReplayInputs.h
     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h
 )
 
@@ -902,7 +904,23 @@
 
 list(APPEND _javascript_Core_HEADERS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InjectedScriptSource.h)
 
+# Web Replay inputs generator
+if (ENABLE_WEB_REPLAY)
+    set(_javascript__WEB_REPLAY_INPUTS ${CMAKE_CURRENT_SOURCE_DIR}/replay/JSInputs.json)
+    add_custom_command(
+        OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSReplayInputs.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSReplayInputs.cpp
+        MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/replay/scripts/CodeGeneratorReplayInputs.py
+        DEPENDS ${_javascript__WEB_REPLAY_INPUTS}
+        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/replay/scripts/CodeGeneratorReplayInputs.py --outputDir ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/ --framework _javascript_Core ${_javascript__WEB_REPLAY_INPUTS}
+        VERBATIM)
 
+    list(APPEND _javascript_Core_SOURCES
+        replay/EncodedValue.cpp
+        ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSReplayInputs.cpp
+    )
+    list(APPEND _javascript_Core_HEADERS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSReplayInputs.h)
+endif ()
+
 if (WTF_CPU_ARM)
     list(APPEND _javascript_Core_SOURCES
         assembler/ARMAssembler.cpp

Modified: trunk/Source/_javascript_Core/ChangeLog (169378 => 169379)


--- trunk/Source/_javascript_Core/ChangeLog	2014-05-27 10:56:29 UTC (rev 169378)
+++ trunk/Source/_javascript_Core/ChangeLog	2014-05-27 11:31:17 UTC (rev 169379)
@@ -1,3 +1,12 @@
+2014-05-27  Zsolt Borbely  <zsborbely.u-sze...@partner.samsung.com>
+
+        Allow building CMake based ports with WEB_REPLAY
+        https://bugs.webkit.org/show_bug.cgi?id=133154
+
+        Reviewed by Csaba Osztrogonác.
+
+        * CMakeLists.txt:
+
 2014-05-25  Filip Pizlo  <fpi...@apple.com>
 
         Latest emscripten life benchmark is 4x slower because the DFG doesn't realize that arithmetic on booleans is a thing

Modified: trunk/Source/WebCore/CMakeLists.txt (169378 => 169379)


--- trunk/Source/WebCore/CMakeLists.txt	2014-05-27 10:56:29 UTC (rev 169378)
+++ trunk/Source/WebCore/CMakeLists.txt	2014-05-27 11:31:17 UTC (rev 169379)
@@ -3123,6 +3123,44 @@
     )
 endif ()
 
+if (ENABLE_WEB_REPLAY)
+    list(APPEND WebCore_INSPECTOR_DOMAINS
+        ${WEBCORE_DIR}/inspector/protocol/Replay.json
+    )
+    list(APPEND WebCore_INCLUDE_DIRECTORIES
+        "${_javascript_CORE_DIR}/inspector"
+        "${_javascript_CORE_DIR}/replay"
+    )
+
+    set(WebCore_WEB_REPLAY_INPUTS ${CMAKE_CURRENT_SOURCE_DIR}/replay/WebInputs.json)
+    add_custom_command(
+        OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebReplayInputs.h ${DERIVED_SOURCES_WEBCORE_DIR}/WebReplayInputs.cpp
+        MAIN_DEPENDENCY ${_javascript_CORE_DIR}/replay/scripts/CodeGeneratorReplayInputs.py
+        DEPENDS ${WebCore_WEB_REPLAY_INPUTS}
+        COMMAND ${PYTHON_EXECUTABLE} ${_javascript_CORE_DIR}/replay/scripts/CodeGeneratorReplayInputs.py --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}/ --framework WebCore ${WebCore_WEB_REPLAY_INPUTS}
+        VERBATIM)
+
+    list(APPEND WebCore_SOURCES
+        inspector/InspectorReplayAgent.cpp
+        replay/CapturingInputCursor.cpp
+        replay/EventLoopInput.cpp
+        replay/EventLoopInputDispatcher.cpp
+        replay/MemoizedDOMResult.cpp
+        replay/ReplayController.cpp
+        replay/ReplayingInputCursor.cpp
+        replay/ReplayInputCreationMethods.cpp
+        replay/ReplayInputDispatchMethods.cpp
+        replay/ReplayInputTypes.cpp
+        replay/ReplaySession.cpp
+        replay/ReplaySessionSegment.cpp
+        replay/SegmentedInputStorage.cpp
+        replay/SerializationMethods.cpp
+        replay/UserInputBridge.cpp
+
+        ${DERIVED_SOURCES_WEBCORE_DIR}/WebReplayInputs.cpp
+    )
+endif ()
+
 set(WebCoreTestSupport_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/mock"
     "${WEBCORE_DIR}/testing"

Modified: trunk/Source/WebCore/ChangeLog (169378 => 169379)


--- trunk/Source/WebCore/ChangeLog	2014-05-27 10:56:29 UTC (rev 169378)
+++ trunk/Source/WebCore/ChangeLog	2014-05-27 11:31:17 UTC (rev 169379)
@@ -1,3 +1,12 @@
+2014-05-27  Zsolt Borbely  <zsborbely.u-sze...@partner.samsung.com>
+
+        Allow building CMake based ports with WEB_REPLAY
+        https://bugs.webkit.org/show_bug.cgi?id=133154
+
+        Reviewed by Csaba Osztrogonác.
+
+        * CMakeLists.txt:
+
 2014-05-27  Adrian Perez de Castro  <ape...@igalia.com>
 
         [GStreamer] Add missing <wtf/MathExtras.h> header

Modified: trunk/Source/cmake/WebKitFeatures.cmake (169378 => 169379)


--- trunk/Source/cmake/WebKitFeatures.cmake	2014-05-27 10:56:29 UTC (rev 169378)
+++ trunk/Source/cmake/WebKitFeatures.cmake	2014-05-27 11:31:17 UTC (rev 169379)
@@ -120,6 +120,7 @@
     WEBKIT_OPTION_DEFINE(ENABLE_VIDEO_TRACK "Toggle Track support for HTML5 video" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_VIEW_MODE_CSS_MEDIA "Toggle Track support for the view-mode media Feature" ON)
     WEBKIT_OPTION_DEFINE(ENABLE_WEB_AUDIO "Toggle Web Audio support" OFF)
+    WEBKIT_OPTION_DEFINE(ENABLE_WEB_REPLAY "Toggle Web Replay support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_WEB_SOCKETS "Toggle Web Sockets support" ON)
     WEBKIT_OPTION_DEFINE(ENABLE_WEB_TIMING "Toggle Web Timing support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_WEBGL "Toggle 3D canvas (WebGL) support" OFF)

Modified: trunk/Source/cmakeconfig.h.cmake (169378 => 169379)


--- trunk/Source/cmakeconfig.h.cmake	2014-05-27 10:56:29 UTC (rev 169378)
+++ trunk/Source/cmakeconfig.h.cmake	2014-05-27 11:31:17 UTC (rev 169379)
@@ -117,6 +117,7 @@
 #cmakedefine01 ENABLE_VIEW_MODE_CSS_MEDIA
 #cmakedefine01 ENABLE_WEBGL
 #cmakedefine01 ENABLE_WEB_AUDIO
+#cmakedefine01 ENABLE_WEB_REPLAY
 #cmakedefine01 ENABLE_WEB_SOCKETS
 #cmakedefine01 ENABLE_WEB_TIMING
 #cmakedefine01 ENABLE_XHR_TIMEOUT
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to