| Index: Source/core/rendering/compositing/CompositingReasonFinder.cpp
|
| diff --git a/Source/core/rendering/compositing/CompositingReasonFinder.cpp b/Source/core/rendering/compositing/CompositingReasonFinder.cpp
|
| index f17e456aeff758b00c422431cb195c2b78d80afe..7f70685f76594236af54271b1dd576d08f6a65e7 100644
|
| --- a/Source/core/rendering/compositing/CompositingReasonFinder.cpp
|
| +++ b/Source/core/rendering/compositing/CompositingReasonFinder.cpp
|
| @@ -51,8 +51,6 @@ void CompositingReasonFinder::updateTriggers()
|
| m_compositingTriggers |= ScrollableInnerFrameTrigger;
|
| if (settings.acceleratedCompositingForFiltersEnabled())
|
| m_compositingTriggers |= FilterTrigger;
|
| - if (settings.acceleratedCompositingForGpuRasterizationHintEnabled())
|
| - m_compositingTriggers |= GPURasterizationTrigger;
|
|
|
| // We map both these settings to universal overlow scrolling.
|
| // FIXME: Replace these settings with a generic compositing setting for HighDPI.
|
| @@ -84,19 +82,6 @@ bool CompositingReasonFinder::isMainFrame() const
|
| return !m_renderView.document().ownerElement();
|
| }
|
|
|
| -CompositingReasons CompositingReasonFinder::suppressWillChangeAndAnimationForGpuRasterization(const RenderLayer* layer, CompositingReasons styleReasons) const
|
| -{
|
| - CompositingReasons adjustedReasons = styleReasons;
|
| - adjustedReasons &= ~(CompositingReasonWillChangeCompositingHint | CompositingReasonWillChangeGpuRasterizationHint);
|
| -
|
| - // We can suppress layer creation for animations before animations start, but not
|
| - // once they're already running on the compositor.
|
| - if (!layer->renderer()->style()->isRunningAnimationOnCompositor())
|
| - adjustedReasons &= ~CompositingReasonActiveAnimation;
|
| -
|
| - return adjustedReasons;
|
| -}
|
| -
|
| CompositingReasons CompositingReasonFinder::directReasons(const RenderLayer* layer, bool* needToRecomputeCompositingRequirements) const
|
| {
|
| CompositingReasons styleReasons = layer->styleDeterminedCompositingReasons();
|
| @@ -138,9 +123,6 @@ CompositingReasons CompositingReasonFinder::styleDeterminedReasons(RenderObject*
|
| if (requiresCompositingForWillChangeCompositingHint(renderer))
|
| directReasons |= CompositingReasonWillChangeCompositingHint;
|
|
|
| - if (requiresCompositingForWillChangeGpuRasterizationHint(renderer))
|
| - directReasons |= CompositingReasonWillChangeGpuRasterizationHint;
|
| -
|
| ASSERT(!(directReasons & ~CompositingReasonComboAllStyleDeterminedReasons));
|
| return directReasons;
|
| }
|
| @@ -170,14 +152,6 @@ bool CompositingReasonFinder::requiresCompositingForWillChangeCompositingHint(co
|
| return renderer->style()->hasWillChangeCompositingHint();
|
| }
|
|
|
| -bool CompositingReasonFinder::requiresCompositingForWillChangeGpuRasterizationHint(const RenderObject* renderer) const
|
| -{
|
| - if (!(m_compositingTriggers & GPURasterizationTrigger))
|
| - return false;
|
| -
|
| - return renderer->style()->hasWillChangeGpuRasterizationHint();
|
| -}
|
| -
|
| CompositingReasons CompositingReasonFinder::nonStyleDeterminedDirectReasons(const RenderLayer* layer, bool* needToRecomputeCompositingRequirements) const
|
| {
|
| CompositingReasons directReasons = CompositingReasonNone;
|
|
|