Diff
Modified: trunk/LayoutTests/ChangeLog (109752 => 109753)
--- trunk/LayoutTests/ChangeLog 2012-03-05 16:38:57 UTC (rev 109752)
+++ trunk/LayoutTests/ChangeLog 2012-03-05 16:54:58 UTC (rev 109753)
@@ -1,3 +1,14 @@
+2012-03-05 Zan Dobersek <zandober...@gmail.com>
+
+ [GTK] plugins/netscape-plugin-page-cache-works.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=74409
+
+ Reviewed by Martin Robinson.
+
+ Unskip one new passing test and reclassify one failure.
+
+ * platform/gtk/Skipped:
+
2012-03-05 Csaba Osztrogonác <o...@webkit.org>
[Qt] Unreviewed gardening.
Modified: trunk/LayoutTests/platform/gtk/Skipped (109752 => 109753)
--- trunk/LayoutTests/platform/gtk/Skipped 2012-03-05 16:38:57 UTC (rev 109752)
+++ trunk/LayoutTests/platform/gtk/Skipped 2012-03-05 16:54:58 UTC (rev 109753)
@@ -1528,11 +1528,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=74282
editing/pasteboard/emacs-ctrl-k-with-move.html
-# https://bugs.webkit.org/show_bug.cgi?id=74409
-# LayoutTestController::overridePreference tried to override unknown preference 'WebKitPageCacheSupportsPluginsPreferenceKey'.
-plugins/netscape-plugin-page-cache-works.html
-media/crash-closing-page-with-media-as-plugin-fallback.html
-
# https://bugs.webkit.org/show_bug.cgi?id=75785
accessibility/textbox-role-reports-line-number.html
@@ -1595,3 +1590,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=80210
security/block-test.html
+
+# https://bugs.webkit.org/show_bug.cgi?id=80158
+plugins/netscape-plugin-page-cache-works.html
Modified: trunk/Source/WebKit/gtk/ChangeLog (109752 => 109753)
--- trunk/Source/WebKit/gtk/ChangeLog 2012-03-05 16:38:57 UTC (rev 109752)
+++ trunk/Source/WebKit/gtk/ChangeLog 2012-03-05 16:54:58 UTC (rev 109753)
@@ -1,3 +1,17 @@
+2012-03-05 Zan Dobersek <zandober...@gmail.com>
+
+ [GTK] plugins/netscape-plugin-page-cache-works.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=74409
+
+ Reviewed by Martin Robinson.
+
+ Add a method to override page-cache-for-plugins preference.
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ (DumpRenderTreeSupportGtk::setPageCacheSupportsPlugins):
+ * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+ (DumpRenderTreeSupportGtk):
+
2012-03-04 Martin Robinson <mrobin...@igalia.com>
[GTK] "Console: undefined @0: ReferenceError: Can't find variable: WebInspector" during testwebinspector
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (109752 => 109753)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2012-03-05 16:38:57 UTC (rev 109752)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2012-03-05 16:54:58 UTC (rev 109753)
@@ -894,6 +894,11 @@
#endif
}
+void DumpRenderTreeSupportGtk::setPageCacheSupportsPlugins(WebKitWebView* webView, bool enabled)
+{
+ core(webView)->settings()->setPageCacheSupportsPlugins(enabled);
+}
+
bool DumpRenderTreeSupportGtk::elementDoesAutoCompleteForElementWithId(WebKitWebFrame* frame, JSStringRef id)
{
Frame* coreFrame = core(frame);
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h (109752 => 109753)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2012-03-05 16:38:57 UTC (rev 109752)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2012-03-05 16:54:58 UTC (rev 109753)
@@ -128,6 +128,7 @@
static int numberOfPendingGeolocationPermissionRequests(WebKitWebView*);
static void setHixie76WebSocketProtocolEnabled(WebKitWebView*, bool enabled);
+ static void setPageCacheSupportsPlugins(WebKitWebView*, bool enabled);
static void deliverAllMutationsIfNecessary();
Modified: trunk/Tools/ChangeLog (109752 => 109753)
--- trunk/Tools/ChangeLog 2012-03-05 16:38:57 UTC (rev 109752)
+++ trunk/Tools/ChangeLog 2012-03-05 16:54:58 UTC (rev 109753)
@@ -1,3 +1,17 @@
+2012-03-05 Zan Dobersek <zandober...@gmail.com>
+
+ [GTK] plugins/netscape-plugin-page-cache-works.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=74409
+
+ Reviewed by Martin Robinson.
+
+ Add support for overriding the page-cache-for-plugins preference
+ through DumpRenderTreeSupport.
+
+ * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+ (booleanFromValue): A helper function to convert a string to boolean.
+ (LayoutTestController::overridePreference):
+
2012-03-05 Rob Buis <rb...@rim.com>
[BlackBerry] Update Tools/DumpRenderTree
Modified: trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp (109752 => 109753)
--- trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp 2012-03-05 16:38:57 UTC (rev 109752)
+++ trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp 2012-03-05 16:54:58 UTC (rev 109753)
@@ -802,6 +802,11 @@
DumpRenderTreeSupportGtk::resumeAnimations(mainFrame);
}
+static gboolean booleanFromValue(gchar* value)
+{
+ return !g_ascii_strcasecmp(value, "true") || !g_ascii_strcasecmp(value, "1");
+}
+
void LayoutTestController::overridePreference(JSStringRef key, JSStringRef value)
{
GOwnPtr<gchar> originalName(JSStringCopyUTF8CString(key));
@@ -831,11 +836,14 @@
else if (g_str_equal(originalName.get(), "WebKitWebAudioEnabled"))
propertyName = "enable-webaudio";
else if (g_str_equal(originalName.get(), "WebKitTabToLinksPreferenceKey")) {
- DumpRenderTreeSupportGtk::setLinksIncludedInFocusChain(!g_ascii_strcasecmp(valueAsString.get(), "true") || !g_ascii_strcasecmp(valueAsString.get(), "1"));
+ DumpRenderTreeSupportGtk::setLinksIncludedInFocusChain(booleanFromValue(valueAsString.get()));
return;
} else if (g_str_equal(originalName.get(), "WebKitHixie76WebSocketProtocolEnabled")) {
- DumpRenderTreeSupportGtk::setHixie76WebSocketProtocolEnabled(webkit_web_frame_get_web_view(mainFrame), !g_ascii_strcasecmp(valueAsString.get(), "true") || !g_ascii_strcasecmp(valueAsString.get(), "1"));
+ DumpRenderTreeSupportGtk::setHixie76WebSocketProtocolEnabled(webkit_web_frame_get_web_view(mainFrame), booleanFromValue(valueAsString.get()));
return;
+ } else if (g_str_equal(originalName.get(), "WebKitPageCacheSupportsPluginsPreferenceKey")) {
+ DumpRenderTreeSupportGtk::setPageCacheSupportsPlugins(webkit_web_frame_get_web_view(mainFrame), booleanFromValue(valueAsString.get()));
+ return;
} else {
fprintf(stderr, "LayoutTestController::overridePreference tried to override "
"unknown preference '%s'.\n", originalName.get());
@@ -851,8 +859,7 @@
if (G_VALUE_HOLDS_STRING(¤tPropertyValue))
g_object_set(settings, propertyName, valueAsString.get(), NULL);
else if (G_VALUE_HOLDS_BOOLEAN(¤tPropertyValue))
- g_object_set(G_OBJECT(settings), propertyName, !g_ascii_strcasecmp(valueAsString.get(), "true")
- || !g_ascii_strcasecmp(valueAsString.get(), "1"), NULL);
+ g_object_set(G_OBJECT(settings), propertyName, booleanFromValue(valueAsString.get()), NULL);
else if (G_VALUE_HOLDS_INT(¤tPropertyValue))
g_object_set(G_OBJECT(settings), propertyName, atoi(valueAsString.get()), NULL);
else if (G_VALUE_HOLDS_FLOAT(¤tPropertyValue)) {
