[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
kov at webkit.org
kov at webkit.org
Tue Jan 5 23:54:04 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 8f7094c526e90d3dfe4cf81c723e9044c0eb8be3
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 18 19:36:06 2009 +0000
2009-12-18 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Rubber-stamped by Xan Lopez.
Disable page cache for tests.
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(resetDefaultsToConsistentValues):
* DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
(copyWebSettingKey):
(LayoutTestController::overridePreference):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52326 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 428c853..985032a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-18 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+
+ Rubber-stamped by Xan Lopez.
+
+ Unskip test that should now pass.
+
+ * platform/gtk/Skipped:
+
2009-12-18 Brian Weinstein <bweinstein at apple.com>
Rubber-stamped by Adam Roben.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 2b9c717..35d26d6 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5535,7 +5535,6 @@ editing/selection/move-left-right.html
# Missing DRT ability to override 'standard' preferences.
editing/selection/doubleclick-beside-cr-span.html
fast/dom/Window/timer-resume-on-navigation-back.html
-fast/harness/use-page-cache.html
fast/loader/input-element-page-cache-crash.html
loader/go-back-to-different-window-size.html
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 92f66ee..f837847 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,20 @@
+2009-12-18 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+
+ Rubber-stamped by Xan Lopez.
+
+ [GTK] New events (pageshow and pagehide) tests failing
+ https://bugs.webkit.org/show_bug.cgi?id=28823
+
+ Original patch by Jan Michael Alonzo.
+
+ Disable page cache for tests.
+
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (resetDefaultsToConsistentValues):
+ * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+ (copyWebSettingKey):
+ (LayoutTestController::overridePreference):
+
2009-12-18 Fumitoshi Ukai <ukai at chromium.org>
Reviewed by David Levin.
diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 5a5e9aa..e55ff27 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -334,6 +334,7 @@ static void resetDefaultsToConsistentValues()
"default-monospace-font-size", 13,
"minimum-font-size", 1,
"enable-caret-browsing", FALSE,
+ "enable-page-cache", FALSE,
NULL);
webkit_web_frame_clear_main_frame_name(mainFrame);
diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index d7d7ad1..6efe715 100644
--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -69,6 +69,7 @@ static gchar* copyWebSettingKey(gchar* preferenceKey)
g_hash_table_insert(keyTable, g_strdup("WebKitJavaScriptEnabled"), g_strdup("enable-scripts"));
g_hash_table_insert(keyTable, g_strdup("WebKitDefaultFontSize"), g_strdup("default-font-size"));
g_hash_table_insert(keyTable, g_strdup("WebKitEnableCaretBrowsing"), g_strdup("enable-caret-browsing"));
+ g_hash_table_insert(keyTable, g_strdup("WebKitUsesPageCachePreferenceKey"), g_strdup("enable-page-cache"));
}
return g_strdup(static_cast<gchar*>(g_hash_table_lookup(keyTable, preferenceKey)));
@@ -490,9 +491,12 @@ void LayoutTestController::overridePreference(JSStringRef key, JSStringRef value
g_value_transform(const_cast<GValue*>(&stringValue), &propValue);
g_object_set_property(G_OBJECT(settings), webSettingKey, const_cast<GValue*>(&propValue));
} else if (G_VALUE_HOLDS_BOOLEAN(&propValue)) {
+ char* lowered = g_utf8_strdown(strValue, -1);
g_object_set(G_OBJECT(settings), webSettingKey,
- g_str_equal(g_utf8_strdown(strValue, -1), "true"),
+ g_str_equal(lowered, "true")
+ || g_str_equal(strValue, "1"),
NULL);
+ g_free(lowered);
} else if (G_VALUE_HOLDS_INT(&propValue)) {
std::string str(strValue);
std::stringstream ss(str);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list