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

Unified Diff: sky/engine/core/rendering/compositing/CompositingReasonFinder.cpp

Issue 688433003: Remove viewportConstrained plumbing. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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: sky/engine/core/rendering/compositing/CompositingReasonFinder.cpp
diff --git a/sky/engine/core/rendering/compositing/CompositingReasonFinder.cpp b/sky/engine/core/rendering/compositing/CompositingReasonFinder.cpp
index b80ab7a60869a7e92bea9c63409470870938c0f1..e9ab7f0e4fdffe28ad5c204e8ef5c714b52f7175 100644
--- a/sky/engine/core/rendering/compositing/CompositingReasonFinder.cpp
+++ b/sky/engine/core/rendering/compositing/CompositingReasonFinder.cpp
@@ -30,7 +30,6 @@ void CompositingReasonFinder::updateTriggers()
if (settings.preferCompositingToLCDTextEnabled()) {
m_compositingTriggers |= ScrollableInnerFrameTrigger;
m_compositingTriggers |= OverflowScrollTrigger;
- m_compositingTriggers |= ViewportConstrainedPositionedTrigger;
}
}
@@ -128,9 +127,6 @@ CompositingReasons CompositingReasonFinder::nonStyleDeterminedDirectReasons(cons
directReasons |= CompositingReasonOverflowScrollingTouch;
}
- if (requiresCompositingForPositionFixed(layer))
- directReasons |= CompositingReasonPositionFixed;
-
directReasons |= renderer->additionalCompositingReasons();
ASSERT(!(directReasons & CompositingReasonComboAllStyleDeterminedReasons));
@@ -145,13 +141,4 @@ bool CompositingReasonFinder::requiresCompositingForAnimation(RenderStyle* style
return style->shouldCompositeForCurrentAnimations();
}
-bool CompositingReasonFinder::requiresCompositingForPositionFixed(const RenderLayer* layer) const
-{
- if (!(m_compositingTriggers & ViewportConstrainedPositionedTrigger))
- return false;
- // Don't promote fixed position elements that are descendants of a non-view container, e.g. transformed elements.
- // They will stay fixed wrt the container rather than the enclosing frame.
- return layer->scrollsWithViewport() && m_renderView.frameView()->isScrollable();
-}
-
}

Powered by Google App Engine
This is Rietveld 408576698