[cmake] Fix the web replay build

https://bugs.webkit.org/show_bug.cgi?id=142331

Reviewed by Gyuyoung Kim.

* CMakeLists.txt:
* inspector/InspectorReplayAgent.cpp:
(WebCore::buildInspectorObjectForSessionState):
(WebCore::buildInspectorObjectForSegmentState):

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

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index 6ab8b98057b61ba1fa4412f41194ca7a0a95cb46..98117777abc462ceec5c431bc18547a568845c85 100644 (file)
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -3084,7 +3084,7 @@ if (ENABLE_WEB_REPLAY)
         "${JAVASCRIPTCORE_DIR}/replay"
     )
 
-    set(WebCore_WEB_REPLAY_INPUTS ${CMAKE_CURRENT_SOURCE_DIR}/replay/WebInputs.json)
+    set(WebCore_WEB_REPLAY_INPUTS ${CMAKE_CURRENT_SOURCE_DIR}/replay/WebInputs.json ${JAVASCRIPTCORE_DIR}/replay/JSInputs.json)
     add_custom_command(
         OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebReplayInputs.h ${DERIVED_SOURCES_WEBCORE_DIR}/WebReplayInputs.cpp
         MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/replay/scripts/CodeGeneratorReplayInputs.py

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 640ccd73c1bb3bf07b36c2117d6a2c42225e7785..bc5fddfbaff74fcabd1ba9ed53eaea3eae6e9e2f 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2015-03-05  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [cmake] Fix the web replay build
+        https://bugs.webkit.org/show_bug.cgi?id=142331
+
+        Reviewed by Gyuyoung Kim.
+
+        * CMakeLists.txt:
+        * inspector/InspectorReplayAgent.cpp:
+        (WebCore::buildInspectorObjectForSessionState):
+        (WebCore::buildInspectorObjectForSegmentState):
+
 2015-03-05  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [SOUP] Check TLS errors as soon as they are set in the SoupMessage

diff --git a/Source/WebCore/inspector/InspectorReplayAgent.cpp b/Source/WebCore/inspector/InspectorReplayAgent.cpp
index 2f6875320596974818f62a65d18e9763d34467c8..5cae60157c7808894caf9b62893fbe0fae640a34 100644 (file)
--- a/Source/WebCore/inspector/InspectorReplayAgent.cpp
+++ b/Source/WebCore/inspector/InspectorReplayAgent.cpp
@@ -93,6 +93,9 @@ static Inspector::Protocol::Replay::SessionState buildInspectorObjectForSessionS
     case WebCore::SessionState::Inactive: return Inspector::Protocol::Replay::SessionState::Inactive;
     case WebCore::SessionState::Replaying: return Inspector::Protocol::Replay::SessionState::Replaying;
     }
+
+    RELEASE_ASSERT_NOT_REACHED();
+    return Inspector::Protocol::Replay::SessionState::Inactive;
 }
 
 static Inspector::Protocol::Replay::SegmentState buildInspectorObjectForSegmentState(WebCore::SegmentState segmentState)
@@ -103,6 +106,9 @@ static Inspector::Protocol::Replay::SegmentState buildInspectorObjectForSegmentS
     case WebCore::SegmentState::Loaded: return Inspector::Protocol::Replay::SegmentState::Loaded;
     case WebCore::SegmentState::Dispatching: return Inspector::Protocol::Replay::SegmentState::Dispatching;
     }
+
+    RELEASE_ASSERT_NOT_REACHED();
+    return Inspector::Protocol::Replay::SegmentState::Unloaded;
 }
 
 class SerializeInputToJSONFunctor {