| Index: Source/core/rendering/compositing/CompositingRequirementsUpdater.cpp
|
| diff --git a/Source/core/rendering/compositing/CompositingRequirementsUpdater.cpp b/Source/core/rendering/compositing/CompositingRequirementsUpdater.cpp
|
| index 4c7a9157f70046169d354e0994d48e0e6ba51faf..2bae2993c9e328e4df421a870c6215cba8e86630 100644
|
| --- a/Source/core/rendering/compositing/CompositingRequirementsUpdater.cpp
|
| +++ b/Source/core/rendering/compositing/CompositingRequirementsUpdater.cpp
|
| @@ -163,7 +163,6 @@ public:
|
| , m_subtreeIsCompositing(false)
|
| , m_hasUnisolatedCompositedBlendingDescendant(false)
|
| , m_testingOverlap(testOverlap)
|
| - , m_suppressLayerCreation(false)
|
| #ifndef NDEBUG
|
| , m_depth(0)
|
| #endif
|
| @@ -175,7 +174,6 @@ public:
|
| , m_subtreeIsCompositing(other.m_subtreeIsCompositing)
|
| , m_hasUnisolatedCompositedBlendingDescendant(other.m_hasUnisolatedCompositedBlendingDescendant)
|
| , m_testingOverlap(other.m_testingOverlap)
|
| - , m_suppressLayerCreation(other.m_suppressLayerCreation)
|
| #ifndef NDEBUG
|
| , m_depth(other.m_depth + 1)
|
| #endif
|
| @@ -186,7 +184,6 @@ public:
|
| bool m_subtreeIsCompositing;
|
| bool m_hasUnisolatedCompositedBlendingDescendant;
|
| bool m_testingOverlap;
|
| - bool m_suppressLayerCreation;
|
| #ifndef NDEBUG
|
| int m_depth;
|
| #endif
|
| @@ -202,11 +199,6 @@ static bool requiresCompositingOrSquashing(CompositingReasons reasons)
|
| return reasons != CompositingReasonNone;
|
| }
|
|
|
| -static bool shouldMakeDescendantsSuppressCompositedLayerCreation(CompositingReasons reasons)
|
| -{
|
| - return reasons & CompositingReasonWillChangeGpuRasterizationHint;
|
| -}
|
| -
|
| static CompositingReasons subtreeReasonsForCompositing(RenderObject* renderer, bool hasCompositedDescendants, bool has3DTransformedDescendants)
|
| {
|
| CompositingReasons subtreeReasons = CompositingReasonNone;
|
| @@ -299,9 +291,6 @@ void CompositingRequirementsUpdater::updateRecursive(RenderLayer* ancestorLayer,
|
|
|
| // First accumulate the straightforward compositing reasons.
|
| CompositingReasons directReasons = m_compositingReasonFinder.directReasons(layer);
|
| - layer->setSuppressingCompositedLayerCreation(currentRecursionData.m_suppressLayerCreation);
|
| - if (layer->suppressingCompositedLayerCreation())
|
| - directReasons = m_compositingReasonFinder.suppressWillChangeAndAnimationForGpuRasterization(layer, directReasons);
|
|
|
| // Video is special. It's the only RenderLayer type that can both have
|
| // RenderLayer children and whose children can't use its backing to render
|
| @@ -356,7 +345,6 @@ void CompositingRequirementsUpdater::updateRecursive(RenderLayer* ancestorLayer,
|
| // ancestor with m_subtreeIsCompositing set to false.
|
| RecursionData childRecursionData(currentRecursionData);
|
| childRecursionData.m_subtreeIsCompositing = false;
|
| - childRecursionData.m_suppressLayerCreation = layer->suppressingCompositedLayerCreation() || shouldMakeDescendantsSuppressCompositedLayerCreation(directReasons);
|
|
|
| bool willBeCompositedOrSquashed = compositor->canBeComposited(layer) && requiresCompositingOrSquashing(reasonsToComposite);
|
| if (willBeCompositedOrSquashed) {
|
|
|