Reset clip parent in CompositedLayerMapping::updateClipParent

third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

Index: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
index ed610b05797324f8ef7c6b5d3a842d5ab157b6a5..6695045de435e5514d7efebff111ee7687a59753 100644
--- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
+++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
@@ -1817,12 +1817,12 @@ static void updateClipParentForGraphicsLayer(GraphicsLayer* layer, GraphicsLayer
 
 void CompositedLayerMapping::updateClipParent(const PaintLayer* scrollParent)
 {
-    if (owningLayerClippedByLayerNotAboveCompositedAncestor(scrollParent))
-        return;
-
-    const PaintLayer* clipParent = m_owningLayer.clipParent();
-    if (clipParent)
-        clipParent = clipParent->enclosingLayerWithCompositedLayerMapping(IncludeSelf);
+    const PaintLayer* clipParent = nullptr;
+    if (!owningLayerClippedByLayerNotAboveCompositedAncestor(scrollParent)) {
+        clipParent = m_owningLayer.clipParent();
+        if (clipParent)
+            clipParent = clipParent->enclosingLayerWithCompositedLayerMapping(IncludeSelf);
+    }
 
     if (ScrollingCoordinator* scrollingCoordinator = scrollingCoordinatorFromLayer(m_owningLayer)) {
         GraphicsLayer* topmostLayer = childForSuperlayers();