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

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

Issue 731863003: Remove CSSCompositing (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: preland Created 6 years, 1 month 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/CompositingRequirementsUpdater.cpp
diff --git a/sky/engine/core/rendering/compositing/CompositingRequirementsUpdater.cpp b/sky/engine/core/rendering/compositing/CompositingRequirementsUpdater.cpp
index 7bd6334468187afdb3b38387d55306a1f3a11d87..40a22217c055d4087bad579ed03fb453edc88de9 100644
--- a/sky/engine/core/rendering/compositing/CompositingRequirementsUpdater.cpp
+++ b/sky/engine/core/rendering/compositing/CompositingRequirementsUpdater.cpp
@@ -126,14 +126,12 @@ public:
explicit RecursionData(RenderLayer* compositingAncestor)
: m_compositingAncestor(compositingAncestor)
, m_subtreeIsCompositing(false)
- , m_hasUnisolatedCompositedBlendingDescendant(false)
, m_testingOverlap(true)
{
}
RenderLayer* m_compositingAncestor;
bool m_subtreeIsCompositing;
- bool m_hasUnisolatedCompositedBlendingDescendant;
bool m_testingOverlap;
};
@@ -156,10 +154,6 @@ static CompositingReasons subtreeReasonsForCompositing(RenderLayer* layer, bool
if (hasCompositedDescendants) {
subtreeReasons |= layer->potentialCompositingReasonsFromStyle() & CompositingReasonComboCompositedDescendants;
- if (layer->shouldIsolateCompositedDescendants()) {
- ASSERT(layer->stackingNode()->isStackingContext());
- subtreeReasons |= CompositingReasonIsolateCompositedDescendants;
- }
// FIXME: This should move into CompositingReasonFinder::potentialCompositingReasonsFromStyle, but
// theres a poor interaction with RenderTextControlSingleLine, which sets this hasOverflowClip directly.
@@ -335,13 +329,6 @@ void CompositingRequirementsUpdater::updateRecursive(RenderLayer* ancestorLayer,
// Now that the subtree has been traversed, we can check for compositing reasons that depended on the state of the subtree.
- if (layer->stackingNode()->isStackingContext()) {
- layer->setShouldIsolateCompositedDescendants(childRecursionData.m_hasUnisolatedCompositedBlendingDescendant);
- } else {
- layer->setShouldIsolateCompositedDescendants(false);
- currentRecursionData.m_hasUnisolatedCompositedBlendingDescendant = childRecursionData.m_hasUnisolatedCompositedBlendingDescendant;
- }
-
// Subsequent layers in the parent's stacking context may also need to composite.
if (childRecursionData.m_subtreeIsCompositing)
currentRecursionData.m_subtreeIsCompositing = true;
@@ -381,9 +368,6 @@ void CompositingRequirementsUpdater::updateRecursive(RenderLayer* ancestorLayer,
if (willBeCompositedOrSquashed)
reasonsToComposite |= layer->potentialCompositingReasonsFromStyle() & CompositingReasonInlineTransform;
- if (willBeCompositedOrSquashed && layer->renderer()->hasBlendMode())
- currentRecursionData.m_hasUnisolatedCompositedBlendingDescendant = true;
-
// Turn overlap testing off for later layers if it's already off, or if we have an animating transform.
// Note that if the layer clips its descendants, there's no reason to propagate the child animation to the parent layers. That's because
// we know for sure the animation is contained inside the clipping rectangle, which is already added to the overlap map.
« no previous file with comments | « sky/engine/core/rendering/compositing/CompositingReasonFinder.cpp ('k') | sky/engine/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698