Changeset 181081 in webkit

Timestamp:

Mar 5, 2015 9:09:32 AM (9 years ago)

Author:

Csaba Osztrogonác

Message:

[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):

Location:

trunk/Source/WebCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• inspector/InspectorReplayAgent.cpp (modified) (2 diffs)

trunk/Source/WebCore/CMakeLists.txt

@@ -3085 +3085 @@
     )
 
-    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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp

@@ -94 +94 @@
     case WebCore::SessionState::Replaying: return Inspector::Protocol::Replay::SessionState::Replaying;
     }
+
+    RELEASE_ASSERT_NOT_REACHED();
+    return Inspector::Protocol::Replay::SessionState::Inactive;
 }
 
@@ -104 +107 @@
     case WebCore::SegmentState::Dispatching: return Inspector::Protocol::Replay::SegmentState::Dispatching;
     }
+
+    RELEASE_ASSERT_NOT_REACHED();
+    return Inspector::Protocol::Replay::SegmentState::Unloaded;
 }