Move rendering/RenderLayer* to layout/

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 24 matching lines @@
  * applicable instead of those above.  If you wish to allow use of your
  * version of this file only under the terms of one of those two
  * licenses (the MPL or the GPL) and not to allow others to use your
  * version of this file under the LGPL, indicate your decision by
  * deletingthe provisions above and replace them with the notice and
  * other provisions required by the MPL or the GPL, as the case may be.
  * If you do not delete the provisions above, a recipient may use your
  * version of this file under any of the LGPL, the MPL or the GPL.
  */
 
-#ifndef RenderLayerClipper_h
-#define RenderLayerClipper_h
+#ifndef LayerClipper_h
+#define LayerClipper_h
 
 #include "core/rendering/ClipRectsCache.h"
 #include "core/rendering/RenderBox.h"
 
 namespace blink {
 
-class RenderLayer;
+class Layer;
 
 enum ShouldRespectOverflowClip {
     IgnoreOverflowClip,
     RespectOverflowClip
 };
 
 class ClipRectsContext {
 public:
-    ClipRectsContext(const RenderLayer* root, ClipRectsCacheSlot slot, OverlayScrollbarSizeRelevancy relevancy = IgnoreOverlayScrollbarSize, const LayoutSize& accumulation = LayoutSize())
+    ClipRectsContext(const Layer* root, ClipRectsCacheSlot slot, OverlayScrollbarSizeRelevancy relevancy = IgnoreOverlayScrollbarSize, const LayoutSize& accumulation = LayoutSize())
         : rootLayer(root)
         , scrollbarRelevancy(relevancy)
         , cacheSlot(slot)
         , subPixelAccumulation(accumulation)
         , respectOverflowClip(slot == PaintingClipRectsIgnoringOverflowClip ? IgnoreOverflowClip : RespectOverflowClip)
     {
     }
 
     void setIgnoreOverflowClip()
     {
         ASSERT(!usesCache() || cacheSlot == PaintingClipRects);
         ASSERT(respectOverflowClip == RespectOverflowClip);
         if (usesCache())
             cacheSlot = PaintingClipRectsIgnoringOverflowClip;
         respectOverflowClip = IgnoreOverflowClip;
     }
 
     bool usesCache() const
     {
         return cacheSlot != UncachedClipRects;
     }
 
-    const RenderLayer* const rootLayer;
+    const Layer* const rootLayer;
     const OverlayScrollbarSizeRelevancy scrollbarRelevancy;
 
 private:
-    friend class RenderLayerClipper;
+    friend class LayerClipper;
 
     ClipRectsCacheSlot cacheSlot;
     LayoutSize subPixelAccumulation;
     ShouldRespectOverflowClip respectOverflowClip;
 };
 
-class RenderLayerClipper {
-    WTF_MAKE_NONCOPYABLE(RenderLayerClipper);
+class LayerClipper {
+    WTF_MAKE_NONCOPYABLE(LayerClipper);
 public:
-    explicit RenderLayerClipper(RenderLayerModelObject&);
+    explicit LayerClipper(LayoutLayerModelObject&);
 
     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 13 matching lines @@
 
     // cachedClipRects looks buggy: It doesn't check whether context.rootLayer and entry.root match.
     // FIXME: Move callers to clipRectsIfCached, which does the proper checks.
     ClipRects* cachedClipRects(const ClipRectsContext& context) const
     {
         return m_cache ? m_cache->get(context.cacheSlot).clipRects.get() : 0;
     }
 
     void getOrCalculateClipRects(const ClipRectsContext&, ClipRects&) const;
 
-    RenderLayer* clippingRootForPainting() const;
+    Layer* clippingRootForPainting() const;
 
     ClipRectsCache& cache() const
     {
         if (!m_cache)
             m_cache = adoptPtr(new ClipRectsCache);
         return *m_cache;
     }
 
     // FIXME: Could this be a RenderBox?
-    RenderLayerModelObject& m_renderer;
+    LayoutLayerModelObject& m_renderer;
     mutable OwnPtr<ClipRectsCache> m_cache;
 };
 
 } // namespace blink
 
-#endif // RenderLayerClipper_h
+#endif // LayerClipper_h