Merge CompositedScrollingForFrames into PreferCompositingToLCDText

Source/core/rendering/compositing/CompositingReasonFinder.cpp

Index: Source/core/rendering/compositing/CompositingReasonFinder.cpp
diff --git a/Source/core/rendering/compositing/CompositingReasonFinder.cpp b/Source/core/rendering/compositing/CompositingReasonFinder.cpp
index f945a89727a08361f7cf421db5267404b5e34dd9..02ad6c6ccc14addd40c12f3fa028f3590f446e9d 100644
--- a/Source/core/rendering/compositing/CompositingReasonFinder.cpp
+++ b/Source/core/rendering/compositing/CompositingReasonFinder.cpp
@@ -27,16 +27,15 @@ void CompositingReasonFinder::updateTriggers()
     m_compositingTriggers = 0;
 
     Settings& settings = m_renderView.document().page()->settings();
-    if (settings.compositedScrollingForFramesEnabled())
+    if (settings.preferCompositingToLCDTextEnabled()) {
         m_compositingTriggers |= ScrollableInnerFrameTrigger;
+        m_compositingTriggers |= ViewportConstrainedPositionedTrigger;
+    }
 
     // We map both these settings to universal overlow scrolling.
     // FIXME: Replace these settings with a generic compositing setting for HighDPI.
     if (settings.acceleratedCompositingForOverflowScrollEnabled() || settings.compositorDrivenAcceleratedScrollingEnabled())
         m_compositingTriggers |= OverflowScrollTrigger;
-
-    if (settings.preferCompositingToLCDTextEnabled())
-        m_compositingTriggers |= ViewportConstrainedPositionedTrigger;
 }
 
 bool CompositingReasonFinder::hasOverflowScrollTrigger() const