[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mrobinson at webkit.org
mrobinson at webkit.org
Wed Dec 22 12:22:48 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e159a3a9495e05f69946faa11f1a3dbe520d0b03
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Aug 20 16:32:24 2010 +0000
2010-08-20 Martin Robinson <mrobinson at igalia.com>
Reviewed by Pavel Feldman.
Web Inspector: Inspector tests were disabled for GTK.
https://bugs.webkit.org/show_bug.cgi?id=43977
* platform/gtk/Skipped: Unskip tests which should now be passing.
2010-08-20 Martin Robinson <mrobinson at igalia.com>
Reviewed by Pavel Feldman.
Web Inspector: Inspector tests were disabled for GTK.
https://bugs.webkit.org/show_bug.cgi?id=43977
Allow setting the inspector resources path via an environment variables
and add a method, inspectorFilesPath, to the WebKit InspectorClient that
encapsulates this logic.
* WebCoreSupport/InspectorClientGtk.cpp:
(WebKit::InspectorClient::openInspectorFrontend): Use the new inspectorFilesPath method to
get the path to the resource.
(WebKit::InspectorClient::inspectorFilesPath): Added.
(WebKit::InspectorFrontendClient::localizedStringsURL): Use inspectorFilesPath method.
* WebCoreSupport/InspectorClientGtk.h: Add method and member variables for caching the result.
2010-08-20 Martin Robinson <mrobinson at igalia.com>
Reviewed by Pavel Feldman.
Web Inspector: Inspector tests were disabled for GTK.
https://bugs.webkit.org/show_bug.cgi?id=43977
* Scripts/old-run-webkit-tests: Set the WEBKIT_INSPECTOR_PATH to the appropriate
path before running tests.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65737 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 65a21a8..b71b6b1 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-20 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: Inspector tests were disabled for GTK.
+ https://bugs.webkit.org/show_bug.cgi?id=43977
+
+ * platform/gtk/Skipped: Unskip tests which should now be passing.
+
2010-08-20 Nikolas Zimmermann <nzimmermann at rim.com>
Reviewed by Dirk Schulze.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 9d8c9f6..37e2b7f 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5915,12 +5915,6 @@ fast/js/sputnik/Unicode/Unicode_510/S7.6_A5.3_T2.html
# https://bugs.webkit.org/show_bug.cgi?id=44199
perf/
-# Inspector's tests were disabled.
-# https://bugs.webkit.org/show_bug.cgi?id=43977
-inspector/
-http/tests/inspector/
-http/tests/inspector-enabled/
-
# [GTK] r65681 broke a couple GTK+ a11y tests
# https://bugs.webkit.org/show_bug.cgi?id=44316
platform/gtk/accessibility/object-attributes.html
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 46c69e9..209fe58 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,21 @@
+2010-08-20 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: Inspector tests were disabled for GTK.
+ https://bugs.webkit.org/show_bug.cgi?id=43977
+
+ Allow setting the inspector resources path via an environment variables
+ and add a method, inspectorFilesPath, to the WebKit InspectorClient that
+ encapsulates this logic.
+
+ * WebCoreSupport/InspectorClientGtk.cpp:
+ (WebKit::InspectorClient::openInspectorFrontend): Use the new inspectorFilesPath method to
+ get the path to the resource.
+ (WebKit::InspectorClient::inspectorFilesPath): Added.
+ (WebKit::InspectorFrontendClient::localizedStringsURL): Use inspectorFilesPath method.
+ * WebCoreSupport/InspectorClientGtk.h: Add method and member variables for caching the result.
+
2010-08-19 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
index b0dd40e..a2b167f 100644
--- a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
@@ -79,18 +79,8 @@ void InspectorClient::openInspectorFrontend(InspectorController* controller)
webkit_web_inspector_set_web_view(webInspector, inspectorWebView);
- GOwnPtr<gchar> inspectorURI;
-
- // Make the Web Inspector work when running tests
- // FixMe: it is not working. It should be not the subdirectory of the current directory, but a subdirectory of $(WEBKITOUTPUTDIR).
- if (g_file_test("resources/inspector/inspector.html", G_FILE_TEST_EXISTS)) {
- GOwnPtr<gchar> currentDirectory(g_get_current_dir());
- GOwnPtr<gchar> fullPath(g_strdup_printf("%s/resources/inspector/inspector.html", currentDirectory.get()));
- inspectorURI.set(g_filename_to_uri(fullPath.get(), NULL, NULL));
- } else {
- inspectorURI.set(g_filename_to_uri(DATA_DIR"/webkitgtk-"WEBKITGTK_API_VERSION_STRING"/webinspector/inspector.html", NULL, NULL));
- }
-
+ GOwnPtr<gchar> inspectorPath(g_build_filename(inspectorFilesPath(), "inspector.html", NULL));
+ GOwnPtr<gchar> inspectorURI(g_filename_to_uri(inspectorPath.get(), 0, 0));
webkit_web_view_load_uri(inspectorWebView, inspectorURI.get());
gtk_widget_show(GTK_WIDGET(inspectorWebView));
@@ -250,7 +240,19 @@ bool InspectorClient::sendMessageToFrontend(const String& message)
return true;
}
-bool destroyed = TRUE;
+const char* InspectorClient::inspectorFilesPath()
+{
+ if (m_inspectorFilesPath)
+ m_inspectorFilesPath.get();
+
+ const char* environmentPath = getenv("WEBKIT_INSPECTOR_PATH");
+ if (environmentPath && g_file_test(environmentPath, G_FILE_TEST_IS_DIR))
+ m_inspectorFilesPath.set(g_strdup(environmentPath));
+ else
+ m_inspectorFilesPath.set(g_build_filename(DATA_DIR, "webkitgtk-"WEBKITGTK_API_VERSION_STRING, "webinspector", NULL));
+
+ return m_inspectorFilesPath.get();
+}
InspectorFrontendClient::InspectorFrontendClient(WebKitWebView* inspectedWebView, WebKitWebView* inspectorWebView, WebKitWebInspector* webInspector, Page* inspectorPage, InspectorClient* inspectorClient)
: InspectorFrontendClientLocal(core(inspectedWebView)->inspectorController(), inspectorPage)
@@ -300,20 +302,11 @@ void InspectorFrontendClient::destroyInspectorWindow()
String InspectorFrontendClient::localizedStringsURL()
{
- GOwnPtr<gchar> URL;
-
- // Make the Web Inspector work when running tests
- if (g_file_test("WebCore/English.lproj/localizedStrings.js", G_FILE_TEST_EXISTS)) {
- GOwnPtr<gchar> currentDirectory(g_get_current_dir());
- GOwnPtr<gchar> fullPath(g_strdup_printf("%s/WebCore/English.lproj/localizedStrings.js", currentDirectory.get()));
- URL.set(g_filename_to_uri(fullPath.get(), NULL, NULL));
- } else {
- GOwnPtr<gchar> localizedStringsPath(g_strdup_printf(DATA_DIR"/webkitgtk-%.1f/webinspector/localizedStrings.js", WEBKITGTK_API_VERSION));
- URL.set(g_filename_to_uri(localizedStringsPath.get(), NULL, NULL));
- }
+ GOwnPtr<gchar> stringsPath(g_build_filename(m_inspectorClient->inspectorFilesPath(), "localizedStrings.js", NULL));
+ GOwnPtr<gchar> stringsURI(g_filename_to_uri(stringsPath.get(), 0, 0));
// FIXME: support l10n of localizedStrings.js
- return String::fromUTF8(URL.get());
+ return String::fromUTF8(stringsURI.get());
}
String InspectorFrontendClient::hiddenPanels()
diff --git a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h
index b72bc82..8b68405 100644
--- a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h
+++ b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h
@@ -29,6 +29,7 @@
#ifndef InspectorClientGtk_h
#define InspectorClientGtk_h
+#include "GOwnPtr.h"
#include "InspectorClient.h"
#include "InspectorFrontendClientLocal.h"
#include "webkitwebview.h"
@@ -64,11 +65,13 @@ namespace WebKit {
virtual bool sendMessageToFrontend(const WTF::String&);
void releaseFrontendPage();
+ const char* inspectorFilesPath();
private:
WebKitWebView* m_inspectedWebView;
WebCore::Page* m_frontendPage;
InspectorFrontendClient* m_frontendClient;
+ GOwnPtr<gchar> m_inspectorFilesPath;
};
class InspectorFrontendClient : public WebCore::InspectorFrontendClientLocal {
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4ce76cd..0b2d324 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-20 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: Inspector tests were disabled for GTK.
+ https://bugs.webkit.org/show_bug.cgi?id=43977
+
+ * Scripts/old-run-webkit-tests: Set the WEBKIT_INSPECTOR_PATH to the appropriate
+ path before running tests.
+
2010-08-20 Daniel Bates <dbates at rim.com>
Reviewed by Eric Seidel.
diff --git a/WebKitTools/Scripts/old-run-webkit-tests b/WebKitTools/Scripts/old-run-webkit-tests
index ff6697e..727869c 100755
--- a/WebKitTools/Scripts/old-run-webkit-tests
+++ b/WebKitTools/Scripts/old-run-webkit-tests
@@ -1431,6 +1431,7 @@ sub openDumpTool()
# Port specifics
if (isGtk()) {
$CLEAN_ENV{GTK_MODULES} = "gail";
+ $CLEAN_ENV{WEBKIT_INSPECTOR_PATH} = "$productDir/resources/inspector";
}
if (isQt()) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list