Merge AcceleratedCompositingForOverflowScroll into PreferCompositingToLCDText.

Source/core/testing/Internals.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 1531 matching lines @@
         exceptionState.throwDOMException(InvalidAccessError, renderer ? "The provided element's renderer is not a box." : "The provided element has no renderer.");
         return 0;
     }
 
     RenderLayer* layer = toRenderBox(renderer)->layer();
     if (!layer) {
         exceptionState.throwDOMException(InvalidAccessError, "No render layer can be obtained from the provided element.");
         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();
 }
 
 String Internals::layerTreeAsText(Document* document, unsigned flags, ExceptionState& exceptionState) const
 {
     ASSERT(document);
     if (!document->frame()) {
         exceptionState.throwDOMException(InvalidAccessError, "The document provided is invalid.");
@@ skipping 654 matching lines @@
 {
     Vector<Document::TransitionElementData> elementData;
     frame()->document()->getTransitionElementData(elementData);
 
     Vector<Document::TransitionElementData>::iterator iter = elementData.begin();
     for (; iter != elementData.end(); ++iter)
         frame()->document()->hideTransitionElements(AtomicString(iter->selector));
 }
 
 } // namespace blink