Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/core/layout/LayerClipper.h

 /*
  * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. 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>
@@ skipping 78 matching lines @@
     friend class LayerClipper;
 
     ClipRectsCacheSlot cacheSlot;
     LayoutSize subPixelAccumulation;
     ShouldRespectOverflowClip respectOverflowClip;
 };
 
 class LayerClipper {
     WTF_MAKE_NONCOPYABLE(LayerClipper);
 public:
-    explicit LayerClipper(LayoutLayerModelObject&);
+    explicit LayerClipper(LayoutBoxModelObject&);
 
     void clearClipRectsIncludingDescendants();
     void clearClipRectsIncludingDescendants(ClipRectsCacheSlot);
 
     LayoutRect childrenClipRect() const; // Returns the foreground clip rect of the layer in the document's coordinate space.
     LayoutRect localClipRect() const; // Returns the background clip rect of the layer in the local coordinate space.
 
     ClipRects* getClipRects(const ClipRectsContext&) const;
 
     ClipRect backgroundClipRect(const ClipRectsContext&) const;
@@ skipping 23 matching lines @@
     Layer* clippingRootForPainting() const;
 
     ClipRectsCache& cache() const
     {
         if (!m_cache)
             m_cache = adoptPtr(new ClipRectsCache);
         return *m_cache;
     }
 
     // FIXME: Could this be a RenderBox?
-    LayoutLayerModelObject& m_renderer;
+    LayoutBoxModelObject& m_renderer;
     mutable OwnPtr<ClipRectsCache> m_cache;
 };
 
 } // namespace blink
 
 #endif // LayerClipper_h