Implement Paint Containment

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

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 543b247dc5cac2604064e131331d2a87520da8f7..c6576c81e1650aa5d1320c16c243a9ba187712ca 100644
--- a/third_party/WebKit/Source/core/layout/compositing/CompositingInputsUpdater.cpp
+++ b/third_party/WebKit/Source/core/layout/compositing/CompositingInputsUpdater.cpp
@@ -37,7 +37,7 @@ static const PaintLayer* findParentLayerOnClippingContainerChain(const PaintLaye
             for (current = current->parent(); current && !current->canContainFixedPositionObjects(); current = current->parent()) {
                 // All types of clips apply to fixed-position descendants of other fixed-position elements.
                 // Note: it's unclear whether this is what the spec says. Firefox does not clip, but Chrome does.
-                if (current->style()->position() == FixedPosition && current->hasClipOrOverflowClip()) {
+                if (current->style()->position() == FixedPosition && current->hasOverflowClipPaintContainmentOrClip()) {
                     ASSERT(current->hasLayer());
                     return static_cast<const LayoutBoxModelObject*>(current)->layer();
                 }
@@ -56,7 +56,7 @@ static const PaintLayer* findParentLayerOnClippingContainerChain(const PaintLaye
         if (current->hasLayer())
             return static_cast<const LayoutBoxModelObject*>(current)->layer();
         // Having clip or overflow clip forces the LayoutObject to become a layer.
-        ASSERT(!current->hasClipOrOverflowClip());
+        ASSERT(!current->hasOverflowClipPaintContainmentOrClip());
     }
     ASSERT_NOT_REACHED();
     return nullptr;
@@ -82,7 +82,7 @@ static bool hasClippedStackingAncestor(const PaintLayer* layer, const PaintLayer
         if (current == clippingLayer)
             return foundInterveningClip;
 
-        if (current->layoutObject()->hasClipOrOverflowClip() && !clippingLayoutObject->isDescendantOf(current->layoutObject()))
+        if (current->layoutObject()->hasOverflowClipPaintContainmentOrClip() && !clippingLayoutObject->isDescendantOf(current->layoutObject()))
             foundInterveningClip = true;
 
         if (const LayoutObject* container = current->clippingContainer()) {
@@ -132,8 +132,8 @@ void CompositingInputsUpdater::updateRecursive(PaintLayer* layer, UpdateType upd
 
             if (info.hasAncestorWithClipOrOverflowClip) {
                 const PaintLayer* parentLayerOnClippingContainerChain = findParentLayerOnClippingContainerChain(layer);
-                const bool parentHasClipOrOverflowClip = parentLayerOnClippingContainerChain->layoutObject()->hasClipOrOverflowClip();
-                properties.clippingContainer = parentHasClipOrOverflowClip ? parentLayerOnClippingContainerChain->layoutObject() : parentLayerOnClippingContainerChain->clippingContainer();
+                const bool parenthasOverflowClipPaintContainmentOrClip = parentLayerOnClippingContainerChain->layoutObject()->hasOverflowClipPaintContainmentOrClip();
+                properties.clippingContainer = parenthasOverflowClipPaintContainmentOrClip ? parentLayerOnClippingContainerChain->layoutObject() : parentLayerOnClippingContainerChain->clippingContainer();
 
                 if (layer->layoutObject()->isOutOfFlowPositioned() && !layer->subtreeIsInvisible()) {
                     const PaintLayer* clippingLayer = properties.clippingContainer ? properties.clippingContainer->enclosingLayer() : layer->compositor()->rootLayer();
@@ -167,7 +167,7 @@ void CompositingInputsUpdater::updateRecursive(PaintLayer* layer, UpdateType upd
     if (layer->scrollsOverflow())
         info.lastScrollingAncestor = layer;
 
-    if (layer->layoutObject()->hasClipOrOverflowClip())
+    if (layer->layoutObject()->hasOverflowClipPaintContainmentOrClip())
         info.hasAncestorWithClipOrOverflowClip = true;
 
     if (layer->layoutObject()->hasClipPath())