Changeset 167732 in webkit


Ignore:
Timestamp:
Apr 23, 2014 5:32:14 PM (10 years ago)
Author:
ap@apple.com
Message:

Eliminate internals.setMockScrollbarsEnabled()
​https://bugs.webkit.org/show_bug.cgi?id=132085

Reviewed by Tim Horton.

Source/WebCore:
This was essentially unused, and also didnt work.

  • testing/InternalSettings.cpp:

(WebCore::InternalSettings::Backup::restoreTo):
(WebCore::InternalSettings::setMockScrollbarsEnabled): Deleted.

  • testing/InternalSettings.h:
  • testing/InternalSettings.idl:

Tools:

  • DumpRenderTree/mac/DumpRenderTree.mm: (resetWebPreferencesToConsistentValues):

No need to reset the preference, there is no way it can change.

LayoutTests:
Remove calls, all of which were resetting it to true (which is the default, and
the only value that makes sense).

  • compositing/geometry/fixed-position.html:
  • compositing/geometry/horizontal-scroll-composited.html:
  • compositing/geometry/vertical-scroll-composited.html:
  • compositing/iframes/resources/scrollgrandchild-inner.html:
  • compositing/overflow/fixed-position-ancestor-clip.html:
  • compositing/resources/mock_scrollbars.js: Removed.
  • css3/filters/blur-filter-page-scroll-parents.html:
  • css3/filters/blur-filter-page-scroll-self.html:
  • css3/filters/blur-filter-page-scroll.html:
  • fast/dom/window-scroll-scaling.html:
  • fast/events/touch/gesture/gesture-scrollbar.html:
  • fast/sub-pixel/sub-pixel-iframe-copy-on-scroll.html:
  • fast/sub-pixel/transformed-iframe-copy-on-scroll.html:
  • media/video-controls-rendering.html:
  • media/video-zoom.html:
  • scrollingcoordinator/resources/non-fast-scrollable-region-testing.js:
Location:
trunk
Files:
1 deleted
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r167718 r167732  
     12014-04-23  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Eliminate internals.setMockScrollbarsEnabled()
     4        https://bugs.webkit.org/show_bug.cgi?id=132085
     5
     6        Reviewed by Tim Horton.
     7
     8        Remove calls, all of which were resetting it to true (which is the default, and
     9        the only value that makes sense).
     10
     11        * compositing/geometry/fixed-position.html:
     12        * compositing/geometry/horizontal-scroll-composited.html:
     13        * compositing/geometry/vertical-scroll-composited.html:
     14        * compositing/iframes/resources/scrollgrandchild-inner.html:
     15        * compositing/overflow/fixed-position-ancestor-clip.html:
     16        * compositing/resources/mock_scrollbars.js: Removed.
     17        * css3/filters/blur-filter-page-scroll-parents.html:
     18        * css3/filters/blur-filter-page-scroll-self.html:
     19        * css3/filters/blur-filter-page-scroll.html:
     20        * fast/dom/window-scroll-scaling.html:
     21        * fast/events/touch/gesture/gesture-scrollbar.html:
     22        * fast/sub-pixel/sub-pixel-iframe-copy-on-scroll.html:
     23        * fast/sub-pixel/transformed-iframe-copy-on-scroll.html:
     24        * media/video-controls-rendering.html:
     25        * media/video-zoom.html:
     26        * scrollingcoordinator/resources/non-fast-scrollable-region-testing.js:
     27
    1282014-04-23  David Hyatt  <hyatt@apple.com>
    229

  • trunk/LayoutTests/compositing/geometry/fixed-position.html

    r100545 r167732  
    66  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
    77  <title>Position fixed</title>
    8   <script src="../resources/mock_scrollbars.js"></script>
    98  <style type="text/css" media="screen">
    109    body {

  • trunk/LayoutTests/compositing/geometry/horizontal-scroll-composited.html

    r119992 r167732  
    66        testRunner.waitUntilDone();
    77    </script>
    8     <script src="../resources/mock_scrollbars.js"></script>
    98</head>
    109<body style="width: 600px">

  • trunk/LayoutTests/compositing/geometry/vertical-scroll-composited.html

    r119992 r167732  
    66        testRunner.waitUntilDone();
    77    </script>
    8     <script src="../resources/mock_scrollbars.js"></script>
    98</head>
    109<body style="height: 600px">

  • trunk/LayoutTests/compositing/iframes/resources/scrollgrandchild-inner.html

    r119992 r167732  
    2323  </style>
    2424  <script>
    25     if (window.internals)
    26       window.internals.settings.setMockScrollbarsEnabled(true);
    2725    if (window.testRunner) {
    2826      testRunner.dumpAsText(true);

  • trunk/LayoutTests/compositing/overflow/fixed-position-ancestor-clip.html

    r100545 r167732  
    3535    }, false);
    3636  </script>
    37   <script src="../resources/mock_scrollbars.js"></script>
    3837</head>
    3938<body>

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

    r122130 r167732  
    1313            }
    1414        </script>
    15         <!-- Make sure the mock scrollbars are enabled after the call to overridePreference, otherwise the setting will be overwritten. -->
    16         <script src="../../compositing/resources/mock_scrollbars.js"></script>
    1715        <style>
    1816            body {

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

    r122130 r167732  
    1313            }
    1414        </script>
    15         <!-- Make sure the mock scrollbars are enabled after the call to overridePreference, otherwise the setting will be overwritten. -->
    16         <script src="../../compositing/resources/mock_scrollbars.js"></script>
    1715        <style>
    1816            body {

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

    r121348 r167732  
    1313            }
    1414        </script>
    15         <!-- Make sure the mock scrollbars are enabled after the call to overridePreference, otherwise the setting will be overwritten. -->
    16         <script src="../../compositing/resources/mock_scrollbars.js"></script>
    1715        <style>
    1816            body {

  • trunk/LayoutTests/fast/dom/window-scroll-scaling.html

    r155265 r167732  
    44    <script>
    55        description("This test ensures that document content width (height) as reported by scrollWidth (scrollHeight) is invariant to changes in page scale factor.");
    6 
    7         if (window.internals)
    8             window.internals.settings.setMockScrollbarsEnabled(true);
    96
    107        var body = document.body;

  • trunk/LayoutTests/fast/events/touch/gesture/gesture-scrollbar.html

    r155267 r167732  
    6565function runTest()
    6666{
    67     internals.settings.setMockScrollbarsEnabled(true);
    6867    if (window.eventSender) {
    6968        description('This tests scroll gesture events on a scroll bar. ' +

  • trunk/LayoutTests/fast/sub-pixel/sub-pixel-iframe-copy-on-scroll.html

    r137945 r167732  
    1313<script src="../repaint/resources/repaint.js" type="text/javascript"></script>
    1414<script>
    15 if (window.testRunner) {
     15if (window.testRunner)
    1616  testRunner.waitUntilDone();
    17   internals.settings.setMockScrollbarsEnabled(true);
    18 }
    1917
    2018function setupIframes() {

  • trunk/LayoutTests/fast/sub-pixel/transformed-iframe-copy-on-scroll.html

    r137945 r167732  
    1919<script src="../repaint/resources/repaint.js" type="text/javascript"></script>
    2020<script>
    21 if (window.testRunner) {
     21if (window.testRunner)
    2222  testRunner.waitUntilDone();
    23   internals.settings.setMockScrollbarsEnabled(true);
    24 }
    2523
    2624function setupIframes() {

  • trunk/LayoutTests/media/video-controls-rendering.html

    r107740 r167732  
    1313</div>
    1414<script>
    15 if (window.internals)
    16     window.internals.settings.setMockScrollbarsEnabled(true);
    1715init();
    1816setSrcByTagName('video', findMediaFile('video', 'content/test'));

  • trunk/LayoutTests/media/video-zoom.html

    r120416 r167732  
    44    <script src=media-file.js></script>
    55    <script>
    6         if (window.internals)
    7             window.internals.settings.setMockScrollbarsEnabled(true);
    8 
    96        function init()
    107        {

  • trunk/LayoutTests/scrollingcoordinator/resources/non-fast-scrollable-region-testing.js

    r158113 r167732  
    11function runNonFastScrollableRegionTest(scale) {
    22    var invScale;
    3     window.internals.settings.setMockScrollbarsEnabled(true);
    43    if (scale != undefined) {
    54        window.internals.setPageScaleFactor(scale, 0, 0);

  • trunk/Source/WebCore/ChangeLog

    r167730 r167732  
     12014-04-23  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Eliminate internals.setMockScrollbarsEnabled()
     4        https://bugs.webkit.org/show_bug.cgi?id=132085
     5
     6        Reviewed by Tim Horton.
     7
     8        This was essentially unused, and also didnt work.
     9
     10        * testing/InternalSettings.cpp:
     11        (WebCore::InternalSettings::Backup::restoreTo):
     12        (WebCore::InternalSettings::setMockScrollbarsEnabled): Deleted.
     13        * testing/InternalSettings.h:
     14        * testing/InternalSettings.idl:
     15
    1162014-04-23  Anders Carlsson  <andersca@apple.com>
    217

  • trunk/Source/WebCore/testing/InternalSettings.cpp

    r166459 r167732  
    136136    settings.setMediaTypeOverride(m_originalMediaTypeOverride);
    137137    settings.setCanvasUsesAcceleratedDrawing(m_originalCanvasUsesAcceleratedDrawing);
    138     settings.setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled);
    139138    RuntimeEnabledFeatures::sharedFeatures().setLangAttributeAwareFormControlUIEnabled(m_langAttributeAwareFormControlUIEnabled);
    140139    settings.setImagesEnabled(m_imagesEnabled);
    … …  
    211210}
    212211
    213 void InternalSettings::setMockScrollbarsEnabled(bool enabled, ExceptionCode& ec)
    214 {
    215     InternalSettingsGuardForSettings();
    216     settings()->setMockScrollbarsEnabled(enabled);
    217 }
    218 
    219212void InternalSettings::setTouchEventEmulationEnabled(bool enabled, ExceptionCode& ec)
    220213{

  • trunk/Source/WebCore/testing/InternalSettings.h

    r166459 r167732  
    101101    void resetToConsistentState();
    102102
    103     void setMockScrollbarsEnabled(bool enabled, ExceptionCode&);
    104103    void setUsesOverlayScrollbars(bool enabled, ExceptionCode&);
    105104    void setTouchEventEmulationEnabled(bool enabled, ExceptionCode&);

  • trunk/Source/WebCore/testing/InternalSettings.idl

    r166459 r167732  
    2828    JSGenerateToJSObject
    2929] interface InternalSettings : InternalSettingsGenerated {
    30     [RaisesException] void setMockScrollbarsEnabled(boolean enabled);
    3130    [RaisesException] void setTouchEventEmulationEnabled(boolean enabled);
    3231    [RaisesException] void setStandardFontFamily(DOMString family, DOMString script);

  • trunk/Tools/ChangeLog

    r167731 r167732  
     12014-04-23  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Eliminate internals.setMockScrollbarsEnabled()
     4        https://bugs.webkit.org/show_bug.cgi?id=132085
     5
     6        Reviewed by Tim Horton.
     7
     8        * DumpRenderTree/mac/DumpRenderTree.mm: (resetWebPreferencesToConsistentValues):
     9        No need to reset the preference, there is no way it can change.
     10
    1112014-04-23  James Craig  <jcraig@apple.com>
    212

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

    r167728 r167732  
    882882    [preferences setUsePreHTML5ParserQuirks:NO];
    883883    [preferences setAsynchronousSpellCheckingEnabled:NO];
    884     [preferences setMockScrollbarsEnabled:YES];
     884    ASSERT([preferences mockScrollbarsEnabled]);
    885885
    886886#if ENABLE(WEB_AUDIO)
Note: See TracChangeset for help on using the changeset viewer.