From c0d2f8ccc203db2dfe2b73d28bb9113cd1b48c37 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Fri, 12 Oct 2012 16:57:26 +0000 Subject: [PATCH] Unreviewed, rolling out r131189. http://trac.webkit.org/changeset/131189 https://bugs.webkit.org/show_bug.cgi?id=99187 Made inspector http tests crash on WK2. (Requested by rakuco on #webkit). Patch by Sheriff Bot on 2012-10-12 .: * Source/PlatformEfl.cmake: * Source/cmake/OptionsEfl.cmake: Source/WebKit: * PlatformEfl.cmake: Source/WebKit2: * PlatformEfl.cmake: * UIProcess/efl/WebInspectorProxyEfl.cpp: (WebKit::WebInspectorProxy::inspectorPageURL): (WebKit::WebInspectorProxy::inspectorBaseURL): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@131193 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 12 ++++++++++++ Source/PlatformEfl.cmake | 18 ------------------ Source/WebKit/ChangeLog | 11 +++++++++++ Source/WebKit/PlatformEfl.cmake | 19 +++++++++++++++++++ Source/WebKit2/ChangeLog | 14 ++++++++++++++ Source/WebKit2/PlatformEfl.cmake | 21 +++++++++++++++++++++ .../WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp | 11 +++-------- Source/cmake/OptionsEfl.cmake | 6 ------ 8 files changed, 80 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb9be49..fe059be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2012-10-12 Sheriff Bot + + Unreviewed, rolling out r131189. + http://trac.webkit.org/changeset/131189 + https://bugs.webkit.org/show_bug.cgi?id=99187 + + Made inspector http tests crash on WK2. (Requested by rakuco + on #webkit). + + * Source/PlatformEfl.cmake: + * Source/cmake/OptionsEfl.cmake: + 2012-10-12 Ryuan Choi [EFL] Share resources installed for inspector diff --git a/Source/PlatformEfl.cmake b/Source/PlatformEfl.cmake index df128fd..5406615 100644 --- a/Source/PlatformEfl.cmake +++ b/Source/PlatformEfl.cmake @@ -1,19 +1 @@ ADD_SUBDIRECTORY(${WEBKIT_DIR}/efl/DefaultTheme) - -IF (ENABLE_INSPECTOR) - ADD_CUSTOM_TARGET( - web-inspector-resources ALL - COMMAND ${CMAKE_COMMAND} -E copy_directory ${WEBCORE_DIR}/inspector/front-end ${WEB_INSPECTOR_DIR} - COMMAND ${CMAKE_COMMAND} -E copy ${WEBCORE_DIR}/English.lproj/localizedStrings.js ${WEB_INSPECTOR_DIR} - COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendCommands.js ${WEB_INSPECTOR_DIR}/InspectorBackendCommands.js - DEPENDS ${WebCore_LIBRARY_NAME} - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - ) - INSTALL(DIRECTORY "${CMAKE_BINARY_DIR}/${WEB_INSPECTOR_DIR}" - DESTINATION ${DATA_INSTALL_DIR} - FILES_MATCHING PATTERN "*.js" - PATTERN "*.html" - PATTERN "*.css" - PATTERN "*.gif" - PATTERN "*.png") -ENDIF () diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog index 237010f..c29f8b9 100644 --- a/Source/WebKit/ChangeLog +++ b/Source/WebKit/ChangeLog @@ -1,3 +1,14 @@ +2012-10-12 Sheriff Bot + + Unreviewed, rolling out r131189. + http://trac.webkit.org/changeset/131189 + https://bugs.webkit.org/show_bug.cgi?id=99187 + + Made inspector http tests crash on WK2. (Requested by rakuco + on #webkit). + + * PlatformEfl.cmake: + 2012-10-12 Ryuan Choi [EFL] Share resources installed for inspector diff --git a/Source/WebKit/PlatformEfl.cmake b/Source/WebKit/PlatformEfl.cmake index 596c911..f9b8856 100644 --- a/Source/WebKit/PlatformEfl.cmake +++ b/Source/WebKit/PlatformEfl.cmake @@ -255,3 +255,22 @@ IF (ENABLE_API_TESTS) ENDFOREACH () ENDIF () +IF (ENABLE_INSPECTOR) + SET(WEB_INSPECTOR_DIR ${CMAKE_BINARY_DIR}/WebKit/efl/webinspector) + ADD_DEFINITIONS(-DWEB_INSPECTOR_DIR="${WEB_INSPECTOR_DIR}") + ADD_DEFINITIONS(-DWEB_INSPECTOR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/webinspector") + ADD_CUSTOM_TARGET( + web-inspector-resources ALL + COMMAND ${CMAKE_COMMAND} -E copy_directory ${WEBCORE_DIR}/inspector/front-end ${WEB_INSPECTOR_DIR} + COMMAND ${CMAKE_COMMAND} -E copy ${WEBCORE_DIR}/English.lproj/localizedStrings.js ${WEB_INSPECTOR_DIR} + COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendCommands.js ${WEB_INSPECTOR_DIR}/InspectorBackendCommands.js + DEPENDS ${WebCore_LIBRARY_NAME} + ) + INSTALL(DIRECTORY ${WEB_INSPECTOR_DIR} + DESTINATION ${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR} + FILES_MATCHING PATTERN "*.js" + PATTERN "*.html" + PATTERN "*.css" + PATTERN "*.gif" + PATTERN "*.png") +ENDIF () diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index fc39ab8..b9bf11f 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,17 @@ +2012-10-12 Sheriff Bot + + Unreviewed, rolling out r131189. + http://trac.webkit.org/changeset/131189 + https://bugs.webkit.org/show_bug.cgi?id=99187 + + Made inspector http tests crash on WK2. (Requested by rakuco + on #webkit). + + * PlatformEfl.cmake: + * UIProcess/efl/WebInspectorProxyEfl.cpp: + (WebKit::WebInspectorProxy::inspectorPageURL): + (WebKit::WebInspectorProxy::inspectorBaseURL): + 2012-10-12 Ryuan Choi [EFL] Share resources installed for inspector diff --git a/Source/WebKit2/PlatformEfl.cmake b/Source/WebKit2/PlatformEfl.cmake index c0d99a0..a12f44a 100644 --- a/Source/WebKit2/PlatformEfl.cmake +++ b/Source/WebKit2/PlatformEfl.cmake @@ -346,3 +346,24 @@ IF (ENABLE_API_TESTS) ADD_LIBRARY(ewk2UnitTestInjectedBundleSample SHARED ${TEST_INJECTED_BUNDLE_DIR}/injected_bundle_sample.cpp) TARGET_LINK_LIBRARIES(ewk2UnitTestInjectedBundleSample ${WebKit2_LIBRARY_NAME}) ENDIF () + +IF (ENABLE_INSPECTOR) + SET(WK2_WEB_INSPECTOR_DIR ${CMAKE_BINARY_DIR}/WebKit2/efl/webinspector) + SET(WK2_WEB_INSPECTOR_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${WebKit2_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR}) + ADD_DEFINITIONS(-DWK2_WEB_INSPECTOR_DIR="${WK2_WEB_INSPECTOR_DIR}") + ADD_DEFINITIONS(-DWK2_WEB_INSPECTOR_INSTALL_DIR="${WK2_WEB_INSPECTOR_INSTALL_DIR}/webinspector") + ADD_CUSTOM_TARGET( + wk2-web-inspector-resources ALL + COMMAND ${CMAKE_COMMAND} -E copy_directory ${WEBCORE_DIR}/inspector/front-end ${WK2_WEB_INSPECTOR_DIR} + COMMAND ${CMAKE_COMMAND} -E copy ${WEBCORE_DIR}/English.lproj/localizedStrings.js ${WK2_WEB_INSPECTOR_DIR} + COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendCommands.js ${WK2_WEB_INSPECTOR_DIR}/InspectorBackendCommands.js + DEPENDS ${WebCore_LIBRARY_NAME} + ) + INSTALL(DIRECTORY ${WK2_WEB_INSPECTOR_DIR} + DESTINATION ${WK2_WEB_INSPECTOR_INSTALL_DIR} + FILES_MATCHING PATTERN "*.js" + PATTERN "*.html" + PATTERN "*.css" + PATTERN "*.gif" + PATTERN "*.png") +ENDIF () diff --git a/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp b/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp index e0df019..7f69c2e 100644 --- a/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp +++ b/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp @@ -35,7 +35,6 @@ #include #include #include -#include #include namespace WebKit { @@ -140,18 +139,14 @@ void WebInspectorProxy::platformInspectedURLChanged(const String&) String WebInspectorProxy::inspectorPageURL() const { - StringBuilder builder; - builder.append(inspectorPageURL()); - builder.appendLiteral("/inspector.html"); - - return builder.toString(); + return makeString(inspectorBaseURL(), "/inspector.html"); } String WebInspectorProxy::inspectorBaseURL() const { - String inspectorFilesPath = ASCIILiteral("file://" WEB_INSPECTOR_INSTALL_DIR); + String inspectorFilesPath = makeString("file://", WK2_WEB_INSPECTOR_INSTALL_DIR); if (access(inspectorFilesPath.utf8().data(), R_OK)) - inspectorFilesPath = ASCIILiteral("file://" WEB_INSPECTOR_DIR); + inspectorFilesPath = makeString("file://", WK2_WEB_INSPECTOR_DIR); return inspectorFilesPath; } diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake index e929d23..b2771e9 100644 --- a/Source/cmake/OptionsEfl.cmake +++ b/Source/cmake/OptionsEfl.cmake @@ -157,12 +157,6 @@ IF (ENABLE_WEBGL) FIND_PACKAGE(OpenGL REQUIRED) ENDIF () -IF (ENABLE_INSPECTOR) - SET(WEB_INSPECTOR_DIR "${DATA_INSTALL_DIR}/inspector") - ADD_DEFINITIONS(-DWEB_INSPECTOR_DIR=\"${CMAKE_BINARY_DIR}/${WEB_INSPECTOR_DIR}\") - ADD_DEFINITIONS(-DWEB_INSPECTOR_INSTALL_DIR=\"${CMAKE_INSTALL_PREFIX}/${WEB_INSPECTOR_DIR}\") -ENDIF () - SET(CPACK_SOURCE_GENERATOR TBZ2) IF (WTF_USE_TILED_BACKING_STORE) -- 1.8.3.1