Changeset 129605 in webkit

Timestamp:

Sep 26, 2012 12:41:08 AM (12 years ago)

Author:

rakuco@webkit.org

Message:

[DRT][WTR] Support overriding the 'WebKitDisplayImagesKey' preference
​https://bugs.webkit.org/show_bug.cgi?id=96883

Reviewed by Kenneth Rohde Christiansen.

Source/WebKit2:

• WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner): Add
support for changing
WebPreferencesKey::loadsImagesAutomaticallyKey().

Tools:

• DumpRenderTree/efl/TestRunnerEfl.cpp:

(TestRunner::overridePreference): Support the
'WebKitDisplayImagesKey' preference.

LayoutTests:

• platform/efl/TestExpectations: Unskip test that only fails on

WK2.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl/TestExpectations (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/efl/TestRunnerEfl.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-25  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
+
+        [DRT][WTR] Support overriding the 'WebKitDisplayImagesKey' preference
+        https://bugs.webkit.org/show_bug.cgi?id=96883
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * platform/efl/TestExpectations: Unskip test that only fails on
+        WK2.
+
 2012-09-26  Zan Dobersek  <zandobersek@gmail.com>
 

trunk/LayoutTests/platform/efl/TestExpectations

@@ -1181 +1181 @@
 # Frame does not get focus as expected
 webkit.org/b/97077 inspector/extensions/extensions-panel.html [ Failure ]
-
-# Fails after r129462
-webkit.org/b/96883 fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html [ Failure ]

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-09-25  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
+
+        [DRT][WTR] Support overriding the 'WebKitDisplayImagesKey' preference
+        https://bugs.webkit.org/show_bug.cgi?id=96883
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
+        (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner): Add
+        support for changing
+        WebPreferencesKey::loadsImagesAutomaticallyKey().
+
 2012-09-25  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

@@ -183 +183 @@
     macro(WebKitXSSAuditorEnabled, XSSAuditorEnabled, xssAuditorEnabled) \
     macro(WebKitShouldRespectImageOrientation, ShouldRespectImageOrientation, shouldRespectImageOrientation) \
-    macro(WebKitEnableCaretBrowsing, CaretBrowsingEnabled, caretBrowsingEnabled)
+    macro(WebKitEnableCaretBrowsing, CaretBrowsingEnabled, caretBrowsingEnabled) \
+    macro(WebKitDisplayImagesKey, LoadsImagesAutomatically, loadsImagesAutomatically)
 
     if (preference == "WebKitAcceleratedCompositingEnabled")

trunk/Tools/ChangeLog

@@ +1 @@
+2012-09-25  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
+
+        [DRT][WTR] Support overriding the 'WebKitDisplayImagesKey' preference
+        https://bugs.webkit.org/show_bug.cgi?id=96883
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * DumpRenderTree/efl/TestRunnerEfl.cpp:
+        (TestRunner::overridePreference): Support the
+        'WebKitDisplayImagesKey' preference.
+
 2012-09-26  Zan Dobersek  <zandobersek@gmail.com>
 

trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp

@@ -712 +712 @@
     else if (equals(key, "WebKitWebAudioEnabled"))
         ewk_view_setting_web_audio_set(browser->mainView(), toBool(value));
+    else if (equals(key, "WebKitDisplayImagesKey"))
+        ewk_view_setting_auto_load_images_set(browser->mainView(), toBool(value));
     else
         fprintf(stderr, "TestRunner::overridePreference tried to override unknown preference '%s'.\n", value->string().utf8().data());