• tony@chromium.org's avatar
    Move setFrameFlatteningEnabled from layoutTestController to window.internals.settings · 13de1bba
    tony@chromium.org authored
    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:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@142499 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    13de1bba
frameset-with-plugin-frame.html 606 Bytes