Merge back LayoutLayerModelObject into RenderBoxModelObject

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 "config.h"
 #include "core/layout/compositing/CompositingInputsUpdater.h"
 
 #include "core/layout/Layer.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
 #include "core/layout/compositing/LayerCompositor.h"
@@ skipping 21 matching lines @@
 static const Layer* findParentLayerOnClippingContainerChain(const Layer* layer)
 {
     LayoutObject* current = layer->renderer();
     while (current) {
         if (current->style()->position() == FixedPosition) {
             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()) {
                     ASSERT(current->hasLayer());
-                    return static_cast<const LayoutLayerModelObject*>(current)->layer();
+                    return static_cast<const LayoutBoxModelObject*>(current)->layer();
                 }
 
                 // CSS clip applies to fixed position elements even for ancestors that are not what the
                 // fixed element is positioned with respect to.
                 if (current->hasClip()) {
                     ASSERT(current->hasLayer());
-                    return static_cast<const LayoutLayerModelObject*>(current)->layer();
+                    return static_cast<const LayoutBoxModelObject*>(current)->layer();
                 }
             }
         } else {
             current = current->containingBlock();
         }
 
         if (current->hasLayer())
-            return static_cast<const LayoutLayerModelObject*>(current)->layer();
+            return static_cast<const LayoutBoxModelObject*>(current)->layer();
         // Having clip or overflow clip forces the LayoutObject to become a layer.
         ASSERT(!current->hasClipOrOverflowClip());
     }
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 static const Layer* findParentLayerOnContainingBlockChain(const LayoutObject* object)
 {
     for (const LayoutObject* current = object; current; current = current->containingBlock()) {
         if (current->hasLayer())
-            return static_cast<const LayoutLayerModelObject*>(current)->layer();
+            return static_cast<const LayoutBoxModelObject*>(current)->layer();
     }
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 static bool hasClippedStackingAncestor(const Layer* layer, const Layer* clippingLayer)
 {
     if (layer == clippingLayer)
         return false;
     const LayoutObject* clippingRenderer = clippingLayer->renderer();
@@ skipping 108 matching lines @@
     ASSERT(!layer->childNeedsCompositingInputsUpdate());
     ASSERT(!layer->needsCompositingInputsUpdate());
 
     for (Layer* child = layer->firstChild(); child; child = child->nextSibling())
         assertNeedsCompositingInputsUpdateBitsCleared(child);
 }
 
 #endif
 
 } // namespace blink