Merge 141769

LayoutTests/ChangeLog

Index: LayoutTests/ChangeLog
===================================================================
--- LayoutTests/ChangeLog	(revision 142279)
+++ LayoutTests/ChangeLog	(working copy)
@@ -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-01-29  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 
         REGRESSION: ChildrenAffectedBy flags lost between siblings which have child elements sharing style