| Index: Source/core/rendering/RenderLayer.cpp
|
| diff --git a/Source/core/rendering/RenderLayer.cpp b/Source/core/rendering/RenderLayer.cpp
|
| index ee883c0489bf85b87ebfc4f506aedd753d73831f..d77386be7932b9203c4d61b8e03fb0f91dab4a16 100644
|
| --- a/Source/core/rendering/RenderLayer.cpp
|
| +++ b/Source/core/rendering/RenderLayer.cpp
|
| @@ -1680,15 +1680,11 @@ RenderLayer* RenderLayer::scrollParent() const
|
|
|
| RenderLayer* RenderLayer::clipParent() const
|
| {
|
| - const bool needsAncestorClip = compositor()->clippedByAncestor(this);
|
| -
|
| - RenderLayer* clipParent = 0;
|
| - if ((compositingReasons() & CompositingReasonOutOfFlowClipping) && !needsAncestorClip) {
|
| + if (compositingReasons() & CompositingReasonOutOfFlowClipping && !compositor()->clippedByAncestor(this)) {
|
| if (RenderObject* containingBlock = renderer()->containingBlock())
|
| - clipParent = containingBlock->enclosingLayer()->enclosingCompositingLayer();
|
| + return containingBlock->enclosingLayer()->enclosingCompositingLayer();
|
| }
|
| -
|
| - return clipParent;
|
| + return 0;
|
| }
|
|
|
| void RenderLayer::didUpdateNeedsCompositedScrolling()
|
|
|