Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1227)

Unified Diff: Source/core/rendering/compositing/CompositingReasonFinder.cpp

Issue 486493002: Merge AcceleratedCompositingForOverflowScroll into PreferCompositingToLCDText. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rm-overflowscroll: imagefailure Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/compositing/CompositingReasonFinder.cpp
diff --git a/Source/core/rendering/compositing/CompositingReasonFinder.cpp b/Source/core/rendering/compositing/CompositingReasonFinder.cpp
index 02ad6c6ccc14addd40c12f3fa028f3590f446e9d..c4014060e6a5eb3b27ef8de8c1fbc32ea22f6c99 100644
--- a/Source/core/rendering/compositing/CompositingReasonFinder.cpp
+++ b/Source/core/rendering/compositing/CompositingReasonFinder.cpp
@@ -29,13 +29,9 @@ void CompositingReasonFinder::updateTriggers()
Settings& settings = m_renderView.document().page()->settings();
if (settings.preferCompositingToLCDTextEnabled()) {
m_compositingTriggers |= ScrollableInnerFrameTrigger;
+ m_compositingTriggers |= OverflowScrollTrigger;
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;
}
bool CompositingReasonFinder::hasOverflowScrollTrigger() const

Powered by Google App Engine
This is Rietveld 408576698