Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/core/paint/LayerClipRecorder.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/paint/LayerClipRecorder.h"
 
 #include "core/layout/ClipRect.h"
 #include "core/layout/Layer.h"
 #include "core/rendering/RenderView.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/paint/ClipRecorder.h"
 #include "platform/graphics/paint/DisplayItemList.h"
 
 namespace blink {
 
-LayerClipRecorder::LayerClipRecorder(const LayoutLayerModelObject* renderer, GraphicsContext* graphicsContext, DisplayItem::Type clipType, const ClipRect& clipRect,
+LayerClipRecorder::LayerClipRecorder(const LayoutBoxModelObject* renderer, GraphicsContext* graphicsContext, DisplayItem::Type clipType, const ClipRect& clipRect,
     const LayerPaintingInfo* localPaintingInfo, const LayoutPoint& fragmentOffset, PaintLayerFlags paintFlags, BorderRadiusClippingRule rule)
     : m_graphicsContext(graphicsContext)
     , m_renderer(renderer)
     , m_clipType(clipType)
 {
     ASSERT(renderer);
 
     IntRect snappedClipRect = pixelSnappedIntRect(clipRect.rect());
     OwnPtr<ClipDisplayItem> clipDisplayItem = ClipDisplayItem::create(renderer->displayItemClient(), clipType, snappedClipRect);
     if (localPaintingInfo && clipRect.hasRadius())
@@ skipping 51 matching lines @@
         DisplayItem::Type endType = DisplayItem::clipTypeToEndClipType(m_clipType);
         OwnPtr<EndClipDisplayItem> endClip = EndClipDisplayItem::create(m_renderer->displayItemClient(), endType);
         ASSERT(m_graphicsContext->displayItemList());
         m_graphicsContext->displayItemList()->add(endClip.release());
     } else {
         m_graphicsContext->restore();
     }
 }
 
 } // namespace blink