Diff
Modified: trunk/ChangeLog (131192 => 131193)
--- trunk/ChangeLog 2012-10-12 16:49:32 UTC (rev 131192)
+++ trunk/ChangeLog 2012-10-12 16:57:26 UTC (rev 131193)
@@ -1,3 +1,15 @@
+2012-10-12 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
[EFL] Share resources installed for inspector
Modified: trunk/Source/PlatformEfl.cmake (131192 => 131193)
--- trunk/Source/PlatformEfl.cmake 2012-10-12 16:49:32 UTC (rev 131192)
+++ trunk/Source/PlatformEfl.cmake 2012-10-12 16:57:26 UTC (rev 131193)
@@ -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 ()
Modified: trunk/Source/WebKit/ChangeLog (131192 => 131193)
--- trunk/Source/WebKit/ChangeLog 2012-10-12 16:49:32 UTC (rev 131192)
+++ trunk/Source/WebKit/ChangeLog 2012-10-12 16:57:26 UTC (rev 131193)
@@ -1,3 +1,14 @@
+2012-10-12 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
[EFL] Share resources installed for inspector
Modified: trunk/Source/WebKit/PlatformEfl.cmake (131192 => 131193)
--- trunk/Source/WebKit/PlatformEfl.cmake 2012-10-12 16:49:32 UTC (rev 131192)
+++ trunk/Source/WebKit/PlatformEfl.cmake 2012-10-12 16:57:26 UTC (rev 131193)
@@ -255,3 +255,22 @@
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 ()
Modified: trunk/Source/WebKit2/ChangeLog (131192 => 131193)
--- trunk/Source/WebKit2/ChangeLog 2012-10-12 16:49:32 UTC (rev 131192)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-12 16:57:26 UTC (rev 131193)
@@ -1,3 +1,17 @@
+2012-10-12 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
[EFL] Share resources installed for inspector
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (131192 => 131193)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2012-10-12 16:49:32 UTC (rev 131192)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2012-10-12 16:57:26 UTC (rev 131193)
@@ -346,3 +346,24 @@
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 ()
Modified: trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp (131192 => 131193)
--- trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp 2012-10-12 16:49:32 UTC (rev 131192)
+++ trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp 2012-10-12 16:57:26 UTC (rev 131193)
@@ -35,7 +35,6 @@
#include <WebCore/NotImplemented.h>
#include <unistd.h>
#include <wtf/text/CString.h>
-#include <wtf/text/StringBuilder.h>
#include <wtf/text/WTFString.h>
namespace WebKit {
@@ -140,18 +139,14 @@
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;
}
Modified: trunk/Source/cmake/OptionsEfl.cmake (131192 => 131193)
--- trunk/Source/cmake/OptionsEfl.cmake 2012-10-12 16:49:32 UTC (rev 131192)
+++ trunk/Source/cmake/OptionsEfl.cmake 2012-10-12 16:57:26 UTC (rev 131193)
@@ -157,12 +157,6 @@
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)
