Changeset 218754 in webkit


Ignore:
Timestamp:
Jun 23, 2017 11:48:01 AM (7 years ago)
Author:
fred.wang@free.fr
Message:

Use window.internals instead of overridePreference to set WebCore settings in tests
​https://bugs.webkit.org/show_bug.cgi?id=173714

Patch by Frederic Wang <​fwang@igalia.com> on 2017-06-23
Reviewed by Simon Fraser.

Source/WebKit2:

This commit remove preference to settings mapping in overrideBoolPreferenceForTestRunner that
are no longer necessary after the changes done in LayoutTests.

  • WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner): Remove mapping for preferences
that no longer require testRunner.overridePreference calls in tests.

LayoutTests:

This commit is a first step to replace the use of testRunner.overridePreference with
internals.settings.set* calls in tests. Such a call will fail immediately and obviously if
its a function that does not exist, and these settings are restored properly between tests.
Some preferences that do not have a WebCore setting or an internals.settings setter are not
handled yet. The temporary failure added in r218480 for fast/frames/flattening/set-preference
is removed and so is a custom expectation caret-mode-document-begin-end for Mac WK1.

  • accessibility/gtk/caret-browsing-select-focus.html: Use internals.settings.set* function.
  • accessibility/gtk/caret-browsing-text-focus.html: Ditto.
  • accessibility/gtk/caret-offsets-and-extraneous-white-spaces.html: Ditto.
  • accessibility/gtk/caret-offsets.html: Ditto.
  • accessibility/gtk/text-in-span-block-in-a-block.html: Ditto.
  • css3/blending/blend-mode-isolation-turn-off-self-painting-layer1.html: Ditto.
  • css3/blending/blend-mode-simple.html: Ditto.
  • css3/blending/effect-background-blend-mode.html: Ditto.
  • css3/filters/blur-filter-page-scroll-parents.html: Ditto.
  • css3/filters/blur-filter-page-scroll-self.html: Ditto.
  • css3/filters/blur-filter-page-scroll.html: Ditto.
  • css3/filters/effect-blur.html: Ditto.
  • css3/filters/effect-brightness-clamping.html: Ditto.
  • css3/filters/effect-brightness.html: Ditto.
  • css3/filters/effect-combined.html: Ditto.
  • css3/filters/effect-contrast.html: Ditto.
  • css3/filters/effect-drop-shadow.html: Ditto.
  • css3/filters/effect-grayscale.html: Ditto.
  • css3/filters/effect-hue-rotate.html: Ditto.
  • css3/filters/effect-invert.html: Ditto.
  • css3/filters/effect-opacity.html: Ditto.
  • css3/filters/effect-saturate.html: Ditto.
  • css3/filters/effect-sepia.html: Ditto.
  • css3/filters/filter-repaint.html: Ditto.
  • css3/filters/null-effect-check.html: Ditto.
  • editing/selection/caret-mode-document-begin-end.html: Ditto.
  • editing/selection/caret-mode-paragraph-keys-navigation.html: Ditto.
  • fast/animation/request-animation-frame-disabled.html: Ditto.
  • fast/canvas/canvas-blend-image.html: Ditto.
  • fast/canvas/canvas-blend-solid.html: Ditto.
  • fast/canvas/canvas-imageSmoothingQuality.html: Ditto.
  • fast/canvas/drawImage-with-small-values.html: Ditto.
  • fast/images/exif-orientation-composited.html: Ditto.
  • fast/images/exif-orientation-css.html: Ditto.
  • fast/images/exif-orientation.html: Ditto.
  • fast/images/image-controls-basic.html: Ditto.
  • fast/parser/pre-html5-parser-quirks.html: Ditto.
  • fast/repaint/no-caret-repaint-in-non-content-editable-element.html: Ditto.
  • http/tests/appcache/disabled.html: Ditto.
  • http/tests/contentextensions/block-cookies-in-ping.html: Ditto.
  • http/tests/contentextensions/block-ping.html: Ditto.
  • http/tests/contentextensions/hide-on-ping-with-ping-that-redirects.html: Ditto.
  • http/tests/contentextensions/hide-on-ping.html: Ditto.
  • http/tests/misc/favicon-loads-with-icon-loading-override.html: Ditto.
  • http/tests/navigation/ping-attribute/anchor-cookie.html: Ditto.
  • http/tests/navigation/ping-attribute/anchor-cross-origin-from-https.html: Ditto.
  • http/tests/navigation/ping-attribute/anchor-cross-origin.html: Ditto.
  • http/tests/navigation/ping-attribute/anchor-ping-and-follow-redirect-when-sending-ping.html: Ditto.
  • http/tests/navigation/ping-attribute/anchor-same-origin.html: Ditto.
  • http/tests/navigation/ping-attribute/area-cookie.html: Ditto.
  • http/tests/navigation/ping-attribute/area-cross-origin-from-https.html: Ditto.
  • http/tests/navigation/ping-attribute/area-cross-origin.html: Ditto.
  • http/tests/navigation/ping-attribute/area-same-origin.html: Ditto.
  • http/tests/security/mixedContent/insecure-script-in-data-iframe-in-main-frame-blocked.html: Ditto.
  • imported/blink/fast/css/image-orientation/image-orientation-dynamic-expected.html: Ditto.
  • loader/meta-refresh-disabled.html: Ditto.
  • media/crash-closing-page-with-media-as-plugin-fallback.html: Ditto.
  • platform/mac-wk1/editing/selection/caret-mode-document-begin-end-expected.txt: Removed.

Mac WK1 now produces the same output as other platforms.

  • platform/mac/TestExpectations: Remove the failure for FrameFlattening now that the test

uses internals.settings.set*.

  • platform/mac/fast/frames/flattening/set-preference.html: Use internals.settings.set*.
  • plugins/crash-restoring-plugin-page-from-page-cache.html: Ditto.
  • plugins/frameset-with-plugin-frame.html: Ditto.
  • plugins/netscape-plugin-page-cache-works.html: Ditto.
Location:
trunk
Files:
1 deleted
65 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r218747 r218754  
     12017-06-23  Frederic Wang  <fwang@igalia.com>
     2
     3        Use window.internals instead of overridePreference to set WebCore settings in tests
     4        https://bugs.webkit.org/show_bug.cgi?id=173714
     5
     6        Reviewed by Simon Fraser.
     7
     8        This commit is a first step to replace the use of testRunner.overridePreference with
     9        internals.settings.set* calls in tests. Such a call will fail immediately and obviously if
     10        its a function that does not exist, and these settings are restored properly between tests.
     11        Some preferences that do not have a WebCore setting or an internals.settings setter are not
     12        handled yet. The temporary failure added in r218480 for fast/frames/flattening/set-preference
     13        is removed and so is a custom expectation caret-mode-document-begin-end for Mac WK1.
     14
     15        * accessibility/gtk/caret-browsing-select-focus.html: Use internals.settings.set* function.
     16        * accessibility/gtk/caret-browsing-text-focus.html: Ditto.
     17        * accessibility/gtk/caret-offsets-and-extraneous-white-spaces.html: Ditto.
     18        * accessibility/gtk/caret-offsets.html: Ditto.
     19        * accessibility/gtk/text-in-span-block-in-a-block.html: Ditto.
     20        * css3/blending/blend-mode-isolation-turn-off-self-painting-layer1.html: Ditto.
     21        * css3/blending/blend-mode-simple.html: Ditto.
     22        * css3/blending/effect-background-blend-mode.html: Ditto.
     23        * css3/filters/blur-filter-page-scroll-parents.html: Ditto.
     24        * css3/filters/blur-filter-page-scroll-self.html: Ditto.
     25        * css3/filters/blur-filter-page-scroll.html: Ditto.
     26        * css3/filters/effect-blur.html: Ditto.
     27        * css3/filters/effect-brightness-clamping.html: Ditto.
     28        * css3/filters/effect-brightness.html: Ditto.
     29        * css3/filters/effect-combined.html: Ditto.
     30        * css3/filters/effect-contrast.html: Ditto.
     31        * css3/filters/effect-drop-shadow.html: Ditto.
     32        * css3/filters/effect-grayscale.html: Ditto.
     33        * css3/filters/effect-hue-rotate.html: Ditto.
     34        * css3/filters/effect-invert.html: Ditto.
     35        * css3/filters/effect-opacity.html: Ditto.
     36        * css3/filters/effect-saturate.html: Ditto.
     37        * css3/filters/effect-sepia.html: Ditto.
     38        * css3/filters/filter-repaint.html: Ditto.
     39        * css3/filters/null-effect-check.html: Ditto.
     40        * editing/selection/caret-mode-document-begin-end.html: Ditto.
     41        * editing/selection/caret-mode-paragraph-keys-navigation.html: Ditto.
     42        * fast/animation/request-animation-frame-disabled.html: Ditto.
     43        * fast/canvas/canvas-blend-image.html: Ditto.
     44        * fast/canvas/canvas-blend-solid.html: Ditto.
     45        * fast/canvas/canvas-imageSmoothingQuality.html: Ditto.
     46        * fast/canvas/drawImage-with-small-values.html: Ditto.
     47        * fast/images/exif-orientation-composited.html: Ditto.
     48        * fast/images/exif-orientation-css.html: Ditto.
     49        * fast/images/exif-orientation.html: Ditto.
     50        * fast/images/image-controls-basic.html: Ditto.
     51        * fast/parser/pre-html5-parser-quirks.html: Ditto.
     52        * fast/repaint/no-caret-repaint-in-non-content-editable-element.html: Ditto.
     53        * http/tests/appcache/disabled.html: Ditto.
     54        * http/tests/contentextensions/block-cookies-in-ping.html: Ditto.
     55        * http/tests/contentextensions/block-ping.html: Ditto.
     56        * http/tests/contentextensions/hide-on-ping-with-ping-that-redirects.html: Ditto.
     57        * http/tests/contentextensions/hide-on-ping.html: Ditto.
     58        * http/tests/misc/favicon-loads-with-icon-loading-override.html: Ditto.
     59        * http/tests/navigation/ping-attribute/anchor-cookie.html: Ditto.
     60        * http/tests/navigation/ping-attribute/anchor-cross-origin-from-https.html: Ditto.
     61        * http/tests/navigation/ping-attribute/anchor-cross-origin.html: Ditto.
     62        * http/tests/navigation/ping-attribute/anchor-ping-and-follow-redirect-when-sending-ping.html: Ditto.
     63        * http/tests/navigation/ping-attribute/anchor-same-origin.html: Ditto.
     64        * http/tests/navigation/ping-attribute/area-cookie.html: Ditto.
     65        * http/tests/navigation/ping-attribute/area-cross-origin-from-https.html: Ditto.
     66        * http/tests/navigation/ping-attribute/area-cross-origin.html: Ditto.
     67        * http/tests/navigation/ping-attribute/area-same-origin.html: Ditto.
     68        * http/tests/security/mixedContent/insecure-script-in-data-iframe-in-main-frame-blocked.html: Ditto.
     69        * imported/blink/fast/css/image-orientation/image-orientation-dynamic-expected.html: Ditto.
     70        * loader/meta-refresh-disabled.html: Ditto.
     71        * media/crash-closing-page-with-media-as-plugin-fallback.html: Ditto.
     72        * platform/mac-wk1/editing/selection/caret-mode-document-begin-end-expected.txt: Removed.
     73        Mac WK1 now produces the same output as other platforms.
     74        * platform/mac/TestExpectations: Remove the failure for FrameFlattening now that the test
     75        uses internals.settings.set*.
     76        * platform/mac/fast/frames/flattening/set-preference.html: Use internals.settings.set*.
     77        * plugins/crash-restoring-plugin-page-from-page-cache.html: Ditto.
     78        * plugins/frameset-with-plugin-frame.html: Ditto.
     79        * plugins/netscape-plugin-page-cache-works.html: Ditto.
     80
    1812017-06-23  Chris Dumez  <cdumez@apple.com>
    282

  • trunk/LayoutTests/accessibility/gtk/caret-browsing-select-focus.html

    r187804 r218754  
    1414description("This tests caret browsing for html select elements.");
    1515
    16 if (window.testRunner) {
    17   testRunner.overridePreference("WebKitEnableCaretBrowsing", true);
     16if (window.testRunner && window.internals) {
     17  internals.settings.setCaretBrowsingEnabled(true);
    1818  testRunner.dumpAsText();
    1919

  • trunk/LayoutTests/accessibility/gtk/caret-browsing-text-focus.html

    r187804 r218754  
    1212description("This tests the FOCUSABLE and FOCUSED states for text objects.");
    1313
    14 if (window.testRunner) {
    15   testRunner.overridePreference("WebKitEnableCaretBrowsing", true);
     14if (window.testRunner && window.internals) {
     15  internals.settings.setCaretBrowsingEnabled(true);
    1616  testRunner.dumpAsText();
    1717

  • trunk/LayoutTests/accessibility/gtk/caret-offsets-and-extraneous-white-spaces.html

    r187804 r218754  
    3131}
    3232
    33 if (window.testRunner) {
    34     testRunner.overridePreference("WebKitEnableCaretBrowsing", true);
     33if (window.testRunner && window.internals) {
     34    internals.settings.setCaretBrowsingEnabled(true);
    3535    testRunner.dumpAsText();
    3636}

  • trunk/LayoutTests/accessibility/gtk/caret-offsets.html

    r200542 r218754  
    4949}
    5050
    51 if (window.testRunner) {
    52     testRunner.overridePreference("WebKitEnableCaretBrowsing", true);
     51if (window.internals)
     52    internals.settings.setCaretBrowsingEnabled(true);
     53if (window.testRunner)
    5354    testRunner.dumpAsText();
    54 }
    5555
    5656if (window.accessibilityController) {

  • trunk/LayoutTests/accessibility/gtk/text-in-span-block-in-a-block.html

    r187804 r218754  
    6767}
    6868
    69 if (window.testRunner) {
    70     testRunner.overridePreference("WebKitEnableCaretBrowsing", true);
     69if (window.internals)
     70    internals.settings.setCaretBrowsingEnabled(true);
     71if (window.testRunner)
    7172    testRunner.dumpAsText();
    72 }
    7373
    7474if (window.accessibilityController) {

  • trunk/LayoutTests/css3/blending/blend-mode-isolation-turn-off-self-painting-layer1.html

    r171295 r218754  
    44
    55<script>
    6   if (window.testRunner)
    7       window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "1");
     6  if (window.internals)
     7      window.internals.settings.setAcceleratedCompositingEnabled(true);
    88</script>
    99

  • trunk/LayoutTests/css3/blending/blend-mode-simple.html

    r181191 r218754  
    22<head>
    33    <script>
    4         if (window.testRunner)
    5             window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "1");
     4      if (window.internals)
     5          window.internals.settings.setAcceleratedCompositingEnabled(true);
    66    </script>
    77

  • trunk/LayoutTests/css3/blending/effect-background-blend-mode.html

    r168354 r218754  
    11<!DOCTYPE HTML>
    22<script>
    3     if (window.testRunner) {
    4         window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "1");
    5     }
     3    if (window.internals)
     4        window.internals.settings.setAcceleratedCompositingEnabled(true);
    65    if (window.testRunner)
    76      window.testRunner.dumpAsText(true);

  • trunk/LayoutTests/css3/filters/blur-filter-page-scroll-parents.html

    r167732 r218754  
    88    <head>
    99        <script>
    10             if (window.testRunner) {
     10            if (window.internals) {
    1111                // Force software rendering mode.
    12                 window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
     12                window.internals.settings.setAcceleratedCompositingEnabled(false);
    1313            }
    1414        </script>

  • trunk/LayoutTests/css3/filters/blur-filter-page-scroll-self.html

    r167732 r218754  
    88    <head>
    99        <script>
    10             if (window.testRunner) {
     10            if (window.internals) {
    1111                // Force software rendering mode.
    12                 window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
     12                window.internals.settings.setAcceleratedCompositingEnabled(false);
    1313            }
    1414        </script>

  • trunk/LayoutTests/css3/filters/blur-filter-page-scroll.html

    r167732 r218754  
    88    <head>
    99        <script>
    10             if (window.testRunner) {
     10            if (window.internals) {
    1111                // Force software rendering mode.
    12                 window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
     12                window.internals.settings.setAcceleratedCompositingEnabled(false);
    1313            }
    1414        </script>

  • trunk/LayoutTests/css3/filters/effect-blur.html

    r188647 r218754  
    11<script>
    2 if (window.testRunner) {
     2if (window.internals) {
    33    // Force software rendering mode.
    4     window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
     4    window.internals.settings.setAcceleratedCompositingEnabled(false);
    55}
    66</script>

  • trunk/LayoutTests/css3/filters/effect-brightness-clamping.html

    r188647 r218754  
    11<script>
    2 if (window.testRunner) {
     2if (window.internals) {
    33    // Force software rendering mode.
    4     window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
     4    window.internals.settings.setAcceleratedCompositingEnabled(false);
    55}
    66</script>

  • trunk/LayoutTests/css3/filters/effect-brightness.html

    r188647 r218754  
    11<script>
    2 if (window.testRunner) {
     2if (window.internals) {
    33    // Force software rendering mode.
    4     window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
     4    window.internals.settings.setAcceleratedCompositingEnabled(false);
    55}
    66</script>

  • trunk/LayoutTests/css3/filters/effect-combined.html

    r188647 r218754  
    11<script>
    2 if (window.testRunner) {
     2if (window.internals) {
    33    // Force software rendering mode.
    4     window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
     4    window.internals.settings.setAcceleratedCompositingEnabled(false);
    55}
    66</script>

  • trunk/LayoutTests/css3/filters/effect-contrast.html

    r188647 r218754  
    11<script>
    2 if (window.testRunner) {
     2if (window.internals) {
    33    // Force software rendering mode.
    4     window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
     4    window.internals.settings.setAcceleratedCompositingEnabled(false);
    55}
    66</script>

  • trunk/LayoutTests/css3/filters/effect-drop-shadow.html

    r188647 r218754  
    11<script>
    2 if (window.testRunner) {
     2if (window.internals) {
    33    // Force software rendering mode.
    4     window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
     4    window.internals.settings.setAcceleratedCompositingEnabled(false);
    55}
    66</script>

  • trunk/LayoutTests/css3/filters/effect-grayscale.html

    r188647 r218754  
    11<script>
    2 if (window.testRunner) {
     2if (window.internals) {
    33    // Force software rendering mode.
    4     window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
     4    window.internals.settings.setAcceleratedCompositingEnabled(false);
    55}
    66</script>

  • trunk/LayoutTests/css3/filters/effect-hue-rotate.html

    r188647 r218754  
    11<script>
    2 if (window.testRunner) {
     2if (window.internals) {
    33    // Force software rendering mode.
    4     window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
     4    window.internals.settings.setAcceleratedCompositingEnabled(false);
    55}
    66</script>

  • trunk/LayoutTests/css3/filters/effect-invert.html

    r188647 r218754  
    11<script>
    2 if (window.testRunner) {
     2if (window.internals) {
    33    // Force software rendering mode.
    4     window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
     4    window.internals.settings.setAcceleratedCompositingEnabled(false);
    55}
    66</script>

  • trunk/LayoutTests/css3/filters/effect-opacity.html

    r188647 r218754  
    11<script>
    2 if (window.testRunner) {
     2if (window.internals) {
    33    // Force software rendering mode.
    4     window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
     4    window.internals.settings.setAcceleratedCompositingEnabled(false);
    55}
    66</script>

  • trunk/LayoutTests/css3/filters/effect-saturate.html

    r188647 r218754  
    11<script>
    2 if (window.testRunner) {
     2if (window.internals) {
    33    // Force software rendering mode.
    4     window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
     4    window.internals.settings.setAcceleratedCompositingEnabled(false);
    55}
    66</script>

  • trunk/LayoutTests/css3/filters/effect-sepia.html

    r188647 r218754  
    11<script>
    2 if (window.testRunner) {
     2if (window.internals) {
    33    // Force software rendering mode.
    4     window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
     4    window.internals.settings.setAcceleratedCompositingEnabled(false);
    55}
    66</script>

  • trunk/LayoutTests/css3/filters/filter-repaint.html

    r119990 r218754  
    2626  <script src="../../fast/repaint/resources/repaint.js"></script>
    2727  <script>
    28       if (window.testRunner) {
     28      if (window.testRunner)
    2929          testRunner.dumpAsText(true);
     30      if (window.internals) {
    3031          // Force software rendering mode.
    31           window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
     32          window.internals.settings.setAcceleratedCompositingEnabled(false);
    3233      }
    3334

  • trunk/LayoutTests/css3/filters/null-effect-check.html

    r139770 r218754  
    11<script>
    2 if (window.testRunner) {
     2if (window.internals) {
    33    // Force software rendering mode.
    4     window.testRunner.overridePreference("WebKitAcceleratedCompositingEnabled", "0");
     4    window.internals.settings.setAcceleratedCompositingEnabled(false);
    55}
    66</script>

  • trunk/LayoutTests/editing/selection/caret-mode-document-begin-end.html

    r187809 r218754  
    1616description("This tests direct navigation to the begin and end of the document in caret mode.");
    1717
    18 if (window.testRunner) {
    19   testRunner.overridePreference("WebKitEnableCaretBrowsing", true);
     18if (window.testRunner && window.internals) {
     19  internals.settings.setCaretBrowsingEnabled(true);
    2020  testRunner.dumpAsText();
    2121  testRunner.dumpEditingCallbacks();

  • trunk/LayoutTests/editing/selection/caret-mode-paragraph-keys-navigation.html

    r155276 r218754  
    1212
    1313if (window.testRunner && window.internals) {
    14   testRunner.overridePreference("WebKitEnableCaretBrowsing", true);
     14  internals.settings.setCaretBrowsingEnabled(true);
    1515  testRunner.dumpAsText();
    1616  internals.settings.setEditingBehavior('mac');

  • trunk/LayoutTests/fast/animation/request-animation-frame-disabled.html

    r217390 r218754  
    33<head>
    44<script>
    5 if (window.testRunner)
    6     window.testRunner.overridePreference("WebKitRequestAnimationFrameEnabled", "0");
     5if (window.internals)
     6    internals.settings.setRequestAnimationFrameEnabled(false);
    77</script>
    88<script src="../../resources/js-test-pre.js"></script>

  • trunk/LayoutTests/fast/canvas/canvas-blend-image.html

    r217390 r218754  
    77<script>
    88description("Series of tests to ensure correct results on applying different blend modes.");
    9 if (self.testRunner)
    10   testRunner.overridePreference("WebKitCanvasUsesAcceleratedDrawing", 0);
     9if (window.internals)
     10  internals.settings.setCanvasUsesAcceleratedDrawing(false);
    1111
    1212var tmpimg = document.createElement('canvas');

  • trunk/LayoutTests/fast/canvas/canvas-blend-solid.html

    r217390 r218754  
    77<script>
    88description("Series of tests to ensure correct results on applying different blend modes.");
    9 if (self.testRunner)
    10    testRunner.overridePreference("WebKitCanvasUsesAcceleratedDrawing", 0);
     9if (window.internals)
     10  internals.settings.setCanvasUsesAcceleratedDrawing(false);
    1111
    1212var tmpimg = document.createElement('canvas');

  • trunk/LayoutTests/fast/canvas/canvas-imageSmoothingQuality.html

    r190383 r218754  
    1010description("Tests for the imageSmoothingQuality attribute.");
    1111
    12 if (window.testRunner)
    13    testRunner.overridePreference("WebKitCanvasUsesAcceleratedDrawing", 0);
     12if (window.internals)
     13  internals.settings.setCanvasUsesAcceleratedDrawing(false);
    1414
    1515var source = document.getElementById("source");

  • trunk/LayoutTests/fast/canvas/drawImage-with-small-values.html

    r217390 r218754  
    77<script>
    88description("Test canvas context after draw too small surface.");
    9 if (self.testRunner)
    10   testRunner.overridePreference("WebKitCanvasUsesAcceleratedDrawing", 0);
     9if (window.internals)
     10  internals.settings.setCanvasUsesAcceleratedDrawing(false);
    1111
    1212var tmpimg = document.createElement('canvas');

  • trunk/LayoutTests/fast/images/exif-orientation-composited.html

    r153797 r218754  
    22<head>
    33<script>
    4 if (window.testRunner) {
    5     testRunner.overridePreference('WebKitShouldRespectImageOrientation', 1);
     4if (window.internals)
     5    internals.settings.setShouldRespectImageOrientation(true);
     6if (window.testRunner)
    67    testRunner.dumpAsText(true);
    7 }
    88
    99function log(str) {

  • trunk/LayoutTests/fast/images/exif-orientation-css.html

    r132297 r218754  
    22<head>
    33<script>
    4 if (window.testRunner) {
    5     testRunner.overridePreference('WebKitShouldRespectImageOrientation', 1);
     4if (window.internals)
     5    internals.settings.setShouldRespectImageOrientation(true);
     6if (window.testRunner)
    67    testRunner.dumpAsText(true);
    7 }
    88
    99function log(str) {

  • trunk/LayoutTests/fast/images/exif-orientation.html

    r132297 r218754  
    22<head>
    33<script>
    4 if (window.testRunner) {
    5     testRunner.overridePreference('WebKitShouldRespectImageOrientation', 1);
     4if (window.internals)
     5    internals.settings.setShouldRespectImageOrientation(true);
     6if (window.testRunner)
    67    testRunner.dumpAsText(true);
    7 }
    88
    99function log(str) {

  • trunk/LayoutTests/fast/images/image-controls-basic.html

    r164457 r218754  
    11<script>
    2 if (window.testRunner)
    3         testRunner.overridePreference('WebKitImageControlsEnabled', 1);
     2if (window.internals)
     3        internals.settings.setImageControlsEnabled(true);
    44
    55</script>

  • trunk/LayoutTests/fast/parser/pre-html5-parser-quirks.html

    r124410 r218754  
    11<script>
    2     if (window.testRunner) {
    3         testRunner.overridePreference("WebKitUsePreHTML5ParserQuirks", "1");
     2    if (window.testRunner && window.internals) {
     3        internals.settings.setUsePreHTML5ParserQuirks(true);
    44        testRunner.dumpAsText();
    55        testRunner.dumpChildFramesAsText();

  • trunk/LayoutTests/fast/repaint/no-caret-repaint-in-non-content-editable-element.html

    r124410 r218754  
    33<script src="resources/repaint.js"></script>
    44<script>
    5 if (window.testRunner) {
     5if (window.internals) {
    66    // By definition, when caret browsing is enabled we always paint the caret.
    77    // So, this test is only applicable when caret browsing is disabled because
    88    // non-content-editable elements won't cause the caret to be drawn since they
    99    // are not editable.
    10     testRunner.overridePreference("WebKitEnableCaretBrowsing", false);
     10    internals.settings.setCaretBrowsingEnabled(false);
    1111}
    1212function repaintTest()

  • trunk/LayoutTests/http/tests/appcache/disabled.html

    r120167 r218754  
    44<div id=result></div>
    55<script>
    6     if (window.testRunner) {
    7         testRunner.overridePreference("WebKitOfflineWebApplicationCacheEnabled", false);
     6    if (window.internals)
     7        internals.settings.setOfflineWebApplicationCacheEnabled(false);
     8    if (window.testRunner)
    89        testRunner.dumpAsText();
    9     }
    1010
    1111    function log(message)

  • trunk/LayoutTests/http/tests/contentextensions/block-cookies-in-ping.html

    r191652 r218754  
    11<head>
    22<script>
    3 if (window.testRunner) {
     3if (window.testRunner && window.internals) {
    44    testRunner.dumpAsText();
    55    testRunner.dumpChildFramesAsText();
    6     testRunner.overridePreference("WebKitHyperlinkAuditingEnabled", 1);
     6    internals.settings.setHyperlinkAuditingEnabled(true);
    77    testRunner.waitUntilDone();
    88}

  • trunk/LayoutTests/http/tests/contentextensions/block-ping.html

    r191652 r218754  
    11<head>
    22<script>
    3 if (window.testRunner) {
     3if (window.testRunner && window.internals) {
    44    testRunner.dumpAsText();
    55    testRunner.dumpChildFramesAsText();
    6     testRunner.overridePreference("WebKitHyperlinkAuditingEnabled", 1);
     6    internals.settings.setHyperlinkAuditingEnabled(true);
    77    testRunner.waitUntilDone();
    88}

  • trunk/LayoutTests/http/tests/contentextensions/hide-on-ping-with-ping-that-redirects.html

    r206810 r218754  
    11<head>
    22<script>
    3 if (window.testRunner) {
     3if (window.testRunner && window.internals) {
    44    testRunner.dumpAsText();
    55    testRunner.dumpChildFramesAsText();
    6     testRunner.overridePreference("WebKitHyperlinkAuditingEnabled", 1);
     6    internals.settings.setHyperlinkAuditingEnabled(true);
    77    testRunner.waitUntilDone();
    88}

  • trunk/LayoutTests/http/tests/contentextensions/hide-on-ping.html

    r191652 r218754  
    11<head>
    22<script>
    3 if (window.testRunner) {
     3if (window.testRunner && window.internals) {
    44    testRunner.dumpAsText();
    55    testRunner.dumpChildFramesAsText();
    6     testRunner.overridePreference("WebKitHyperlinkAuditingEnabled", 1);
     6    internals.settings.setHyperlinkAuditingEnabled(true);
    77    testRunner.waitUntilDone();
    88}

  • trunk/LayoutTests/http/tests/misc/favicon-loads-with-icon-loading-override.html

    r130201 r218754  
    44function runTest()
    55{
    6     if (window.testRunner) {
     6    if (window.testRunner && window.internals) {
    77        testRunner.dumpAsText();
    88        testRunner.dumpResourceLoadCallbacks();
    99        testRunner.setIconDatabaseEnabled(true);
    1010        testRunner.overridePreference("WebKitDisplayImagesKey", 0);
    11         testRunner.overridePreference("WebKitLoadSiteIconsKey", 1);
     11        internals.setLoadsSiteIconsIgnoringImageLoadingSetting(true);
    1212        testRunner.queueReload();
    1313    }

  • trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-cookie.html

    r199822 r218754  
    44<script src="resources/utilities.js"></script>
    55<script>
    6 if (window.testRunner) {
     6if (window.testRunner && window.internals) {
    77    testRunner.dumpAsText();
    8     testRunner.overridePreference("WebKitHyperlinkAuditingEnabled", 1);
     8    internals.settings.setHyperlinkAuditingEnabled(true);
    99    testRunner.waitUntilDone();
    1010}

  • trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-cross-origin-from-https.html

    r204720 r218754  
    1818function test() {
    1919    if (!testCalled) {
    20         if (window.testRunner) {
     20        if (window.testRunner && window.internals) {
    2121            testRunner.dumpAsText();
    22             testRunner.overridePreference("WebKitHyperlinkAuditingEnabled", 1);
     22            internals.settings.setHyperlinkAuditingEnabled(true);
    2323            testRunner.waitUntilDone();
    2424        }

  • trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-cross-origin.html

    r204720 r218754  
    1010function test() {
    1111    if (!testCalled) {
    12         if (window.testRunner) {
     12        if (window.testRunner && window.internals) {
    1313            testRunner.dumpAsText();
    14             testRunner.overridePreference("WebKitHyperlinkAuditingEnabled", 1);
     14            internals.settings.setHyperlinkAuditingEnabled(true);
    1515            testRunner.waitUntilDone();
    1616        }

  • trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-ping-and-follow-redirect-when-sending-ping.html

    r206813 r218754  
    44<script src="resources/utilities.js"></script>
    55<script>
    6 if (window.testRunner) {
     6if (window.testRunner && window.internals) {
    77    testRunner.dumpAsText();
    8     testRunner.overridePreference("WebKitHyperlinkAuditingEnabled", 1);
     8    internals.settings.setHyperlinkAuditingEnabled(true);
    99    testRunner.waitUntilDone();
    1010}

  • trunk/LayoutTests/http/tests/navigation/ping-attribute/anchor-same-origin.html

    r204720 r218754  
    1010function test() {
    1111    if (!testCalled) {
    12         if (window.testRunner) {
     12        if (window.testRunner && window.internals) {
    1313            testRunner.dumpAsText();
    14             testRunner.overridePreference("WebKitHyperlinkAuditingEnabled", 1);
     14            internals.settings.setHyperlinkAuditingEnabled(true);
    1515            testRunner.waitUntilDone();
    1616        }

  • trunk/LayoutTests/http/tests/navigation/ping-attribute/area-cookie.html

    r199822 r218754  
    44<script src="resources/utilities.js"></script>
    55<script>
    6 if (window.testRunner) {
     6if (window.testRunner && window.internals) {
    77    testRunner.dumpAsText();
    8     testRunner.overridePreference("WebKitHyperlinkAuditingEnabled", 1);
     8    internals.settings.setHyperlinkAuditingEnabled(true);
    99    testRunner.waitUntilDone();
    1010}

  • trunk/LayoutTests/http/tests/navigation/ping-attribute/area-cross-origin-from-https.html

    r199822 r218754  
    44<script src="resources/utilities.js"></script>
    55<script>
    6 if (window.testRunner) {
     6if (window.testRunner && window.internals) {
    77    testRunner.dumpAsText();
    8     testRunner.overridePreference("WebKitHyperlinkAuditingEnabled", 1);
     8    internals.settings.setHyperlinkAuditingEnabled(true);
    99    testRunner.waitUntilDone();
    1010}

  • trunk/LayoutTests/http/tests/navigation/ping-attribute/area-cross-origin.html

    r199822 r218754  
    44<script src="resources/utilities.js"></script>
    55<script>
    6 if (window.testRunner) {
     6if (window.testRunner && window.internals) {
    77    testRunner.dumpAsText();
    8     testRunner.overridePreference("WebKitHyperlinkAuditingEnabled", 1);
     8    internals.settings.setHyperlinkAuditingEnabled(true);
    99    testRunner.waitUntilDone();
    1010}

  • trunk/LayoutTests/http/tests/navigation/ping-attribute/area-same-origin.html

    r199822 r218754  
    44<script src="resources/utilities.js"></script>
    55<script>
    6 if (window.testRunner) {
     6if (window.testRunner && window.internals) {
    77    testRunner.dumpAsText();
    8     testRunner.overridePreference("WebKitHyperlinkAuditingEnabled", 1);
     8    internals.settings.setHyperlinkAuditingEnabled(true);
    99    testRunner.waitUntilDone();
    1010}

  • trunk/LayoutTests/http/tests/security/mixedContent/insecure-script-in-data-iframe-in-main-frame-blocked.html

    r203300 r218754  
    22<body>
    33<script>
    4 if (window.testRunner) {
     4if (window.testRunner && window.internals) {
    55    testRunner.waitUntilDone();
    66    testRunner.dumpAsText();
    77    testRunner.setCanOpenWindows();
    88    testRunner.setCloseRemainingWindowsWhenComplete(true);
    9     testRunner.overridePreference("WebKitAllowRunningInsecureContent", false);
     9    internals.settings.setAllowRunningOfInsecureContent(false);
    1010}
    1111window.addEventListener("message", function (e) {

  • trunk/LayoutTests/imported/blink/fast/css/image-orientation/image-orientation-dynamic-expected.html

    r190629 r218754  
    22<head>
    33<script>
    4 if (window.testRunner)
    5   testRunner.overridePreference('WebKitShouldRespectImageOrientation', 1);
     4if (window.internals)
     5  internals.settings.setShouldRespectImageOrientation(true);
    66</script>
    77</head>

  • trunk/LayoutTests/loader/meta-refresh-disabled.html

    r186232 r218754  
    11<head>
    22<script>
    3 if (window.testRunner) {
    4     testRunner.overridePreference("WebKitHTTPEquivEnabled", "0");
     3if (window.testRunner && window.internals) {
     4    internals.settings.setHttpEquivEnabled(false);
    55    testRunner.dumpAsText();
    66    testRunner.waitUntilDone();

  • trunk/LayoutTests/media/crash-closing-page-with-media-as-plugin-fallback.html

    r120416 r218754  
    1010
    1111<script>
    12 if (window.testRunner) {
     12if (window.testRunner && window.internals) {
    1313    testRunner.dumpAsText();
    1414    testRunner.waitUntilDone();
    1515    testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
    16     testRunner.overridePreference("WebKitPageCacheSupportsPluginsPreferenceKey", 1);
     16    internals.settings.setPageCacheSupportsPlugins(true);
    1717    testRunner.setCanOpenWindows(true);
    1818    testRunner.setCloseRemainingWindowsWhenComplete(true);

  • trunk/LayoutTests/platform/mac/TestExpectations

    r218620 r218754  
    498498webkit.org/b/106185 fast/frames/flattening/iframe-flattening-fixed-height.html [ Failure Pass ]
    499499webkit.org/b/106185 fast/frames/flattening/frameset-flattening-grid.html [ Failure Pass ]
    500 
    501 # FrameFlattening enum preferences can not be overridden.
    502 webkit.org/b/128594 platform/mac/fast/frames/flattening/set-preference.html [ Failure ]
    503500
    504501webkit.org/b/73766 css3/unicode-bidi-isolate-aharon-failing.html [ ImageOnlyFailure ]

  • trunk/LayoutTests/platform/mac/fast/frames/flattening/set-preference.html

    r142499 r218754  
    1010<script src="../../../../../resources/check-layout.js"></script>
    1111<script type="text/javascript">
    12 if (window.testRunner)
    13     testRunner.overridePreference("WebKitFrameFlatteningEnabled", "1");
     12if (window.internals)
     13    internals.settings.setFrameFlattening("FullyEnabled");
    1414
    1515window.onload = function()

  • trunk/LayoutTests/plugins/crash-restoring-plugin-page-from-page-cache.html

    r182428 r218754  
    11<head>
    22<script>
    3 if (window.testRunner) {
     3if (window.testRunner && window.internals) {
    44    testRunner.dumpAsText();
    55    testRunner.waitUntilDone();
    66    testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
    7     testRunner.overridePreference("WebKitPageCacheSupportsPluginsPreferenceKey", 1);
     7    internals.settings.setPageCacheSupportsPlugins(true);
    88}
    99

  • trunk/LayoutTests/plugins/frameset-with-plugin-frame.html

    r218480 r218754  
    66        internals.settings.setFrameFlattening("FullyEnabled")
    77        testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
    8         testRunner.overridePreference("WebKitPageCacheSupportsPluginsPreferenceKey", 1);
     8        internals.settings.setPageCacheSupportsPlugins(true);
    99    }
    1010</script>

  • trunk/LayoutTests/plugins/netscape-plugin-page-cache-works.html

    r120417 r218754  
    11<html>
    22<script>
    3 if (window.testRunner) {
     3if (window.testRunner && window.internals) {
    44    testRunner.dumpAsText();
    55    testRunner.waitUntilDone();
    66    testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
    7     testRunner.overridePreference("WebKitPageCacheSupportsPluginsPreferenceKey", 1);
     7    internals.settings.setPageCacheSupportsPlugins(true);
    88}
    99

  • trunk/Source/WebKit2/ChangeLog

    r218753 r218754  
     12017-06-23  Frederic Wang  <fwang@igalia.com>
     2
     3        Use window.internals instead of overridePreference to set WebCore settings in tests
     4        https://bugs.webkit.org/show_bug.cgi?id=173714
     5
     6        Reviewed by Simon Fraser.
     7
     8        This commit remove preference to settings mapping in overrideBoolPreferenceForTestRunner that
     9        are no longer necessary after the changes done in LayoutTests.
     10
     11        * WebProcess/InjectedBundle/InjectedBundle.cpp:
     12        (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner): Remove mapping for preferences
     13        that no longer require testRunner.overridePreference calls in tests.
     14
    1152017-06-23  Brent Fulgham  <bfulgham@apple.com>
    216

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

    r218534 r218754  
    234234    // Map the names used in LayoutTests with the names used in WebCore::Settings and WebPreferencesStore.
    235235#define FOR_EACH_OVERRIDE_BOOL_PREFERENCE(macro) \
    236     macro(WebKitAcceleratedCompositingEnabled, AcceleratedCompositingEnabled, acceleratedCompositingEnabled) \
    237     macro(WebKitCanvasUsesAcceleratedDrawing, CanvasUsesAcceleratedDrawing, canvasUsesAcceleratedDrawing) \
    238236    macro(WebKitJavaEnabled, JavaEnabled, javaEnabled) \
    239237    macro(WebKitJavaScriptEnabled, ScriptEnabled, javaScriptEnabled) \
    240     macro(WebKitLoadSiteIconsKey, LoadsSiteIconsIgnoringImageLoadingSetting, loadsSiteIconsIgnoringImageLoadingPreference) \
    241     macro(WebKitOfflineWebApplicationCacheEnabled, OfflineWebApplicationCacheEnabled, offlineWebApplicationCacheEnabled) \
    242     macro(WebKitPageCacheSupportsPluginsPreferenceKey, PageCacheSupportsPlugins, pageCacheSupportsPlugins) \
    243238    macro(WebKitPluginsEnabled, PluginsEnabled, pluginsEnabled) \
    244239    macro(WebKitUsesPageCachePreferenceKey, UsesPageCache, usesPageCache) \
    … …  
    247242    macro(WebKitXSSAuditorEnabled, XSSAuditorEnabled, xssAuditorEnabled) \
    248243    macro(WebKitShouldRespectImageOrientation, ShouldRespectImageOrientation, shouldRespectImageOrientation) \
    249     macro(WebKitEnableCaretBrowsing, CaretBrowsingEnabled, caretBrowsingEnabled) \
    250244    macro(WebKitDisplayImagesKey, LoadsImagesAutomatically, loadsImagesAutomatically) \
    251     macro(WebKitHTTPEquivEnabled, HttpEquivEnabled, httpEquivEnabled) \
    252245    macro(WebKitVisualViewportEnabled, VisualViewportEnabled, visualViewportEnabled) \
    253246    macro(WebKitLargeImageAsyncDecodingEnabled, LargeImageAsyncDecodingEnabled, largeImageAsyncDecodingEnabled) \
Note: See TracChangeset for help on using the changeset viewer.