Merge acceleratedCompositingForFixedRootBackground into preferCompositingToLCDText

This removes the acceleratedCompositingForFixedRootBackground setting
and makes the WebSetting setter a no-op. Any code that checked for
this setting is replaced with a check for
preferCompositingToLCDTextEnabled instead.

R=abarth, vollick@chromium.org
BUG=365851

Review URL: https://codereview.chromium.org/479893002

git-svn-id: svn://svn.chromium.org/blink/trunk@180431 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/LayoutTests/compositing/fixed-background-after-style-recalc.html

@@ -15,7 +15,7 @@
         testRunner.dumpAsTextWithPixelResults();
 
     if (window.internals) {
-        window.internals.settings.setAcceleratedCompositingForFixedRootBackgroundEnabled(true);
+        window.internals.settings.setPreferCompositingToLCDTextEnabled(true);
     }
 
     window.onload = function() {

third_party/WebKit/LayoutTests/compositing/fixed-background-composited-html.html

@@ -17,7 +17,7 @@
     <script>
     if (window.testRunner) {
         testRunner.waitUntilDone();
-        window.internals.settings.setAcceleratedCompositingForFixedRootBackgroundEnabled(true);
+        window.internals.settings.setPreferCompositingToLCDTextEnabled(true);
     }
 
 

third_party/WebKit/LayoutTests/compositing/fixed-background-negative-z-index-fixed.html

@@ -23,7 +23,7 @@
     <script>
     if (window.testRunner) {
         testRunner.waitUntilDone();
-        window.internals.settings.setAcceleratedCompositingForFixedRootBackgroundEnabled(true);
+        window.internals.settings.setPreferCompositingToLCDTextEnabled(true);
     }
 
     function doTest()

third_party/WebKit/LayoutTests/compositing/fixed-body-background-positioned.html

@@ -26,7 +26,7 @@
     <script>
     if (window.testRunner) {
         testRunner.dumpAsTextWithPixelResults();
-        window.internals.settings.setAcceleratedCompositingForFixedRootBackgroundEnabled(true);
+        window.internals.settings.setPreferCompositingToLCDTextEnabled(true);
     }
 
     function doTest()

third_party/WebKit/LayoutTests/fast/repaint/full-viewport-repaint-for-background-attachment-fixed.html

@@ -9,7 +9,7 @@ body {
 <script src="resources/text-based-repaint.js" type="text/javascript"></script>
 <script>
 if (window.testRunner)
-    window.internals.settings.setAcceleratedCompositingForFixedRootBackgroundEnabled(false);
+    window.internals.settings.setPreferCompositingToLCDTextEnabled(false);
 
 function repaintTest() {
     window.scrollTo(0, 1000);

third_party/WebKit/LayoutTests/fast/repaint/window-resize-background-image-fixed-centered-composited.html

@@ -2,7 +2,7 @@
 <script src="resources/window-resize-repaint.js"></script>
 <script>
     if (window.internals)
-        internals.settings.setAcceleratedCompositingForFixedRootBackgroundEnabled(true);
+        internals.settings.setPreferCompositingToLCDTextEnabled(true);
 </script>
 <style>
 body {

third_party/WebKit/Source/core/rendering/compositing/RenderLayerCompositor.cpp

@@ -789,10 +789,8 @@ void RenderLayerCompositor::paintContents(const GraphicsLayer* graphicsLayer, Gr
 
 bool RenderLayerCompositor::supportsFixedRootBackgroundCompositing() const
 {
-    if (Settings* settings = m_renderView.document().settings()) {
-        if (settings->acceleratedCompositingForFixedRootBackgroundEnabled())
-            return true;
-    }
+    if (Settings* settings = m_renderView.document().settings())
+        return settings->preferCompositingToLCDTextEnabled();
     return false;
 }
 

third_party/WebKit/Source/web/WebSettingsImpl.cpp

@@ -452,9 +452,9 @@ void WebSettingsImpl::setCompositorDrivenAcceleratedScrollingEnabled(bool enable
     m_settings->setCompositorDrivenAcceleratedScrollingEnabled(enabled);
 }
 
-void WebSettingsImpl::setAcceleratedCompositingForFixedRootBackgroundEnabled(bool enabled)
+// TODO(danakj): Remove this method.
+void WebSettingsImpl::setAcceleratedCompositingForFixedRootBackgroundEnabled(bool)
 {
-    m_settings->setAcceleratedCompositingForFixedRootBackgroundEnabled(enabled);
 }
 
 void WebSettingsImpl::setAccelerated2dCanvasEnabled(bool enabled)