Merge AcceleratedCompositingForOverflowScroll into PreferCompositingToLCDText.

Source/core/testing/Internals.cpp

Index: Source/core/testing/Internals.cpp
diff --git a/Source/core/testing/Internals.cpp b/Source/core/testing/Internals.cpp
index 837b199d1ee7865d9a6cdeeac4b9e23cea8f2cd7..8a33144270871cc1a8192232b1c9ec710fdb701d 100644
--- a/Source/core/testing/Internals.cpp
+++ b/Source/core/testing/Internals.cpp
@@ -1549,10 +1549,10 @@ bool Internals::isUnclippedDescendant(Element* element, ExceptionState& exceptio
         return 0;
     }
 
-    // We used to compute isUnclippedDescendant only when acceleratedCompositingForOverflowScrollEnabled,
+    // We used to compute isUnclippedDescendant only when preferCompositingToLCDTextEnabled,
     // but now we compute it all the time.
     // FIXME: Remove this if statement and rebaseline the tests that make this assumption.
-    if (!layer->compositor()->acceleratedCompositingForOverflowScrollEnabled())
+    if (!layer->compositor()->preferCompositingToLCDTextEnabled())
         return false;
 
     return layer->isUnclippedDescendant();