[GTK] fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html...
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 18 Sep 2012 06:56:36 +0000 (06:56 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 18 Sep 2012 06:56:36 +0000 (06:56 +0000)
https://bugs.webkit.org/show_bug.cgi?id=96899

Reviewed by Martin Robinson.

Tools:

When overriding the 'WebKitDisplayImageKey' preference, use the
'auto-load-images' property of WebKitWebSettings as the property which
should be updated with the corresponding preference value.

* DumpRenderTree/gtk/DumpRenderTree.cpp:
(resetDefaultsToConsistentValues):
* DumpRenderTree/gtk/TestRunnerGtk.cpp:
(TestRunner::overridePreference):

LayoutTests:

Remove failure expectation for the test in title.

* platform/gtk/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@128854 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/platform/gtk/TestExpectations
Tools/ChangeLog
Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp

index b069245..3def8e3 100644 (file)
@@ -1,3 +1,14 @@
+2012-09-17  Zan Dobersek  <zandobersek@gmail.com>
+
+        [GTK] fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html failing after r128645
+        https://bugs.webkit.org/show_bug.cgi?id=96899
+
+        Reviewed by Martin Robinson.
+
+        Remove failure expectation for the test in title.
+
+        * platform/gtk/TestExpectations:
+
 2012-09-17  Shinya Kawanaka  <shinyak@chromium.org>
 
         [Chromium] Unreviewed gardening, mark perf/nested-combined-selectors.html is flaky
index 97f4d5d..bb81955 100644 (file)
@@ -1358,8 +1358,6 @@ BUGWK73003 DEBUG : editing/spelling/spellcheck-async.html = TEXT
 BUGWK73003 DEBUG : editing/spelling/spellcheck-paste.html = PASS
 BUGWK50740 DEBUG : editing/spelling/spellcheck-queue.html = TEXT
 
-BUGWK96899 : fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html = TEXT
-
 BUGWK96900 : fast/text/stale-TextLayout-from-first-line.html = IMAGE
 
 //////////////////////////////////////////////////////////////////////////////////////////
index e6fc3a8..fe789fc 100644 (file)
@@ -1,3 +1,19 @@
+2012-09-17  Zan Dobersek  <zandobersek@gmail.com>
+
+        [GTK] fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html failing after r128645
+        https://bugs.webkit.org/show_bug.cgi?id=96899
+
+        Reviewed by Martin Robinson.
+
+        When overriding the 'WebKitDisplayImageKey' preference, use the
+        'auto-load-images' property of WebKitWebSettings as the property which
+        should be updated with the corresponding preference value.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (resetDefaultsToConsistentValues):
+        * DumpRenderTree/gtk/TestRunnerGtk.cpp:
+        (TestRunner::overridePreference):
+
 2012-09-17  Pratik Solanki  <psolanki@apple.com>
 
         DumpRenderTree and WebKitTestRunner should compile with -Wundef on Mac
index 34d2cc8..0929cad 100644 (file)
@@ -776,6 +776,8 @@ void TestRunner::overridePreference(JSStringRef key, JSStringRef value)
         propertyName = "enable-webgl";
     else if (g_str_equal(originalName.get(), "WebKitWebAudioEnabled"))
         propertyName = "enable-webaudio";
+    else if (g_str_equal(originalName.get(), "WebKitDisplayImagesKey"))
+        propertyName = "auto-load-images";
     else if (g_str_equal(originalName.get(), "WebKitTabToLinksPreferenceKey")) {
         DumpRenderTreeSupportGtk::setLinksIncludedInFocusChain(booleanFromValue(valueAsString.get()));
         return;