Move rendering/RenderLayer* to layout/

Source/core/layout/LayerScrollableArea.h

 /*
  * Copyright (C) 2003, 2009, 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 23 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 RenderLayerScrollableArea_h
-#define RenderLayerScrollableArea_h
+#ifndef LayerScrollableArea_h
+#define LayerScrollableArea_h
 
 
-#include "core/rendering/LayerFragment.h"
+#include "core/layout/LayerFragment.h"
 #include "core/rendering/RenderBox.h"
 
 #include "platform/scroll/ScrollableArea.h"
 
 namespace blink {
 
 enum ResizerHitTestType {
     ResizerForPointer,
     ResizerForTouch
 };
 
 class PlatformEvent;
 class RenderBox;
-class RenderLayer;
+class Layer;
 class RenderScrollbarPart;
 
-class RenderLayerScrollableArea final : public ScrollableArea {
+class LayerScrollableArea final : public ScrollableArea {
     friend class Internals;
 
 public:
     // FIXME: We should pass in the RenderBox but this opens a window
-    // for crashers during RenderLayer setup (see crbug.com/368062).
-    RenderLayerScrollableArea(RenderLayer&);
-    virtual ~RenderLayerScrollableArea();
+    // for crashers during Layer setup (see crbug.com/368062).
+    LayerScrollableArea(Layer&);
+    virtual ~LayerScrollableArea();
 
     bool hasHorizontalScrollbar() const { return horizontalScrollbar(); }
     bool hasVerticalScrollbar() const { return verticalScrollbar(); }
 
     virtual Scrollbar* horizontalScrollbar() const override { return m_hBar.get(); }
     virtual Scrollbar* verticalScrollbar() const override { return m_vBar.get(); }
 
     virtual HostWindow* hostWindow() const override;
 
     virtual GraphicsLayer* layerForScrolling() const override;
@@ skipping 111 matching lines @@
     enum LCDTextMode {
         ConsiderLCDText,
         IgnoreLCDText
     };
 
     void updateNeedsCompositedScrolling(LCDTextMode = ConsiderLCDText);
     bool needsCompositedScrolling() const { return m_needsCompositedScrolling; }
 
     // These are used during compositing updates to determine if the overflow
     // controls need to be repositioned in the GraphicsLayer tree.
-    void setTopmostScrollChild(RenderLayer*);
-    RenderLayer* topmostScrollChild() const { ASSERT(!m_nextTopmostScrollChild); return m_topmostScrollChild; }
+    void setTopmostScrollChild(Layer*);
+    Layer* topmostScrollChild() const { ASSERT(!m_nextTopmostScrollChild); return m_topmostScrollChild; }
 
     IntRect resizerCornerRect(const IntRect&, ResizerHitTestType) const;
 
     RenderBox& box() const;
-    RenderLayer* layer() const;
+    Layer* layer() const;
 
     RenderScrollbarPart* resizer() { return m_resizer; }
 
     const IntPoint& cachedOverlayScrollbarOffset() { return m_cachedOverlayScrollbarOffset; }
     void setCachedOverlayScrollbarOffset(const IntPoint& offset) { m_cachedOverlayScrollbarOffset = offset; }
 
     IntRect rectForHorizontalScrollbar(const IntRect& borderBoxRect) const;
     IntRect rectForVerticalScrollbar(const IntRect& borderBoxRect) const;
 
 private:
@@ skipping 21 matching lines @@
 
     // See comments on isPointInResizeControl.
     void updateResizerAreaSet();
     void updateResizerStyle();
 
 
     void updateScrollableAreaSet(bool hasOverflow);
 
     void updateCompositingLayersAfterScroll();
 
-    RenderLayer& m_layer;
+    Layer& m_layer;
 
     // Keeps track of whether the layer is currently resizing, so events can cause resizing to start and stop.
     unsigned m_inResizeMode : 1;
     unsigned m_scrollsOverflow : 1;
 
     unsigned m_scrollDimensionsDirty : 1;
     unsigned m_inOverflowRelayout : 1;
 
-    RenderLayer* m_nextTopmostScrollChild;
-    RenderLayer* m_topmostScrollChild;
+    Layer* m_nextTopmostScrollChild;
+    Layer* m_topmostScrollChild;
 
     // FIXME: once cc can handle composited scrolling with clip paths, we will
     // no longer need this bit.
     unsigned m_needsCompositedScrolling : 1;
 
     // The width/height of our scrolled area.
     LayoutRect m_overflowRect;
 
     // This is the (scroll) offset from scrollOrigin().
     DoubleSize m_scrollOffset;
 
     IntPoint m_cachedOverlayScrollbarOffset;
 
     // For areas with overflow, we have a pair of scrollbars.
     RefPtrWillBePersistent<Scrollbar> m_hBar;
     RefPtrWillBePersistent<Scrollbar> m_vBar;
 
     // Renderers to hold our custom scroll corner.
     RenderScrollbarPart* m_scrollCorner;
 
     // Renderers to hold our custom resizer.
     RenderScrollbarPart* m_resizer;
 };
 
 } // namespace blink
 
-#endif // RenderLayerScrollableArea_h
+#endif // LayerScrollableArea_h