Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / compositing / CompositingReasonFinder.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/compositing/CompositingReasonFinder.cpp b/src/third_party/WebKit/Source/core/rendering/compositing/CompositingReasonFinder.cpp
index 6f6ce3d..c401406 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/compositing/CompositingReasonFinder.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/compositing/CompositingReasonFinder.cpp
@@ -27,16 +27,11 @@ void CompositingReasonFinder::updateTriggers()
     m_compositingTriggers = 0;
 
     Settings& settings = m_renderView.document().page()->settings();
-    if (settings.compositedScrollingForFramesEnabled())
+    if (settings.preferCompositingToLCDTextEnabled()) {
         m_compositingTriggers |= ScrollableInnerFrameTrigger;
-
-    // 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.acceleratedCompositingForFixedPositionEnabled())
         m_compositingTriggers |= ViewportConstrainedPositionedTrigger;
+    }
 }
 
 bool CompositingReasonFinder::hasOverflowScrollTrigger() const