Changeset 141769 in webkit


Ignore:
Timestamp:
Feb 4, 2013 6:45:41 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Disable -webkit-overflow-scrolling CSS attribute on Chromium
​https://bugs.webkit.org/show_bug.cgi?id=108020

Patch by Sami Kyostila <​skyostil@chromium.org> on 2013-02-04
Reviewed by James Robinson.

Now that we can automatically promote overflow elements to accelerated
scrolling layers there is no use for the -webkit-overflow-scrolling CSS
attribute any longer on Chromium.

Source/WebKit/chromium:

This patch enables composited overflow scrolling in
ScrollingCoordinatorChromiumTest. Because this also causes the overflow div
in non-fast-scrollable.html to become composited, we also need to modify that
test to opt it out of composited scrolling.

  • features.gypi:
  • tests/ScrollingCoordinatorChromiumTest.cpp:

(WebKit::ScrollingCoordinatorChromiumTest::ScrollingCoordinatorChromiumTest):
(WebKit::TEST_F):

  • tests/data/non-fast-scrollable.html:
  • tests/data/overflow-scrolling.html: Renamed from Source/WebKit/chromium/tests/data/touch-overflow-scrolling.html.

LayoutTests:

The following tests using -webkit-overflow-scroll are modified to also call
setAcceleratedCompositingForOverflowScrollEnabled(). This makes them test
meaningful things on also on platforms that do not support that CSS attribute.

  • compositing/overflow/clipping-ancestor-with-accelerated-scrolling-ancestor.html:
  • compositing/overflow/iframe-inside-overflow-clipping.html:
  • compositing/overflow/nested-scrolling.html:
  • compositing/overflow/overflow-clip-with-accelerated-scrolling-ancestor.html:
  • compositing/overflow/scrolling-content-clip-to-viewport.html:
  • compositing/overflow/scrolling-without-painting.html:
  • compositing/overflow/textarea-scroll-touch.html:
  • compositing/overflow/updating-scrolling-content.html:
  • platform/chromium-android/compositing/layer-creation/overflow-scrolling-touch-expected.txt: Removed.
  • platform/chromium-android/compositing/layer-creation/overflow-scrolling-touch.html: Removed.
  • platform/chromium-linux/compositing/overflow/nested-scrolling-expected.png:
  • platform/chromium/TestExpectations:
  • platform/chromium/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt: Removed.
  • platform/chromium/compositing/overflow/overflow-scrolling-touch-stacking-context-expected.png: Removed.
  • platform/chromium/compositing/overflow/overflow-scrolling-touch-stacking-context-expected.txt: Removed.
  • platform/chromium/compositing/overflow/overflow-scrolling-touch-stacking-context.html: Removed.
  • platform/chromium/platform/chromium/virtual/gpu/compositedscrolling/overflow/overflow-auto-with-touch-toggle-expected.txt: Removed.
Location:
trunk
Files:
7 deleted
15 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r141767 r141769  
     12013-02-04  Sami Kyostila  <skyostil@chromium.org>
     2
     3        Disable -webkit-overflow-scrolling CSS attribute on Chromium
     4        https://bugs.webkit.org/show_bug.cgi?id=108020
     5
     6        Reviewed by James Robinson.
     7
     8        Now that we can automatically promote overflow elements to accelerated
     9        scrolling layers there is no use for the -webkit-overflow-scrolling CSS
     10        attribute any longer on Chromium.
     11
     12        The following tests using -webkit-overflow-scroll are modified to also call
     13        setAcceleratedCompositingForOverflowScrollEnabled(). This makes them test
     14        meaningful things on also on platforms that do not support that CSS attribute.
     15
     16        * compositing/overflow/clipping-ancestor-with-accelerated-scrolling-ancestor.html:
     17        * compositing/overflow/iframe-inside-overflow-clipping.html:
     18        * compositing/overflow/nested-scrolling.html:
     19        * compositing/overflow/overflow-clip-with-accelerated-scrolling-ancestor.html:
     20        * compositing/overflow/scrolling-content-clip-to-viewport.html:
     21        * compositing/overflow/scrolling-without-painting.html:
     22        * compositing/overflow/textarea-scroll-touch.html:
     23        * compositing/overflow/updating-scrolling-content.html:
     24        * platform/chromium-android/compositing/layer-creation/overflow-scrolling-touch-expected.txt: Removed.
     25        * platform/chromium-android/compositing/layer-creation/overflow-scrolling-touch.html: Removed.
     26        * platform/chromium-linux/compositing/overflow/nested-scrolling-expected.png:
     27        * platform/chromium/TestExpectations:
     28        * platform/chromium/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt: Removed.
     29        * platform/chromium/compositing/overflow/overflow-scrolling-touch-stacking-context-expected.png: Removed.
     30        * platform/chromium/compositing/overflow/overflow-scrolling-touch-stacking-context-expected.txt: Removed.
     31        * platform/chromium/compositing/overflow/overflow-scrolling-touch-stacking-context.html: Removed.
     32        * platform/chromium/platform/chromium/virtual/gpu/compositedscrolling/overflow/overflow-auto-with-touch-toggle-expected.txt: Removed.
     33
    1342013-02-04  Zoltan Arvai  <zarvai@inf.u-szeged.hu>
    235

  • trunk/LayoutTests/compositing/overflow/clipping-ancestor-with-accelerated-scrolling-ancestor.html

    r126663 r141769  
    2323    }
    2424  </style>
     25  <script>
     26    if (window.internals)
     27      window.internals.settings.setAcceleratedCompositingForOverflowScrollEnabled(true);
     28  </script>
    2529</head>
    2630

  • trunk/LayoutTests/compositing/overflow/iframe-inside-overflow-clipping.html

    r126663 r141769  
    3131    if (window.testRunner)
    3232      testRunner.dumpAsText();
     33    if (window.internals)
     34      window.internals.settings.setAcceleratedCompositingForOverflowScrollEnabled(true);
    3335  </script>
    3436</head>

  • trunk/LayoutTests/compositing/overflow/nested-scrolling.html

    r126663 r141769  
    3030    }
    3131  </style>
     32  <script>
     33    if (window.internals)
     34      window.internals.settings.setAcceleratedCompositingForOverflowScrollEnabled(true);
     35  </script>
    3236</head>
    3337<body>

  • trunk/LayoutTests/compositing/overflow/overflow-clip-with-accelerated-scrolling-ancestor.html

    r126663 r141769  
    2222    }
    2323  </style>
     24  <script>
     25    if (window.internals)
     26      window.internals.settings.setAcceleratedCompositingForOverflowScrollEnabled(true);
     27  </script>
    2428</head>
    2529

  • trunk/LayoutTests/compositing/overflow/scrolling-content-clip-to-viewport.html

    r130689 r141769  
    2929    if (window.testRunner)
    3030      testRunner.dumpAsText();
     31    if (window.internals)
     32      window.internals.settings.setAcceleratedCompositingForOverflowScrollEnabled(true);
    3133
    3234    window.addEventListener('load', function() {

  • trunk/LayoutTests/compositing/overflow/scrolling-without-painting.html

    r134628 r141769  
    2323  </style>
    2424  <script type="text/javascript">
     25      if (window.internals)
     26          window.internals.settings.setAcceleratedCompositingForOverflowScrollEnabled(true);
     27
    2528      window.addEventListener('load', function() {
    2629          if (!window.testRunner || !window.internals) {

  • trunk/LayoutTests/compositing/overflow/textarea-scroll-touch.html

    r130689 r141769  
    1919    if (window.testRunner)
    2020      testRunner.dumpAsText();
     21
     22    if (window.internals)
     23      window.internals.settings.setAcceleratedCompositingForOverflowScrollEnabled(true);
    2124
    2225    function testScrollability(element)

  • trunk/LayoutTests/compositing/overflow/updating-scrolling-content.html

    r134456 r141769  
    2727  </style>
    2828  <script type="text/javascript">
     29      if (window.internals)
     30          window.internals.settings.setAcceleratedCompositingForOverflowScrollEnabled(true);
     31
    2932      window.addEventListener('load', function() {
    3033          if (!window.testRunner || !window.internals) {

  • trunk/LayoutTests/platform/chromium/TestExpectations

    r141748 r141769  
    33253325webkit.org/b/84847 [ Win Release ] inspector/timeline/timeline-start-time.html [ Failure Pass ]
    33263326
    3327 crbug.com/128325 platform/chromium/compositing/overflow/overflow-scrolling-touch-stacking-context.html [ Failure ]
    3328 
    33293327webkit.org/b/85106 tables/mozilla/other/slashlogo.html [ Pass Slow ]
    33303328
    … …  
    36783676
    36793677# ENABLE_ACCELERATED_OVERFLOW_SCROLLING is not currently enabled in Chromium.
    3680 webkit.org/b/94353 compositing/overflow/scrolling-content-clip-to-viewport.html [ Failure ]
    3681 webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/scrolling-content-clip-to-viewport.html [ Failure ]
    3682 webkit.org/b/94353 platform/chromium/virtual/gpu/compositedscrolling/overflow/scrolling-content-clip-to-viewport.html [ Failure ]
    3683 webkit.org/b/94353 compositing/overflow/scrolling-without-painting.html [ Failure ]
    3684 webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/scrolling-without-painting.html [ Failure ]
    3685 webkit.org/b/94353 compositing/overflow/updating-scrolling-content.html [ Failure ]
    3686 webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/updating-scrolling-content.html [ Failure ]
    3687 webkit.org/b/94353 compositing/overflow/textarea-scroll-touch.html [ Failure ]
    3688 webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/textarea-scroll-touch.html [ Failure ]
    3689 
    3690 # Failing on Linux (Content Shell) only now
    3691 webkit.org/b/94353 [ Android Linux ] compositing/overflow/nested-scrolling.html [ Failure Pass ]
    3692 webkit.org/b/94353 [ Android Linux ] platform/chromium/virtual/softwarecompositing/overflow/nested-scrolling.html [ Failure Pass ]
     3678webkit.org/b/94353 compositing/overflow/overflow-auto-with-touch-toggle.html [ Failure ]
    36933679webkit.org/b/94353 compositing/overflow/overflow-auto-with-touch.html [ Failure ]
     3680webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/overflow-auto-with-touch-toggle.html [ Failure ]
    36943681webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/overflow-auto-with-touch.html [ Failure ]
    36953682webkit.org/b/94353 compositing/overflow/overflow-overlay-with-touch.html [ Failure ]
    … …  
    42024189webkit.org/b/104834 [ MountainLion ] fast/css/nested-rounded-corners.html [ Failure Pass ]
    42034190
    4204 webkit.org/b/105471 [ Win ] platform/chromium/virtual/gpu/compositedscrolling/overflow/scrolling-without-painting.html
    4205 webkit.org/b/105471 [ Win ] platform/chromium/virtual/gpu/compositedscrolling/overflow/updating-scrolling-content.html
    4206 
    42074191webkit.org/b/105595 [ Mac ] svg/text/alt-glyph-for-surrogate-pair.svg [ ImageOnlyFailure ]
    42084192webkit.org/b/47975 [ MountainLion ] fast/block/float/max-width-clear-float-with-overflow-hidden.html [ ImageOnlyFailure ]

  • trunk/Source/WebKit/chromium/ChangeLog

    r141736 r141769  
     12013-02-04  Sami Kyostila  <skyostil@chromium.org>
     2
     3        Disable -webkit-overflow-scrolling CSS attribute on Chromium
     4        https://bugs.webkit.org/show_bug.cgi?id=108020
     5
     6        Reviewed by James Robinson.
     7
     8        Now that we can automatically promote overflow elements to accelerated
     9        scrolling layers there is no use for the -webkit-overflow-scrolling CSS
     10        attribute any longer on Chromium.
     11
     12        This patch enables composited overflow scrolling in
     13        ScrollingCoordinatorChromiumTest. Because this also causes the overflow div
     14        in non-fast-scrollable.html to become composited, we also need to modify that
     15        test to opt it out of composited scrolling.
     16
     17        * features.gypi:
     18        * tests/ScrollingCoordinatorChromiumTest.cpp:
     19        (WebKit::ScrollingCoordinatorChromiumTest::ScrollingCoordinatorChromiumTest):
     20        (WebKit::TEST_F):
     21        * tests/data/non-fast-scrollable.html:
     22        * tests/data/overflow-scrolling.html: Renamed from Source/WebKit/chromium/tests/data/touch-overflow-scrolling.html.
     23
    1242013-02-03  KwangYong Choi  <ky0.choi@samsung.com>
    225

  • trunk/Source/WebKit/chromium/features.gypi

    r141614 r141769  
    164164      ['OS=="android"', {
    165165        'feature_defines': [
    166           'ENABLE_ACCELERATED_OVERFLOW_SCROLLING=1',
    167166          'ENABLE_CALENDAR_PICKER=0',
    168167          'ENABLE_DATALIST_ELEMENT=0',
    … …  
    187186      }, { # OS!="android"
    188187        'feature_defines': [
    189           'ENABLE_ACCELERATED_OVERFLOW_SCROLLING=0',
    190188          'ENABLE_CALENDAR_PICKER=1',
    191189          'ENABLE_DATALIST_ELEMENT=1',

  • trunk/Source/WebKit/chromium/tests/ScrollingCoordinatorChromiumTest.cpp

    r141428 r141769  
    4444#include <webkit/support/webkit_support.h>
    4545
    46 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
    4746#include "GraphicsLayerChromium.h"
    48 #endif
    4947
    5048using namespace WebCore;
    … …  
    9290        m_webViewImpl->settings()->setAcceleratedCompositingEnabled(true);
    9391        m_webViewImpl->settings()->setAcceleratedCompositingForFixedPositionEnabled(true);
     92        m_webViewImpl->settings()->setAcceleratedCompositingForOverflowScrollEnabled(true);
    9493        m_webViewImpl->settings()->setFixedPositionCreatesStackingContext(true);
    9594        m_webViewImpl->initializeMainFrame(&m_mockWebFrameClient);
    … …  
    209208}
    210209
    211 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
    212 TEST_F(ScrollingCoordinatorChromiumTest, touchOverflowScrolling)
    213 {
    214     registerMockedHttpURLLoad("touch-overflow-scrolling.html");
    215     navigateTo(m_baseURL + "touch-overflow-scrolling.html");
     210TEST_F(ScrollingCoordinatorChromiumTest, overflowScrolling)
     211{
     212    registerMockedHttpURLLoad("overflow-scrolling.html");
     213    navigateTo(m_baseURL + "overflow-scrolling.html");
    216214
    217215    // Verify the properties of the accelerated scrolling element starting from the RenderObject
    … …  
    238236    ASSERT_TRUE(webScrollLayer->scrollable());
    239237}
    240 #endif // ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
    241238
    242239} // namespace

  • trunk/Source/WebKit/chromium/tests/data/non-fast-scrollable.html

    r129225 r141769  
    33<head>
    44  <style type="text/css">
    5     .scrollable {
     5    .box {
    66      width: 10px;
    77      height: 10px;
     8    }
     9    .scrollable {
    810      overflow: scroll;
     11    }
     12    .out-of-flow {
     13      position: absolute;
    914    }
    1015  </style>
    … …  
    1217
    1318<body>
    14   <div class="scrollable">
     19  <div class="scrollable box">
    1520    Scrolling content.
     21    <div class="out-of-flow box">Out-of-flow content.</div>
    1622  </div>
    1723</body>

  • trunk/Source/WebKit/chromium/tests/data/overflow-scrolling.html

    r141768 r141769  
    77      height: 10px;
    88      overflow: scroll;
    9       -webkit-overflow-scrolling: touch;
    109    }
    1110    .content {
Note: See TracChangeset for help on using the changeset viewer.