Merge AcceleratedCompositingForOverflowScroll into PreferCompositingToLCDText.

Tools/Scripts/webkitpy/layout_tests/port/base.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 1517 matching lines @@
             VirtualTestSuite('deferred',
                              'fast/images',
                              ['--enable-deferred-image-decoding',
                               '--enable-per-tile-painting']),
             VirtualTestSuite('deferred',
                              'inspector/timeline',
                              ['--enable-deferred-image-decoding',
                               '--enable-per-tile-painting']),
             VirtualTestSuite('gpu/compositedscrolling/overflow',
                              'compositing/overflow',
-                             ['--enable-accelerated-overflow-scroll'],
+                             ['--enable-prefer-compositing-to-lcd-text'],
                              use_legacy_naming=True),
             VirtualTestSuite('gpu/compositedscrolling/scrollbars',
                              'scrollbars',
-                             ['--enable-accelerated-overflow-scroll'],
+                             ['--enable-prefer-compositing-to-lcd-text'],
                              use_legacy_naming=True),
             VirtualTestSuite('threaded',
                              'animations',
                              ['--enable-threaded-compositing']),
             VirtualTestSuite('threaded',
                              'transitions',
                              ['--enable-threaded-compositing']),
             VirtualTestSuite('stable',
                              'webexposed',
                              ['--stable-release-mode']),
             VirtualTestSuite('stable',
                              'animations-unprefixed',
                              ['--stable-release-mode']),
             VirtualTestSuite('stable',
                              'media/stable',
                              ['--stable-release-mode']),
             VirtualTestSuite('android',
                              'fullscreen',
                              ['--enable-threaded-compositing',
-                              '--enable-fixed-position-compositing', '--enable-accelerated-overflow-scroll', '--enable-accelerated-scrollable-frames',
+                              '--enable-fixed-position-compositing', '--enable-prefer-compositing-to-lcd-text',
                               '--enable-composited-scrolling-for-frames', '--enable-gesture-tap-highlight', '--enable-pinch',
                               '--enable-overlay-fullscreen-video', '--enable-overlay-scrollbars', '--enable-overscroll-notifications',
                               '--enable-fixed-layout', '--enable-viewport', '--disable-canvas-aa',
-                              '--disable-composited-antialiasing', '--enable-accelerated-fixed-root-background']),
+                              '--disable-composited-antialiasing']),
             VirtualTestSuite('implsidepainting',
                              'inspector/timeline',
                              ['--enable-threaded-compositing', '--enable-impl-side-painting']),
             VirtualTestSuite('stable',
                              'fast/css3-text/css3-text-decoration/stable',
                              ['--stable-release-mode']),
             VirtualTestSuite('stable',
                              'web-animations-api',
                              ['--stable-release-mode']),
             VirtualTestSuite('linux-subpixel',
@@ skipping 189 matching lines @@
 
 class PhysicalTestSuite(object):
     def __init__(self, base, args):
         self.name = base
         self.base = base
         self.args = args
         self.tests = set()
 
     def __repr__(self):
         return "PhysicalTestSuite('%s', '%s', %s)" % (self.name, self.base, self.args)