Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/core/layout/LayerClipper.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 73 matching lines @@
     }
 
     if (renderer.hasClip()) {
         LayoutRect newClip = toRenderBox(renderer).clipRect(offset);
         clipRects.setPosClipRect(intersection(newClip, clipRects.posClipRect()));
         clipRects.setOverflowClipRect(intersection(newClip, clipRects.overflowClipRect()));
         clipRects.setFixedClipRect(intersection(newClip, clipRects.fixedClipRect()));
     }
 }
 
-LayerClipper::LayerClipper(LayoutLayerModelObject& renderer)
+LayerClipper::LayerClipper(LayoutBoxModelObject& renderer)
     : m_renderer(renderer)
 {
 }
 
 ClipRects* LayerClipper::clipRectsIfCached(const ClipRectsContext& context) const
 {
     ASSERT(context.usesCache());
     if (!m_cache)
         return 0;
     ClipRectsCache::Entry& entry = m_cache->get(context.cacheSlot);
@@ skipping 260 matching lines @@
         ASSERT(current);
         if (current->transform() || current->isPaintInvalidationContainer())
             return const_cast<Layer*>(current);
     }
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 } // namespace blink