From 1cfb85e1e0e14122b637a532e9f233e16ecd4d63 Mon Sep 17 00:00:00 2001 From: "ossy@webkit.org" Date: Thu, 5 Mar 2015 17:09:32 +0000 Subject: [PATCH] [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 --- Source/WebCore/CMakeLists.txt | 2 +- Source/WebCore/ChangeLog | 12 ++++++++++++ Source/WebCore/inspector/InspectorReplayAgent.cpp | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt index 6ab8b98..9811777 100644 --- 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 640ccd7..bc5fddf 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,15 @@ +2015-03-05 Csaba Osztrogonác + + [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 [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 2f68753..5cae601 100644 --- 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 { -- 1.8.3.1