| Index: third_party/WebKit/Source/core/layout/compositing/CompositingInputsUpdater.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositingInputsUpdater.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositingInputsUpdater.cpp
|
| index 25cfa6be29520901924474bd04a8867803eeabe8..c831a2605904e4ae941b716ace1e67b280e12d7b 100644
|
| --- a/third_party/WebKit/Source/core/layout/compositing/CompositingInputsUpdater.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/compositing/CompositingInputsUpdater.cpp
|
| @@ -11,8 +11,6 @@
|
| #include "core/layout/LayoutView.h"
|
| #include "core/layout/compositing/CompositedLayerMapping.h"
|
| #include "core/layout/compositing/PaintLayerCompositor.h"
|
| -#include "core/page/scrolling/RootScrollerController.h"
|
| -#include "core/page/scrolling/TopDocumentRootScrollerController.h"
|
| #include "core/paint/PaintLayer.h"
|
| #include "platform/tracing/TraceEvent.h"
|
|
|
| @@ -241,30 +239,10 @@ void CompositingInputsUpdater::updateRecursive(PaintLayer* layer,
|
| if (layer->layoutObject()->hasClipPath())
|
| info.hasAncestorWithClipPath = true;
|
|
|
| - bool hasDescendantWithClipPath = false;
|
| - bool hasNonIsolatedDescendantWithBlendMode = false;
|
| - bool hasRootScrollerAsDescendant = false;
|
| for (PaintLayer* child = layer->firstChild(); child;
|
| - child = child->nextSibling()) {
|
| + child = child->nextSibling())
|
| updateRecursive(child, updateType, info);
|
|
|
| - hasRootScrollerAsDescendant |= child->hasRootScrollerAsDescendant() ||
|
| - (child ==
|
| - child->layoutObject()
|
| - ->document()
|
| - .rootScrollerController()
|
| - ->rootScrollerPaintLayer());
|
| - hasDescendantWithClipPath |= child->hasDescendantWithClipPath() ||
|
| - child->layoutObject()->hasClipPath();
|
| - hasNonIsolatedDescendantWithBlendMode |=
|
| - (!child->stackingNode()->isStackingContext() &&
|
| - child->hasNonIsolatedDescendantWithBlendMode()) ||
|
| - child->layoutObject()->style()->hasBlendMode();
|
| - }
|
| -
|
| - layer->updateDescendantDependentCompositingInputs(
|
| - hasDescendantWithClipPath, hasNonIsolatedDescendantWithBlendMode,
|
| - hasRootScrollerAsDescendant);
|
| layer->didUpdateCompositingInputs();
|
|
|
| m_geometryMap.popMappingsToAncestor(layer->parent());
|
|
|