Include control clip in list of clip-related properties.

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/layout/compositing/CompositingInputsUpdater.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/layout/LayoutBlock.h"
@@ skipping 30 matching lines @@
           return static_cast<const LayoutBoxModelObject*>(current)->layer();
         }
       }
     } else {
       current = current->containingBlock();
     }
 
     if (current->hasLayer())
       return static_cast<const LayoutBoxModelObject*>(current)->layer();
     // Having clip or overflow clip forces the LayoutObject to become a layer,
-    // except for contains: paint, which may apply to SVG.
+    // except for contains: paint, which may apply to SVG, and
+    // control clip, which may apply to LayoutBox subtypes.
     // SVG (other than LayoutSVGRoot) cannot have PaintLayers.
     DCHECK(!current->hasClipRelatedProperty() ||
-           current->styleRef().containsPaint());
+           current->styleRef().containsPaint() ||
+           (current->isBox() && toLayoutBox(current)->hasControlClip()));
   }
   ASSERT_NOT_REACHED();
   return nullptr;
 }
 
 static const PaintLayer* findParentLayerOnContainingBlockChain(
     const LayoutObject* object) {
   for (const LayoutObject* current = object; current;
        current = current->containingBlock()) {
     if (current->hasLayer())
@@ skipping 207 matching lines @@
   ASSERT(!layer->needsCompositingInputsUpdate());
 
   for (PaintLayer* child = layer->firstChild(); child;
        child = child->nextSibling())
     assertNeedsCompositingInputsUpdateBitsCleared(child);
 }
 
 #endif
 
 }  // namespace blink