Disable -webkit-overflow-scrolling CSS attribute on Chromium
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 4 Feb 2013 14:45:41 +0000 (14:45 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 4 Feb 2013 14:45:41 +0000 (14:45 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@141769 268f45cc-cd09-0410-ab3c-d52691b4dbfc

23 files changed:
LayoutTests/ChangeLog
LayoutTests/compositing/overflow/clipping-ancestor-with-accelerated-scrolling-ancestor.html
LayoutTests/compositing/overflow/iframe-inside-overflow-clipping.html
LayoutTests/compositing/overflow/nested-scrolling.html
LayoutTests/compositing/overflow/overflow-clip-with-accelerated-scrolling-ancestor.html
LayoutTests/compositing/overflow/scrolling-content-clip-to-viewport.html
LayoutTests/compositing/overflow/scrolling-without-painting.html
LayoutTests/compositing/overflow/textarea-scroll-touch.html
LayoutTests/compositing/overflow/updating-scrolling-content.html
LayoutTests/platform/chromium-android/compositing/layer-creation/overflow-scrolling-touch-expected.txt [deleted file]
LayoutTests/platform/chromium-android/compositing/layer-creation/overflow-scrolling-touch.html [deleted file]
LayoutTests/platform/chromium-linux/compositing/overflow/nested-scrolling-expected.png
LayoutTests/platform/chromium/TestExpectations
LayoutTests/platform/chromium/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt [deleted file]
LayoutTests/platform/chromium/compositing/overflow/overflow-scrolling-touch-stacking-context-expected.png [deleted file]
LayoutTests/platform/chromium/compositing/overflow/overflow-scrolling-touch-stacking-context-expected.txt [deleted file]
LayoutTests/platform/chromium/compositing/overflow/overflow-scrolling-touch-stacking-context.html [deleted file]
LayoutTests/platform/chromium/platform/chromium/virtual/gpu/compositedscrolling/overflow/overflow-auto-with-touch-toggle-expected.txt [deleted file]
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/features.gypi
Source/WebKit/chromium/tests/ScrollingCoordinatorChromiumTest.cpp
Source/WebKit/chromium/tests/data/non-fast-scrollable.html
Source/WebKit/chromium/tests/data/overflow-scrolling.html [moved from Source/WebKit/chromium/tests/data/touch-overflow-scrolling.html with 88% similarity]

index 73c3575750f669d3dbf5e11127c2f179afcbc3b0..de0e4342dd87f059be708f689acb68dbf500de37 100644 (file)
@@ -1,3 +1,36 @@
+2013-02-04  Sami Kyostila  <skyostil@chromium.org>
+
+        Disable -webkit-overflow-scrolling CSS attribute on Chromium
+        https://bugs.webkit.org/show_bug.cgi?id=108020
+
+        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.
+
+        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.
+
 2013-02-04  Zoltan Arvai  <zarvai@inf.u-szeged.hu>
 
         [Qt] Unreviewed gardening. Skipping failing tests.
index 242a22bb02e54836c36fcac9e564d2ec6272ce67..f235fc57becb9f23bf846f3d4d2d7bb213001864 100644 (file)
       height: 100px;
     }
   </style>
+  <script>
+    if (window.internals)
+      window.internals.settings.setAcceleratedCompositingForOverflowScrollEnabled(true);
+  </script>
 </head>
 
 <body>
index 69d2f32a39a46de66c5b45405acf555b4842fe19..5dd29fc386e709713a9cf29e6eafb896c13c56bc 100644 (file)
@@ -30,6 +30,8 @@
   <script>
     if (window.testRunner)
       testRunner.dumpAsText();
+    if (window.internals)
+      window.internals.settings.setAcceleratedCompositingForOverflowScrollEnabled(true);
   </script>
 </head>
 
index 415c94acd0ae15aa824817d649e3217b2453a922..d1fb9729267af971b7ca66296c89a943838f53da 100644 (file)
       margin-bottom: 3em;
     }
   </style>
+  <script>
+    if (window.internals)
+      window.internals.settings.setAcceleratedCompositingForOverflowScrollEnabled(true);
+  </script>
 </head>
 <body>
 
index 8659c676443afd53f07d496a1dcda950cd7ee0a0..969ae04f0cfa1ea476fe95a90929451c173d1eb1 100644 (file)
       background-color: red;
     }
   </style>
+  <script>
+    if (window.internals)
+      window.internals.settings.setAcceleratedCompositingForOverflowScrollEnabled(true);
+  </script>
 </head>
 
 <body>
index 014001e4d0d87a080aca64abb642fc5f88faf195..2c9b638c4bbf945f3f278c8b38814442bca6405d 100644 (file)
@@ -28,6 +28,8 @@
   <script>
     if (window.testRunner)
       testRunner.dumpAsText();
+    if (window.internals)
+      window.internals.settings.setAcceleratedCompositingForOverflowScrollEnabled(true);
 
     window.addEventListener('load', function() {
       if (window.testRunner)
index e058472d0b33f298503f6f4f2e6dd55effa6eeca..fbe855d4b33f0bdc33b719f814bd256bbaa3ca24 100644 (file)
@@ -22,6 +22,9 @@ repainting their contents. See https://bugs.webkit.org/show_bug.cgi?id=96087.
     }
   </style>
   <script type="text/javascript">
+      if (window.internals)
+          window.internals.settings.setAcceleratedCompositingForOverflowScrollEnabled(true);
+
       window.addEventListener('load', function() {
           if (!window.testRunner || !window.internals) {
               alert('This test requires testRunner to run!');
index 88c4bc152bf78e64224440d44548aca9255a8282..dfd2b34c652222b5b27625158cfce9b01f808447 100644 (file)
@@ -19,6 +19,9 @@
     if (window.testRunner)
       testRunner.dumpAsText();
 
+    if (window.internals)
+      window.internals.settings.setAcceleratedCompositingForOverflowScrollEnabled(true);
+
     function testScrollability(element)
     {
       // This will cause scrollable element content layers to be offset by y=50 with respect to their scrolling container.
index 47190f8a1554340aca0290d29310a90cb85cea01..1b9189fd02c51313c604833cdeec6ec2af199676 100644 (file)
@@ -26,6 +26,9 @@ https://bugs.webkit.org/show_bug.cgi?id=100524.
     }
   </style>
   <script type="text/javascript">
+      if (window.internals)
+          window.internals.settings.setAcceleratedCompositingForOverflowScrollEnabled(true);
+
       window.addEventListener('load', function() {
           if (!window.testRunner || !window.internals) {
               alert('This test requires testRunner to run!');
diff --git a/LayoutTests/platform/chromium-android/compositing/layer-creation/overflow-scrolling-touch-expected.txt b/LayoutTests/platform/chromium-android/compositing/layer-creation/overflow-scrolling-touch-expected.txt
deleted file mode 100644 (file)
index 73ebc0c..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (children 2
-        (GraphicsLayer
-          (position 8.00 8.00)
-          (bounds 200.00 200.00)
-          (drawsContent 1)
-        )
-        (GraphicsLayer
-          (bounds 200.00 200.00)
-          (drawsContent 1)
-          (children 4
-            (GraphicsLayer
-              (bounds 200.00 200.00)
-              (children 1
-                (GraphicsLayer
-                  (bounds 1050.00 1050.00)
-                  (drawsContent 1)
-                )
-              )
-            )
-            (GraphicsLayer
-              (position 0.00 185.00)
-              (bounds 185.00 15.00)
-              (drawsContent 1)
-            )
-            (GraphicsLayer
-              (position 185.00 0.00)
-              (bounds 15.00 185.00)
-              (drawsContent 1)
-            )
-            (GraphicsLayer
-              (position 185.00 185.00)
-              (bounds 15.00 15.00)
-              (drawsContent 1)
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/chromium-android/compositing/layer-creation/overflow-scrolling-touch.html b/LayoutTests/platform/chromium-android/compositing/layer-creation/overflow-scrolling-touch.html
deleted file mode 100644 (file)
index 22a59e3..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <style>
-    .trigger {
-      width: 200px;
-      height: 200px;
-      background-color: blue;
-      -webkit-transform: translateZ(0);
-    }
-
-    .overflow-scrolling-touch {
-      width: 200px;
-      height: 200px;
-      position: absolute;
-      top: 0px;
-      left: 0px;
-      overflow: scroll;
-      -webkit-overflow-scrolling: touch;
-      background-color: blue;
-    }
-
-    .content {
-      width: 1000px;
-      height: 1000px;
-      position: relative;
-      top: 50px;
-      left: 50px;
-      background-color: green;
-    }
-  </style>
-
-  <script type="text/javascript" charset="utf-8">
-    if (window.layoutTestController) {
-      layoutTestController.dumpAsText();
-      layoutTestController.waitUntilDone();
-    }
-
-    function doTest()
-    {
-      if (window.layoutTestController) {
-        document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
-        layoutTestController.notifyDone();
-      }
-    }
-
-    window.addEventListener('load', doTest, false);
-  </script>
-</head>
-
-<body>
-  <div class="trigger"></div>
-
-  <div class="overflow-scrolling-touch">
-    <div class="content"></div>
-  </div>
-
-  <pre id="layers">Layer tree goes here in DRT</pre>
-</body>
-</html>
-
index 662665585c56b6d39c39368fb9d59328042f748d..4c4da666b8d04725aaa478b540fa4f6813db3501 100644 (file)
Binary files a/LayoutTests/platform/chromium-linux/compositing/overflow/nested-scrolling-expected.png and b/LayoutTests/platform/chromium-linux/compositing/overflow/nested-scrolling-expected.png differ
index 5e717b648a9b3509330f4834596d0ffca751c38b..0d5335b18788fd7885c3c6c12babd00d46233561 100644 (file)
@@ -3324,8 +3324,6 @@ webkit.org/b/84802 [ Mac Win Debug ] fast/js/random-array-gc-stress.html [ Pass
 
 webkit.org/b/84847 [ Win Release ] inspector/timeline/timeline-start-time.html [ Failure Pass ]
 
-crbug.com/128325 platform/chromium/compositing/overflow/overflow-scrolling-touch-stacking-context.html [ Failure ]
-
 webkit.org/b/85106 tables/mozilla/other/slashlogo.html [ Pass Slow ]
 
 webkit.org/b/85174 fast/files/blob-constructor.html [ Failure ]
@@ -3677,20 +3675,9 @@ webkit.org/b/95581 http/tests/misc/javascript-url-stop-loaders.html [ Pass Timeo
 webkit.org/b/99734 [ Mac ] http/tests/xmlhttprequest/request-encoding2.html [ Pass Timeout ]
 
 # ENABLE_ACCELERATED_OVERFLOW_SCROLLING is not currently enabled in Chromium.
-webkit.org/b/94353 compositing/overflow/scrolling-content-clip-to-viewport.html [ Failure ]
-webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/scrolling-content-clip-to-viewport.html [ Failure ]
-webkit.org/b/94353 platform/chromium/virtual/gpu/compositedscrolling/overflow/scrolling-content-clip-to-viewport.html [ Failure ]
-webkit.org/b/94353 compositing/overflow/scrolling-without-painting.html [ Failure ]
-webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/scrolling-without-painting.html [ Failure ]
-webkit.org/b/94353 compositing/overflow/updating-scrolling-content.html [ Failure ]
-webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/updating-scrolling-content.html [ Failure ]
-webkit.org/b/94353 compositing/overflow/textarea-scroll-touch.html [ Failure ]
-webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/textarea-scroll-touch.html [ Failure ]
-
-# Failing on Linux (Content Shell) only now
-webkit.org/b/94353 [ Android Linux ] compositing/overflow/nested-scrolling.html [ Failure Pass ]
-webkit.org/b/94353 [ Android Linux ] platform/chromium/virtual/softwarecompositing/overflow/nested-scrolling.html [ Failure Pass ]
+webkit.org/b/94353 compositing/overflow/overflow-auto-with-touch-toggle.html [ Failure ]
 webkit.org/b/94353 compositing/overflow/overflow-auto-with-touch.html [ Failure ]
+webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/overflow-auto-with-touch-toggle.html [ Failure ]
 webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/overflow-auto-with-touch.html [ Failure ]
 webkit.org/b/94353 compositing/overflow/overflow-overlay-with-touch.html [ Failure ]
 webkit.org/b/94353 platform/chromium/virtual/softwarecompositing/overflow/overflow-overlay-with-touch.html [ Failure ]
@@ -4201,9 +4188,6 @@ webkit.org/b/103667 [ Linux ] fast/ruby/position-after.html [ ImageOnlyFailure ]
 
 webkit.org/b/104834 [ MountainLion ] fast/css/nested-rounded-corners.html [ Failure Pass ]
 
-webkit.org/b/105471 [ Win ] platform/chromium/virtual/gpu/compositedscrolling/overflow/scrolling-without-painting.html
-webkit.org/b/105471 [ Win ] platform/chromium/virtual/gpu/compositedscrolling/overflow/updating-scrolling-content.html
-
 webkit.org/b/105595 [ Mac ] svg/text/alt-glyph-for-surrogate-pair.svg [ ImageOnlyFailure ]
 webkit.org/b/47975 [ MountainLion ] fast/block/float/max-width-clear-float-with-overflow-hidden.html [ ImageOnlyFailure ]
 
diff --git a/LayoutTests/platform/chromium/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt b/LayoutTests/platform/chromium/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt
deleted file mode 100644 (file)
index 8b13789..0000000
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/LayoutTests/platform/chromium/compositing/overflow/overflow-scrolling-touch-stacking-context-expected.png b/LayoutTests/platform/chromium/compositing/overflow/overflow-scrolling-touch-stacking-context-expected.png
deleted file mode 100644 (file)
index 47aed3c..0000000
Binary files a/LayoutTests/platform/chromium/compositing/overflow/overflow-scrolling-touch-stacking-context-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium/compositing/overflow/overflow-scrolling-touch-stacking-context-expected.txt b/LayoutTests/platform/chromium/compositing/overflow/overflow-scrolling-touch-stacking-context-expected.txt
deleted file mode 100644 (file)
index e8596e2..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x8
-  RenderBlock {HTML} at (0,0) size 800x8
-    RenderBody {BODY} at (8,8) size 784x0
-layer at (8,8) size 50x50
-  RenderBlock (positioned) {DIV} at (8,8) size 50x50
-layer at (8,8) size 50x50
-  RenderBlock (positioned) zI: 1 {DIV} at (0,0) size 50x50 [bgcolor=#FF0000]
-layer at (8,8) size 50x50
-  RenderBlock (positioned) {DIV} at (8,8) size 50x50 [bgcolor=#008000]
diff --git a/LayoutTests/platform/chromium/compositing/overflow/overflow-scrolling-touch-stacking-context.html b/LayoutTests/platform/chromium/compositing/overflow/overflow-scrolling-touch-stacking-context.html
deleted file mode 100644 (file)
index 9c48d2c..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-  <style type="text/css">
-    .box {
-      position: absolute;
-      width: 50px;
-      height: 50px;
-    }
-
-    .scrollable {
-      -webkit-overflow-scrolling: touch;
-    }
-
-    .indicator {
-      background: red;
-      z-index: 1;
-    }
-
-    .test {
-      background: green;
-    }
-  </style>
-</head>
-<body>
-
-  <!-- Check that touch overflow scrollable elements get a stacking context. -->
-  <div class="scrollable box">
-    <div class="indicator box"></div>
-  </div>
-  <div class="test box"></div>
-
-</body>
-</html>
diff --git a/LayoutTests/platform/chromium/platform/chromium/virtual/gpu/compositedscrolling/overflow/overflow-auto-with-touch-toggle-expected.txt b/LayoutTests/platform/chromium/platform/chromium/virtual/gpu/compositedscrolling/overflow/overflow-auto-with-touch-toggle-expected.txt
deleted file mode 100644 (file)
index e2d3f19..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (children 1
-        (GraphicsLayer
-          (position 8.00 8.00)
-          (bounds 300.00 300.00)
-          (children 4
-            (GraphicsLayer
-              (bounds 300.00 300.00)
-              (children 1
-                (GraphicsLayer
-                  (bounds 1000.00 1000.00)
-                  (drawsContent 1)
-                )
-              )
-            )
-            (GraphicsLayer
-              (position 0.00 285.00)
-              (bounds 285.00 15.00)
-              (drawsContent 1)
-            )
-            (GraphicsLayer
-              (position 285.00 0.00)
-              (bounds 15.00 285.00)
-              (drawsContent 1)
-            )
-            (GraphicsLayer
-              (position 285.00 285.00)
-              (bounds 15.00 15.00)
-              (drawsContent 1)
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
index cbfea16e07288cea783c3284e123d562b347f565..fc77211d629b1ebbe7292856cfe223b2ba73ef82 100644 (file)
@@ -1,3 +1,26 @@
+2013-02-04  Sami Kyostila  <skyostil@chromium.org>
+
+        Disable -webkit-overflow-scrolling CSS attribute on Chromium
+        https://bugs.webkit.org/show_bug.cgi?id=108020
+
+        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.
+
+        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.
+
 2013-02-03  KwangYong Choi  <ky0.choi@samsung.com>
 
         Fix build warning after r141473
index 629510adb9ef2fc4208f57b1fa58418b18944d3f..4b8d6ed367fc5ceb4791f9d8637d949c5166134e 100644 (file)
     'conditions': [
       ['OS=="android"', {
         'feature_defines': [
-          'ENABLE_ACCELERATED_OVERFLOW_SCROLLING=1',
           'ENABLE_CALENDAR_PICKER=0',
           'ENABLE_DATALIST_ELEMENT=0',
           'ENABLE_FAST_MOBILE_SCROLLING=1',
         'enable_touch_icon_loading': 1,
       }, { # OS!="android"
         'feature_defines': [
-          'ENABLE_ACCELERATED_OVERFLOW_SCROLLING=0',
           'ENABLE_CALENDAR_PICKER=1',
           'ENABLE_DATALIST_ELEMENT=1',
           'ENABLE_INPUT_SPEECH=1',
index 55b0b390f45b001b5a5480c8d1e038f3087fdbd3..0d785901433d1952fc7730e72b4cdff81a117b20 100644 (file)
@@ -43,9 +43,7 @@
 #include <public/WebLayer.h>
 #include <webkit/support/webkit_support.h>
 
-#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
 #include "GraphicsLayerChromium.h"
-#endif
 
 using namespace WebCore;
 using namespace WebKit;
@@ -91,6 +89,7 @@ public:
         m_webViewImpl->settings()->setForceCompositingMode(true);
         m_webViewImpl->settings()->setAcceleratedCompositingEnabled(true);
         m_webViewImpl->settings()->setAcceleratedCompositingForFixedPositionEnabled(true);
+        m_webViewImpl->settings()->setAcceleratedCompositingForOverflowScrollEnabled(true);
         m_webViewImpl->settings()->setFixedPositionCreatesStackingContext(true);
         m_webViewImpl->initializeMainFrame(&m_mockWebFrameClient);
         m_webViewImpl->resize(IntSize(320, 240));
@@ -208,11 +207,10 @@ TEST_F(ScrollingCoordinatorChromiumTest, clippedBodyTest)
     ASSERT_EQ(0u, rootScrollLayer->nonFastScrollableRegion().size());
 }
 
-#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
-TEST_F(ScrollingCoordinatorChromiumTest, touchOverflowScrolling)
+TEST_F(ScrollingCoordinatorChromiumTest, overflowScrolling)
 {
-    registerMockedHttpURLLoad("touch-overflow-scrolling.html");
-    navigateTo(m_baseURL + "touch-overflow-scrolling.html");
+    registerMockedHttpURLLoad("overflow-scrolling.html");
+    navigateTo(m_baseURL + "overflow-scrolling.html");
 
     // Verify the properties of the accelerated scrolling element starting from the RenderObject
     // all the way to the WebLayer.
@@ -237,6 +235,5 @@ TEST_F(ScrollingCoordinatorChromiumTest, touchOverflowScrolling)
     WebLayer* webScrollLayer = static_cast<WebLayer*>(layerBacking->scrollingContentsLayer()->platformLayer());
     ASSERT_TRUE(webScrollLayer->scrollable());
 }
-#endif // ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
 
 } // namespace
index b633d254d7cf852e9c9e5a8938416fa1a23f4b40..c24cb3a86553deaf5301627fa6f54ffb99536ed8 100644 (file)
@@ -2,17 +2,23 @@
 <html>
 <head>
   <style type="text/css">
-    .scrollable {
+    .box {
       width: 10px;
       height: 10px;
+    }
+    .scrollable {
       overflow: scroll;
     }
+    .out-of-flow {
+      position: absolute;
+    }
   </style>
 </head>
 
 <body>
-  <div class="scrollable">
+  <div class="scrollable box">
     Scrolling content.
+    <div class="out-of-flow box">Out-of-flow content.</div>
   </div>
 </body>
 </html>
similarity index 88%
rename from Source/WebKit/chromium/tests/data/touch-overflow-scrolling.html
rename to Source/WebKit/chromium/tests/data/overflow-scrolling.html
index 25972aa2ed4f104ae17401d64b1d06648c74cbba..93cf9e5c3dd18b22b08de41ae5ffc800631da53f 100644 (file)
@@ -6,7 +6,6 @@
       width: 10px;
       height: 10px;
       overflow: scroll;
-      -webkit-overflow-scrolling: touch;
     }
     .content {
       width: 100px;