Changeset 142499 in webkit


Ignore:
Timestamp:
Feb 11, 2013 1:04:50 PM (11 years ago)
Author:
tony@chromium.org
Message:

Move setFrameFlatteningEnabled from layoutTestController to window.internals.settings
​https://bugs.webkit.org/show_bug.cgi?id=87149

Reviewed by Simon Fraser.

Source/WebKit2:

  • WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner): Add setFrameFlatteningEnabled to the list of overridable values.

Tools:

Remove testRunner.setFrameFlatteningEnabled from DRT and WTR. WebKit API
methods are left because there may be users of it. Add a test for Apple Mac
to ensure that the API for the preference still works using overridePreference.

  • DumpRenderTree/TestRunner.cpp:

(TestRunner::staticFunctions):

  • DumpRenderTree/TestRunner.h:

(TestRunner):

  • DumpRenderTree/blackberry/DumpRenderTree.cpp:

(BlackBerry::WebKit::DumpRenderTree::resetToConsistentStateBeforeTesting):

  • DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp:
  • DumpRenderTree/efl/TestRunnerEfl.cpp:
  • DumpRenderTree/gtk/DumpRenderTree.cpp:

(resetDefaultsToConsistentValues):

  • DumpRenderTree/gtk/TestRunnerGtk.cpp:
  • DumpRenderTree/mac/TestRunnerMac.mm:
  • DumpRenderTree/qt/DumpRenderTreeQt.cpp:

(WebCore::WebPage::resetSettings):

  • DumpRenderTree/qt/TestRunnerQt.cpp:
  • DumpRenderTree/qt/TestRunnerQt.h:

(TestRunner):

  • DumpRenderTree/win/DumpRenderTree.cpp:

(resetDefaultsToConsistentValues):

  • DumpRenderTree/win/TestRunnerWin.cpp:
  • DumpRenderTree/wx/TestRunnerWx.cpp:
  • WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
  • WebKitTestRunner/InjectedBundle/TestRunner.cpp:
  • WebKitTestRunner/InjectedBundle/TestRunner.h:

(TestRunner):

LayoutTests:

Update tests to use internal.settings.setFrameFlatteningEnabled, which is automatically
generated from Settings.in.
Add a Mac only test that uses overridePreference to test the API.

  • fast/frames/flattening/crash-svg-document.html:
  • fast/frames/flattening/frameset-flattening-advanced.html:
  • fast/frames/flattening/frameset-flattening-grid.html:
  • fast/frames/flattening/frameset-flattening-simple.html:
  • fast/frames/flattening/frameset-flattening-subframe-resize.html:
  • fast/frames/flattening/frameset-flattening-subframesets.html:
  • fast/frames/flattening/iframe-flattening-crash.html:
  • fast/frames/flattening/iframe-flattening-fixed-height.html:
  • fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html:
  • fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html:
  • fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html:
  • fast/frames/flattening/iframe-flattening-fixed-width-and-height.html:
  • fast/frames/flattening/iframe-flattening-fixed-width.html:
  • fast/frames/flattening/iframe-flattening-nested.html:
  • fast/frames/flattening/iframe-flattening-offscreen.html:
  • fast/frames/flattening/iframe-flattening-out-of-view-and-scroll.html:
  • fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html:
  • fast/frames/flattening/iframe-flattening-out-of-view.html:
  • fast/frames/flattening/iframe-flattening-selection-crash.html:
  • fast/frames/flattening/iframe-flattening-simple.html:
  • fast/frames/flattening/iframe-tiny.html:
  • fast/spatial-navigation/snav-iframe-flattening-simple.html:
  • fast/text-autosizing/narrow-iframe-flattened.html:
  • http/tests/misc/iframe-flattening-3level-nesting-with-blocking-resource.html:
  • platform/chromium/TestExpectations: Chromium doesn't use frame flattening on mobile either.
  • plugins/frameset-with-plugin-frame.html:
  • fast/frames/flattening/crash-svg-document.html:
  • fast/frames/flattening/frameset-flattening-advanced.html:
  • fast/frames/flattening/frameset-flattening-grid.html:
  • fast/frames/flattening/frameset-flattening-simple.html:
  • fast/frames/flattening/frameset-flattening-subframe-resize.html:
  • fast/frames/flattening/frameset-flattening-subframesets.html:
  • fast/frames/flattening/iframe-flattening-crash.html:
  • fast/frames/flattening/iframe-flattening-fixed-height.html:
  • fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html:
  • fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html:
  • fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html:
  • fast/frames/flattening/iframe-flattening-fixed-width-and-height.html:
  • fast/frames/flattening/iframe-flattening-fixed-width.html:
  • fast/frames/flattening/iframe-flattening-nested.html:
  • fast/frames/flattening/iframe-flattening-offscreen.html:
  • fast/frames/flattening/iframe-flattening-out-of-view-and-scroll.html:
  • fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html:
  • fast/frames/flattening/iframe-flattening-out-of-view.html:
  • fast/frames/flattening/iframe-flattening-selection-crash.html:
  • fast/frames/flattening/iframe-flattening-simple.html:
  • fast/frames/flattening/iframe-tiny.html:
  • fast/spatial-navigation/snav-iframe-flattening-simple.html:
  • fast/text-autosizing/narrow-iframe-flattened.html:
  • http/tests/misc/iframe-flattening-3level-nesting-with-blocking-resource.html:
  • platform/chromium/TestExpectations:
  • platform/mac/fast/frames/flattening/set-preference-expected.txt: Added.
  • platform/mac/fast/frames/flattening/set-preference.html: Added.
  • plugins/frameset-with-plugin-frame.html:
Location:
trunk
Files:
2 added
47 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r142492 r142499  
     12013-02-11  Tony Chang  <tony@chromium.org>
     2
     3        Move setFrameFlatteningEnabled from layoutTestController to window.internals.settings
     4        https://bugs.webkit.org/show_bug.cgi?id=87149
     5
     6        Reviewed by Simon Fraser.
     7
     8        Update tests to use internal.settings.setFrameFlatteningEnabled, which is automatically
     9        generated from Settings.in.
     10        Add a Mac only test that uses overridePreference to test the API.
     11
     12        * fast/frames/flattening/crash-svg-document.html:
     13        * fast/frames/flattening/frameset-flattening-advanced.html:
     14        * fast/frames/flattening/frameset-flattening-grid.html:
     15        * fast/frames/flattening/frameset-flattening-simple.html:
     16        * fast/frames/flattening/frameset-flattening-subframe-resize.html:
     17        * fast/frames/flattening/frameset-flattening-subframesets.html:
     18        * fast/frames/flattening/iframe-flattening-crash.html:
     19        * fast/frames/flattening/iframe-flattening-fixed-height.html:
     20        * fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html:
     21        * fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html:
     22        * fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html:
     23        * fast/frames/flattening/iframe-flattening-fixed-width-and-height.html:
     24        * fast/frames/flattening/iframe-flattening-fixed-width.html:
     25        * fast/frames/flattening/iframe-flattening-nested.html:
     26        * fast/frames/flattening/iframe-flattening-offscreen.html:
     27        * fast/frames/flattening/iframe-flattening-out-of-view-and-scroll.html:
     28        * fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html:
     29        * fast/frames/flattening/iframe-flattening-out-of-view.html:
     30        * fast/frames/flattening/iframe-flattening-selection-crash.html:
     31        * fast/frames/flattening/iframe-flattening-simple.html:
     32        * fast/frames/flattening/iframe-tiny.html:
     33        * fast/spatial-navigation/snav-iframe-flattening-simple.html:
     34        * fast/text-autosizing/narrow-iframe-flattened.html:
     35        * http/tests/misc/iframe-flattening-3level-nesting-with-blocking-resource.html:
     36        * platform/chromium/TestExpectations: Chromium doesn't use frame flattening on mobile either.
     37        * plugins/frameset-with-plugin-frame.html:
     38        * fast/frames/flattening/crash-svg-document.html:
     39        * fast/frames/flattening/frameset-flattening-advanced.html:
     40        * fast/frames/flattening/frameset-flattening-grid.html:
     41        * fast/frames/flattening/frameset-flattening-simple.html:
     42        * fast/frames/flattening/frameset-flattening-subframe-resize.html:
     43        * fast/frames/flattening/frameset-flattening-subframesets.html:
     44        * fast/frames/flattening/iframe-flattening-crash.html:
     45        * fast/frames/flattening/iframe-flattening-fixed-height.html:
     46        * fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html:
     47        * fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html:
     48        * fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html:
     49        * fast/frames/flattening/iframe-flattening-fixed-width-and-height.html:
     50        * fast/frames/flattening/iframe-flattening-fixed-width.html:
     51        * fast/frames/flattening/iframe-flattening-nested.html:
     52        * fast/frames/flattening/iframe-flattening-offscreen.html:
     53        * fast/frames/flattening/iframe-flattening-out-of-view-and-scroll.html:
     54        * fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html:
     55        * fast/frames/flattening/iframe-flattening-out-of-view.html:
     56        * fast/frames/flattening/iframe-flattening-selection-crash.html:
     57        * fast/frames/flattening/iframe-flattening-simple.html:
     58        * fast/frames/flattening/iframe-tiny.html:
     59        * fast/spatial-navigation/snav-iframe-flattening-simple.html:
     60        * fast/text-autosizing/narrow-iframe-flattened.html:
     61        * http/tests/misc/iframe-flattening-3level-nesting-with-blocking-resource.html:
     62        * platform/chromium/TestExpectations:
     63        * platform/mac/fast/frames/flattening/set-preference-expected.txt: Added.
     64        * platform/mac/fast/frames/flattening/set-preference.html: Added.
     65        * plugins/frameset-with-plugin-frame.html:
     66
    1672013-02-11  Adam Barth  <abarth@webkit.org>
    268

  • trunk/LayoutTests/fast/frames/flattening/crash-svg-document.html

    r121008 r142499  
    22<script>
    33
    4 if (window.testRunner) {
    5     testRunner.setFrameFlatteningEnabled(true);
     4if (window.testRunner && window.internals) {
     5    internals.settings.setFrameFlatteningEnabled(true);
    66    testRunner.dumpAsText();
    77}

  • trunk/LayoutTests/fast/frames/flattening/frameset-flattening-advanced.html

    r121008 r142499  
    44        function test()
    55        {
    6             if (window.testRunner)
    7                 testRunner.setFrameFlatteningEnabled(true);
     6            if (window.internals)
     7                internals.settings.setFrameFlatteningEnabled(true);
    88            // Force synchronous layout.
    99            document.body.offsetHeight;

  • trunk/LayoutTests/fast/frames/flattening/frameset-flattening-grid.html

    r121008 r142499  
    44    function test()
    55    {
    6         if (window.testRunner)
    7             testRunner.setFrameFlatteningEnabled(true);
     6        if (window.internals)
     7            internals.settings.setFrameFlatteningEnabled(true);
    88        // Force synchronous layout.
    99        document.body.offsetHeight;

  • trunk/LayoutTests/fast/frames/flattening/frameset-flattening-simple.html

    r121008 r142499  
    22<head>
    33    <script type="text/javascript">
    4         if (window.testRunner) {
     4        if (window.testRunner && window.internals) {
    55            testRunner.waitUntilDone();
    6             testRunner.setFrameFlatteningEnabled(true);
     6            internals.settings.setFrameFlatteningEnabled(true);
    77        }
    88

  • trunk/LayoutTests/fast/frames/flattening/frameset-flattening-subframe-resize.html

    r121008 r142499  
    22<head>
    33    <script type="text/javascript">
    4         if (window.testRunner) {
     4        if (window.testRunner && window.internals) {
    55            testRunner.waitUntilDone();
    6             testRunner.setFrameFlatteningEnabled(true);
     6            internals.settings.setFrameFlatteningEnabled(true);
    77        }
    88

  • trunk/LayoutTests/fast/frames/flattening/frameset-flattening-subframesets.html

    r121008 r142499  
    44        function test()
    55        {
    6             if (window.testRunner)
    7                 testRunner.setFrameFlatteningEnabled(true);
     6            if (window.internals)
     7                internals.settings.setFrameFlatteningEnabled(true);
    88            // Force synchronous layout.
    99            document.body.offsetHeight;

  • trunk/LayoutTests/fast/frames/flattening/iframe-flattening-crash.html

    r121008 r142499  
    22<head>
    33    <script type="text/javascript">
    4         if (window.testRunner) {
     4        if (window.testRunner && window.internals) {
    55            testRunner.dumpAsText();
    66            testRunner.waitUntilDone();
    7             testRunner.setFrameFlatteningEnabled(true);
     7            internals.settings.setFrameFlatteningEnabled(true);
    88        }
    99    </script>
    … …  
    2121                testRunner.notifyDone();
    2222            if (window.testRunner)
    23                 testRunner.setFrameFlatteningEnabled(true);
     23                internals.settings.setFrameFlatteningEnabled(true);
    2424        }
    2525    </script>

  • trunk/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-height.html

    r121008 r142499  
    44        function test()
    55        {
    6             if (window.testRunner)
    7                 testRunner.setFrameFlatteningEnabled(true);
     6            if (window.internals)
     7                internals.settings.setFrameFlatteningEnabled(true);
    88            // Force synchronous layout.
    99            document.body.offsetHeight;

  • trunk/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling-with-js-forced-layout.html

    r121008 r142499  
    55        function test()
    66        {
    7             if (window.testRunner) {
     7            if (window.testRunner && window.internals) {
    88                testRunner.dumpAsText();
    9                 testRunner.setFrameFlatteningEnabled(true);
     9                internals.settings.setFrameFlatteningEnabled(true);
    1010            }
    1111        }

  • trunk/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html

    r121008 r142499  
    44        function test()
    55        {
    6             if (window.testRunner)
    7                 testRunner.setFrameFlatteningEnabled(true);
     6            if (window.internals)
     7                internals.settings.setFrameFlatteningEnabled(true);
    88            // Force synchronous layout.
    99            document.body.offsetHeight;

  • trunk/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height-zero-size.html

    r121008 r142499  
    55        function test()
    66        {
    7             if (window.testRunner) {
     7            if (window.testRunner && window.internals) {
    88                testRunner.dumpAsText();
    9                 testRunner.setFrameFlatteningEnabled(true);
     9                internals.settings.setFrameFlatteningEnabled(true);
    1010            }
    1111

  • trunk/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width-and-height.html

    r121008 r142499  
    22<head>
    33    <script type="text/javascript">
    4         if (window.testRunner) {
     4        if (window.testRunner && window.internals) {
    55            testRunner.waitUntilDone();
    6             testRunner.setFrameFlatteningEnabled(true);
     6            internals.settings.setFrameFlatteningEnabled(true);
    77        }
    88

  • trunk/LayoutTests/fast/frames/flattening/iframe-flattening-fixed-width.html

    r121008 r142499  
    44        function test()
    55        {
    6             if (window.testRunner)
    7                 testRunner.setFrameFlatteningEnabled(true);
     6            if (window.internals)
     7                internals.settings.setFrameFlatteningEnabled(true);
    88            // Force synchronous layout.
    99            document.body.offsetHeight;

  • trunk/LayoutTests/fast/frames/flattening/iframe-flattening-nested.html

    r121008 r142499  
    1010        function test()
    1111        {
    12             if (window.testRunner)
    13                 testRunner.setFrameFlatteningEnabled(true);
     12            if (window.internals)
     13                internals.settings.setFrameFlatteningEnabled(true);
    1414            // Force synchronous layout.
    1515            document.body.offsetHeight;

  • trunk/LayoutTests/fast/frames/flattening/iframe-flattening-offscreen.html

    r121008 r142499  
    44        function test()
    55        {
    6             if (window.testRunner)
    7                 testRunner.setFrameFlatteningEnabled(true);
     6            if (window.internals)
     7                internals.settings.setFrameFlatteningEnabled(true);
    88            // Force synchronous layout.
    99            document.body.offsetHeight;

  • trunk/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-and-scroll.html

    r121008 r142499  
    22<head>
    33    <script type="text/javascript">
    4         if (window.testRunner) {
     4        if (window.testRunner && window.internals) {
    55            testRunner.waitUntilDone();
    6             testRunner.setFrameFlatteningEnabled(true);
     6            internals.settings.setFrameFlatteningEnabled(true);
    77        }
    88

  • trunk/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html

    r121008 r142499  
    22<head>
    33    <script type="text/javascript">
    4         if (window.testRunner) {
     4        if (window.testRunner && window.internals) {
    55            testRunner.waitUntilDone();
    6             testRunner.setFrameFlatteningEnabled(true);
     6            internals.settings.setFrameFlatteningEnabled(true);
    77        }
    88

  • trunk/LayoutTests/fast/frames/flattening/iframe-flattening-out-of-view.html

    r121008 r142499  
    44        function test()
    55        {
    6             if (window.testRunner)
    7                 testRunner.setFrameFlatteningEnabled(true);
     6            if (window.internals)
     7                internals.settings.setFrameFlatteningEnabled(true);
    88            // Force synchronous layout.
    99            document.body.offsetHeight;

  • trunk/LayoutTests/fast/frames/flattening/iframe-flattening-selection-crash.html

    r121008 r142499  
    33    <script type="text/javascript">
    44        function test() {
    5             if (window.testRunner) {
     5            if (window.testRunner && window.internals) {
    66                testRunner.dumpAsText();
    7                 testRunner.setFrameFlatteningEnabled(true);
     7                internals.settings.setFrameFlatteningEnabled(true);
    88            }
    99

  • trunk/LayoutTests/fast/frames/flattening/iframe-flattening-simple.html

    r121008 r142499  
    44        function test()
    55        {
    6             if (window.testRunner)
    7                 testRunner.setFrameFlatteningEnabled(true);
     6            if (window.internals)
     7                internals.settings.setFrameFlatteningEnabled(true);
    88            // Force synchronous layout.
    99            document.body.offsetHeight;

  • trunk/LayoutTests/fast/frames/flattening/iframe-tiny.html

    r121008 r142499  
    66description("Test that frame flattening is not used for tiny frames. This test requires DRT or user agent with flattening enabled.");
    77
    8 if (window.testRunner)
    9     testRunner.setFrameFlatteningEnabled(true);
     8if (window.internals)
     9    internals.settings.setFrameFlatteningEnabled(true);
    1010
    1111function checkResult(frameName, expectedWidth, expectedHeight)

  • trunk/LayoutTests/fast/spatial-navigation/snav-iframe-flattening-simple.html

    r124680 r142499  
    3838    function runTest()
    3939    {
    40       if (window.testRunner)
    41         testRunner.setFrameFlatteningEnabled(true);
     40      if (window.internals)
     41        internals.settings.setFrameFlatteningEnabled(true);
    4242
    4343      // starting the test itself: get to a known place.

  • trunk/LayoutTests/fast/text-autosizing/narrow-iframe-flattened.html

    r128500 r142499  
    1515    console.warn("This test depends on the Text Autosizing setting being true, so run it in DumpRenderTree, or manually enable Text Autosizing, and either use a mobile device with 320px device-width (like Nexus S or iPhone), or define HACK_FORCE_TEXT_AUTOSIZING_ON_DESKTOP.");
    1616}
    17 if (window.testRunner)
    18     testRunner.setFrameFlatteningEnabled(true);
     17if (window.internals)
     18    internals.settings.setFrameFlatteningEnabled(true);
    1919</script>
    2020

  • trunk/LayoutTests/http/tests/misc/iframe-flattening-3level-nesting-with-blocking-resource.html

    r120167 r142499  
    22<head>
    33    <script type="text/javascript">
    4         if (window.testRunner) {
     4        if (window.testRunner && window.internals) {
    55            testRunner.waitUntilDone();
    66            testRunner.dumpAsText();
    7             testRunner.setFrameFlatteningEnabled(true);
     7            internals.settings.setFrameFlatteningEnabled(true);
    88        }
    99    </script>

  • trunk/LayoutTests/platform/chromium/TestExpectations

    r142476 r142499  
    814814fast/fast-mobile-scrolling/no-fixed-position-elements.html [ WontFix ]
    815815
    816 # Tests for frameset flattening. Relevant only on mobile browsers.
     816# Tests for frameset flattening which is not used by Chromium.
    817817fast/frames/flattening [ WontFix ]
    818818fast/text-autosizing/narrow-iframe-flattened.html [ WontFix ]

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

    r129944 r142499  
    11<html>
    22<script type="text/javascript" charset="utf-8">
    3     if (window.testRunner) {
     3    if (window.testRunner && window.internals) {
    44        testRunner.dumpAsText();
    55        testRunner.waitUntilDone();
    6         testRunner.setFrameFlatteningEnabled(true);
     6        internals.settings.setFrameFlatteningEnabled(true);
    77        testRunner.overridePreference("WebKitUsesPageCachePreferenceKey", 1);
    88        testRunner.overridePreference("WebKitPageCacheSupportsPluginsPreferenceKey", 1);

  • trunk/Source/WebKit2/ChangeLog

    r142493 r142499  
     12013-02-11  Tony Chang  <tony@chromium.org>
     2
     3        Move setFrameFlatteningEnabled from layoutTestController to window.internals.settings
     4        https://bugs.webkit.org/show_bug.cgi?id=87149
     5
     6        Reviewed by Simon Fraser.
     7
     8        * WebProcess/InjectedBundle/InjectedBundle.cpp:
     9        (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner): Add setFrameFlatteningEnabled to the list of overridable values.
     10
    1112013-02-11  Claudio Saavedra  <csaavedra@igalia.com>
    212

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

    r142348 r142499  
    203203    macro(WebKitCSSCustomFilterEnabled, CSSCustomFilterEnabled, cssCustomFilterEnabled) \
    204204    macro(WebKitCSSGridLayoutEnabled, CSSGridLayoutEnabled, cssGridLayoutEnabled) \
     205    macro(WebKitFrameFlatteningEnabled, FrameFlatteningEnabled, frameFlatteningEnabled) \
    205206    macro(WebKitJavaEnabled, JavaEnabled, javaEnabled) \
    206207    macro(WebKitJavaScriptEnabled, ScriptEnabled, javaScriptEnabled) \

  • trunk/Tools/ChangeLog

    r142495 r142499  
     12013-02-11  Tony Chang  <tony@chromium.org>
     2
     3        Move setFrameFlatteningEnabled from layoutTestController to window.internals.settings
     4        https://bugs.webkit.org/show_bug.cgi?id=87149
     5
     6        Reviewed by Simon Fraser.
     7
     8        Remove testRunner.setFrameFlatteningEnabled from DRT and WTR. WebKit API
     9        methods are left because there may be users of it. Add a test for Apple Mac
     10        to ensure that the API for the preference still works using overridePreference.
     11
     12        * DumpRenderTree/TestRunner.cpp:
     13        (TestRunner::staticFunctions):
     14        * DumpRenderTree/TestRunner.h:
     15        (TestRunner):
     16        * DumpRenderTree/blackberry/DumpRenderTree.cpp:
     17        (BlackBerry::WebKit::DumpRenderTree::resetToConsistentStateBeforeTesting):
     18        * DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp:
     19        * DumpRenderTree/efl/TestRunnerEfl.cpp:
     20        * DumpRenderTree/gtk/DumpRenderTree.cpp:
     21        (resetDefaultsToConsistentValues):
     22        * DumpRenderTree/gtk/TestRunnerGtk.cpp:
     23        * DumpRenderTree/mac/TestRunnerMac.mm:
     24        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
     25        (WebCore::WebPage::resetSettings):
     26        * DumpRenderTree/qt/TestRunnerQt.cpp:
     27        * DumpRenderTree/qt/TestRunnerQt.h:
     28        (TestRunner):
     29        * DumpRenderTree/win/DumpRenderTree.cpp:
     30        (resetDefaultsToConsistentValues):
     31        * DumpRenderTree/win/TestRunnerWin.cpp:
     32        * DumpRenderTree/wx/TestRunnerWx.cpp:
     33        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
     34        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
     35        * WebKitTestRunner/InjectedBundle/TestRunner.h:
     36        (TestRunner):
     37
    1382013-02-11  Roger Fong  <roger_fong@apple.com>
    239

  • trunk/Tools/DumpRenderTree/TestRunner.cpp

    r142348 r142499  
    12991299}
    13001300
    1301 
    1302 static JSValueRef setFrameFlatteningEnabledCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
    1303 {
    1304     // Has mac & windows implementation
    1305     if (argumentCount < 1)
    1306         return JSValueMakeUndefined(context);
    1307 
    1308     TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
    1309     controller->setFrameFlatteningEnabled(JSValueToBoolean(context, arguments[0]));
    1310 
    1311     return JSValueMakeUndefined(context);
    1312 }
    13131301
    13141302static JSValueRef setAllowUniversalAccessFromFileURLsCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
    … …  
    22262214        { "setUseDeferredFrameLoading", setUseDeferredFrameLoadingCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    22272215        { "setDomainRelaxationForbiddenForURLScheme", setDomainRelaxationForbiddenForURLSchemeCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    2228         { "setFrameFlatteningEnabled", setFrameFlatteningEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    22292216        { "setGeolocationPermission", setGeolocationPermissionCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
    22302217        { "setHandlesAuthenticationChallenges", setHandlesAuthenticationChallengesCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },

  • trunk/Tools/DumpRenderTree/TestRunner.h

    r142348 r142499  
    117117    void setViewModeMediaFeature(JSStringRef);
    118118    void setXSSAuditorEnabled(bool flag);
    119     void setFrameFlatteningEnabled(bool);
    120119    void setSpatialNavigationEnabled(bool);
    121120    void setScrollbarPolicy(JSStringRef orientation, JSStringRef policy);

  • trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp

    r140100 r142499  
    320320    settings->setStandardFontFamily("Times");
    321321    settings->setXSSAuditorEnabled(false);
    322     settings->setFrameFlatteningEnabled(false);
    323322    settings->setMaximumPagesInCache(0);
    324323    settings->setPluginsEnabled(true);

  • trunk/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp

    r142348 r142499  
    454454}
    455455
    456 void TestRunner::setFrameFlatteningEnabled(bool enable)
    457 {
    458     BlackBerry::WebKit::DumpRenderTree::currentInstance()->page()->settings()->setFrameFlatteningEnabled(enable);
    459 }
    460 
    461456void TestRunner::setSpatialNavigationEnabled(bool enable)
    462457{

  • trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp

    r142348 r142499  
    319319}
    320320
    321 void TestRunner::setFrameFlatteningEnabled(bool flag)
    322 {
    323     ewk_view_setting_enable_frame_flattening_set(browser->mainView(), flag);
    324 }
    325 
    326321void TestRunner::setSpatialNavigationEnabled(bool flag)
    327322{

  • trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp

    r140398 r142499  
    446446                 "enable-xss-auditor", FALSE,
    447447                 "enable-spatial-navigation", FALSE,
    448                  "enable-frame-flattening", FALSE,
    449448                 "javascript-can-access-clipboard", TRUE,
    450449                 "javascript-can-open-windows-automatically", TRUE,

  • trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp

    r142348 r142499  
    381381    WebKitWebSettings* settings = webkit_web_view_get_settings(view);
    382382    g_object_set(G_OBJECT(settings), "enable-xss-auditor", flag, NULL);
    383 }
    384 
    385 void TestRunner::setFrameFlatteningEnabled(bool flag)
    386 {
    387     WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
    388     ASSERT(view);
    389 
    390     WebKitWebSettings* settings = webkit_web_view_get_settings(view);
    391     g_object_set(G_OBJECT(settings), "enable-frame-flattening", flag, NULL);
    392383}
    393384

  • trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm

    r142348 r142499  
    548548}
    549549
    550 void TestRunner::setFrameFlatteningEnabled(bool enabled)
    551 {
    552     [[[mainFrame webView] preferences] setFrameFlatteningEnabled:enabled];
    553 }
    554 
    555550void TestRunner::setSpatialNavigationEnabled(bool enabled)
    556551{

  • trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

    r139437 r142499  
    193193    m_drt->testRunner()->setCaretBrowsingEnabled(false);
    194194    m_drt->testRunner()->setAuthorAndUserStylesEnabled(true);
    195     m_drt->testRunner()->setFrameFlatteningEnabled(false);
    196195    m_drt->testRunner()->setSmartInsertDeleteEnabled(true);
    197196    m_drt->testRunner()->setSelectTrailingWhitespaceEnabled(false);

  • trunk/Tools/DumpRenderTree/qt/TestRunnerQt.cpp

    r142348 r142499  
    449449{
    450450    DumpRenderTreeSupportQt::webInspectorExecuteScript(m_drt->pageAdapter(), callId, script);
    451 }
    452 
    453 void TestRunner::setFrameFlatteningEnabled(bool enabled)
    454 {
    455     DumpRenderTreeSupportQt::setFrameFlatteningEnabled(m_drt->pageAdapter(), enabled);
    456451}
    457452

  • trunk/Tools/DumpRenderTree/qt/TestRunnerQt.h

    r142348 r142499  
    160160    void evaluateInWebInspector(long callId, const QString& script);
    161161    void removeAllVisitedLinks();
    162     void setFrameFlatteningEnabled(bool);
    163162    void setAllowUniversalAccessFromFileURLs(bool enable);
    164163    void setAllowFileAccessFromFileURLs(bool enable);

  • trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp

    r139243 r142499  
    866866        prefsPrivate->setJavaScriptCanAccessClipboard(TRUE);
    867867        prefsPrivate->setXSSAuditorEnabled(FALSE);
    868         prefsPrivate->setFrameFlatteningEnabled(FALSE);
    869868        prefsPrivate->setOfflineWebApplicationCacheEnabled(TRUE);
    870869        prefsPrivate->setLoadsSiteIconsIgnoringImageLoadingPreference(FALSE);

  • trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp

    r142348 r142499  
    466466}
    467467
    468 void TestRunner::setFrameFlatteningEnabled(bool enabled)
    469 {
    470     COMPtr<IWebView> webView;
    471     if (FAILED(frame->webView(&webView)))
    472         return;
    473 
    474     COMPtr<IWebPreferences> preferences;
    475     if (FAILED(webView->preferences(&preferences)))
    476         return;
    477 
    478     COMPtr<IWebPreferencesPrivate> prefsPrivate(Query, preferences);
    479     if (!prefsPrivate)
    480         return;
    481 
    482     prefsPrivate->setFrameFlatteningEnabled(enabled);
    483 }
    484 
    485468void TestRunner::setSpatialNavigationEnabled(bool enabled)
    486469{

  • trunk/Tools/DumpRenderTree/wx/TestRunnerWx.cpp

    r142348 r142499  
    185185}
    186186
    187 void TestRunner::setFrameFlatteningEnabled(bool enabled)
    188 {
    189     // FIXME: implement
    190 }
    191 
    192187void TestRunner::setAllowUniversalAccessFromFileURLs(bool enabled)
    193188{

  • trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl

    r142348 r142499  
    5757    void setAllowUniversalAccessFromFileURLs(in boolean value);
    5858    void setAllowFileAccessFromFileURLs(in boolean value);
    59     void setFrameFlatteningEnabled(in boolean value);
    6059    void setPluginsEnabled(in boolean value);
    6160    void setJavaScriptCanAccessClipboard(in boolean value);

  • trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp

    r142348 r142499  
    351351}
    352352
    353 void TestRunner::setFrameFlatteningEnabled(bool enabled)
    354 {
    355     WKBundleSetFrameFlatteningEnabled(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), enabled);
    356 }
    357 
    358353void TestRunner::setPluginsEnabled(bool enabled)
    359354{

  • trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h

    r142348 r142499  
    101101    void setAllowUniversalAccessFromFileURLs(bool);
    102102    void setAllowFileAccessFromFileURLs(bool);
    103     void setFrameFlatteningEnabled(bool);
    104103    void setPluginsEnabled(bool);
    105104    void setJavaScriptCanAccessClipboard(bool);
Note: See TracChangeset for help on using the changeset viewer.