| Index: Source/core/rendering/RenderLayer.cpp
|
| diff --git a/Source/core/rendering/RenderLayer.cpp b/Source/core/rendering/RenderLayer.cpp
|
| index 65cfb75ab53d2f617b8e5a4c5a2fc8a408eabc75..4fba644c57e2a0b6b9e82d3b06c0e96a642d7eb6 100644
|
| --- a/Source/core/rendering/RenderLayer.cpp
|
| +++ b/Source/core/rendering/RenderLayer.cpp
|
| @@ -1965,20 +1965,13 @@ bool RenderLayer::needsCompositedScrolling() const
|
| void RenderLayer::updateNeedsCompositedScrolling()
|
| {
|
| updateCanBeStackingContainer();
|
| -
|
| - bool needsCompositedScrolling = false;
|
| updateDescendantDependentFlags();
|
|
|
| ASSERT(renderer()->view()->frameView() && renderer()->view()->frameView()->containsScrollableArea(this));
|
| - bool forceUseCompositedScrolling = acceleratedCompositingForOverflowScrollEnabled()
|
| + bool needsCompositedScrolling = acceleratedCompositingForOverflowScrollEnabled()
|
| && canBeStackingContainer()
|
| && !hasUnclippedDescendant();
|
|
|
| -#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
|
| - needsCompositedScrolling = forceUseCompositedScrolling || renderer()->style()->useTouchOverflowScrolling();
|
| -#else
|
| - needsCompositedScrolling = forceUseCompositedScrolling;
|
| -#endif
|
| // We gather a boolean value for use with Google UMA histograms to
|
| // quantify the actual effects of a set of patches attempting to
|
| // relax composited scrolling requirements, thereby increasing the
|
|
|