Merge CompositedScrollingForFrames into PreferCompositingToLCDText

LayoutTests/compositing/iframes/iframe-composited-scrolling-hide-and-show.html

Index: LayoutTests/compositing/iframes/iframe-composited-scrolling-hide-and-show.html
diff --git a/LayoutTests/compositing/iframes/iframe-composited-scrolling-hide-and-show.html b/LayoutTests/compositing/iframes/iframe-composited-scrolling-hide-and-show.html
index ac6ee702c37858225ef3f26babd4348b9e1822ec..e2a3368ea389b104fc91b37fe5b905ce066af7b9 100644
--- a/LayoutTests/compositing/iframes/iframe-composited-scrolling-hide-and-show.html
+++ b/LayoutTests/compositing/iframes/iframe-composited-scrolling-hide-and-show.html
@@ -9,21 +9,19 @@ iframe {
 </style>
 
 <script>
-description('This test makes sure hiding and showing a scrollable iframe correctly updates the set of non-fast scrollable rects.');
+  description('This test makes sure hiding and showing a scrollable iframe ' +
+              'correctly updates the set of non-fast scrollable rects.');
 
-if (window.internals)
-  internals.settings.setCompositedScrollingForFramesEnabled(false);
-
-onload = function() {
-  if (window.internals) {
-    var frame = document.getElementById('scrollable-iframe');
-    shouldBe('internals.nonFastScrollableRects(document).length', '1');
-    frame.style.display = 'none';
-    shouldBe('internals.nonFastScrollableRects(document).length', '0');
-    frame.style.display = '';
-    shouldBe('internals.nonFastScrollableRects(document).length', '1');
+  onload = function() {
+    if (window.internals) {
+      var frame = document.getElementById('scrollable-iframe');
+      shouldBe('internals.nonFastScrollableRects(document).length', '1');
+      frame.style.display = 'none';
+      shouldBe('internals.nonFastScrollableRects(document).length', '0');
+      frame.style.display = '';
+      shouldBe('internals.nonFastScrollableRects(document).length', '1');
+    }
   }
-}
 </script>
 
 <iframe id="scrollable-iframe" src="resources/subframe.html"></iframe>