Move rendering/RenderObject to layout/LayoutObject.

Source/core/frame/FrameView.h

 /*
    Copyright (C) 1997 Martin Jones (mjones@kde.org)
              (C) 1998 Waldo Bastian (bastian@kde.org)
              (C) 1998, 1999 Torben Weis (weis@kde.org)
              (C) 1999 Lars Knoll (knoll@kde.org)
              (C) 1999 Antti Koivisto (koivisto@kde.org)
    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ skipping 38 matching lines @@
 class Cursor;
 class Element;
 class FloatSize;
 class HTMLFrameOwnerElement;
 class LocalFrame;
 class KURL;
 class Node;
 class Page;
 class RenderBox;
 class RenderEmbeddedObject;
-class RenderObject;
+class LayoutObject;
 class RenderPart;
 class RenderScrollbarPart;
 class RenderView;
 class ScrollingCoordinator;
 struct CompositedSelectionBound;
 
 typedef unsigned long long DOMTimeStamp;
 
 class FrameView final : public Widget, public ScrollableArea {
 public:
@@ skipping 21 matching lines @@
     void setCanHaveScrollbars(bool);
 
     PassRefPtrWillBeRawPtr<Scrollbar> createScrollbar(ScrollbarOrientation);
 
     void setContentsSize(const IntSize&);
     IntPoint clampOffsetAtScale(const IntPoint& offset, float scale) const;
 
     void layout(bool allowSubtree = true);
     bool didFirstLayout() const;
     void scheduleRelayout();
-    void scheduleRelayoutOfSubtree(RenderObject*);
+    void scheduleRelayoutOfSubtree(LayoutObject*);
     bool layoutPending() const;
     bool isInPerformLayout() const;
 
     void setCanInvalidatePaintDuringPerformLayout(bool b) { m_canInvalidatePaintDuringPerformLayout = b; }
     bool canInvalidatePaintDuringPerformLayout() const { return m_canInvalidatePaintDuringPerformLayout; }
 
-    RenderObject* layoutRoot(bool onlyDuringLayout = false) const;
+    LayoutObject* layoutRoot(bool onlyDuringLayout = false) const;
     void clearLayoutSubtreeRoot() { m_layoutSubtreeRoot = nullptr; }
     int layoutCount() const { return m_layoutCount; }
 
     bool needsLayout() const;
     void setNeedsLayout();
 
     void setNeedsUpdateWidgetPositions() { m_needsUpdateWidgetPositions = true; }
 
     // Methods for getting/setting the size Blink should use to layout the contents.
     IntSize layoutSize(IncludeScrollbarsInRect = ExcludeScrollbars) const;
@@ skipping 63 matching lines @@
     void adjustMediaTypeForPrinting(bool printing);
 
     WebDisplayMode displayMode() { return m_displayMode; }
     void setDisplayMode(WebDisplayMode);
 
     void addSlowRepaintObject();
     void removeSlowRepaintObject();
     bool hasSlowRepaintObjects() const { return m_slowRepaintObjectCount; }
 
     // Fixed-position objects.
-    typedef HashSet<RenderObject*> ViewportConstrainedObjectSet;
-    void addViewportConstrainedObject(RenderObject*);
-    void removeViewportConstrainedObject(RenderObject*);
+    typedef HashSet<LayoutObject*> ViewportConstrainedObjectSet;
+    void addViewportConstrainedObject(LayoutObject*);
+    void removeViewportConstrainedObject(LayoutObject*);
     const ViewportConstrainedObjectSet* viewportConstrainedObjects() const { return m_viewportConstrainedObjects.get(); }
     bool hasViewportConstrainedObjects() const { return m_viewportConstrainedObjects && m_viewportConstrainedObjects->size() > 0; }
 
     void handleLoadCompleted();
 
     void updateAnnotatedRegions();
 
     void restoreScrollbar();
 
     void postLayoutTimerFired(Timer<FrameView>*);
@@ skipping 39 matching lines @@
     void forceLayout(bool allowSubtree = false);
     void forceLayoutForPagination(const FloatSize& pageSize, const FloatSize& originalPageSize, float maximumShrinkFactor);
 
     bool scrollToFragment(const KURL&);
     bool scrollToAnchor(const String&);
     void maintainScrollPositionAtAnchor(Node*);
     void scrollElementToRect(Element*, const IntRect&);
     void scrollContentsIfNeededRecursive();
 
     // Methods to convert points and rects between the coordinate space of the renderer, and this view.
-    IntRect convertFromRenderer(const RenderObject&, const IntRect&) const;
-    IntRect convertToRenderer(const RenderObject&, const IntRect&) const;
-    IntPoint convertFromRenderer(const RenderObject&, const IntPoint&) const;
-    IntPoint convertToRenderer(const RenderObject&, const IntPoint&) const;
+    IntRect convertFromRenderer(const LayoutObject&, const IntRect&) const;
+    IntRect convertToRenderer(const LayoutObject&, const IntRect&) const;
+    IntPoint convertFromRenderer(const LayoutObject&, const IntPoint&) const;
+    IntPoint convertToRenderer(const LayoutObject&, const IntPoint&) const;
 
     bool isFrameViewScrollCorner(RenderScrollbarPart* scrollCorner) const { return m_scrollCorner == scrollCorner; }
 
     enum ScrollingReasons {
         Scrollable,
         NotScrollableNoOverflow,
         NotScrollableNotVisible,
         NotScrollableExplicitlyDisabled
     };
 
@@ skipping 338 matching lines @@
     void reset();
     void init();
 
     // Called when our frame rect changes (or the rect/scroll position of an ancestor changes).
     virtual void frameRectsChanged() override;
 
     friend class RenderPart;
 
     bool contentsInCompositedLayer() const;
 
-    void applyOverflowToViewportAndSetRenderer(RenderObject*, ScrollbarMode& hMode, ScrollbarMode& vMode);
+    void applyOverflowToViewportAndSetRenderer(LayoutObject*, ScrollbarMode& hMode, ScrollbarMode& vMode);
     void updateOverflowStatus(bool horizontalOverflow, bool verticalOverflow);
 
     void updateCounters();
     void forceLayoutParentViewIfNeeded();
     void performPreLayoutTasks();
-    void performLayout(RenderObject* rootForThisLayout, bool inSubtreeLayout);
+    void performLayout(LayoutObject* rootForThisLayout, bool inSubtreeLayout);
     void scheduleOrPerformPostLayoutTasks();
     void performPostLayoutTasks();
 
     void invalidateTreeIfNeeded();
 
-    void gatherDebugLayoutRects(RenderObject* layoutRoot);
+    void gatherDebugLayoutRects(LayoutObject* layoutRoot);
 
     DocumentLifecycle& lifecycle() const;
 
     void contentRectangleForPaintInvalidation(const IntRect&);
     virtual void contentsResized() override;
     void scrollbarExistenceDidChange();
 
     // Override Widget methods to do point conversion via renderers, in order to
     // take transforms into account.
     virtual IntRect convertToContainingView(const IntRect&) const override;
@@ skipping 79 matching lines @@
     RefPtrWillBeMember<LocalFrame> m_frame;
 
     WebDisplayMode m_displayMode;
 
     bool m_doFullPaintInvalidation;
 
     bool m_canHaveScrollbars;
     unsigned m_slowRepaintObjectCount;
 
     bool m_hasPendingLayout;
-    RenderObject* m_layoutSubtreeRoot;
+    LayoutObject* m_layoutSubtreeRoot;
 
     bool m_layoutSchedulingEnabled;
     bool m_inPerformLayout;
     bool m_canInvalidatePaintDuringPerformLayout;
     bool m_inSynchronousPostLayout;
     int m_layoutCount;
     unsigned m_nestedLayoutCount;
     Timer<FrameView> m_postLayoutTasksTimer;
     Timer<FrameView> m_updateWidgetsTimer;
     bool m_firstLayoutCallbackPending;
 
     bool m_firstLayout;
     bool m_isTransparent;
     Color m_baseBackgroundColor;
     IntSize m_lastViewportSize;
     float m_lastZoomFactor;
 
     AtomicString m_mediaType;
     AtomicString m_mediaTypeWhenNotPrinting;
 
     bool m_overflowStatusDirty;
     bool m_horizontalOverflow;
     bool m_verticalOverflow;
-    RenderObject* m_viewportRenderer;
+    LayoutObject* m_viewportRenderer;
 
     bool m_wasScrolledByUser;
     bool m_inProgrammaticScroll;
     bool m_safeToPropagateScrollToParent;
 
     double m_lastPaintTime;
 
     bool m_isTrackingPaintInvalidations; // Used for testing.
     Vector<IntRect> m_trackedPaintInvalidationRects;
 
@@ skipping 114 matching lines @@
     }
 
 private:
     RawPtrWillBeMember<FrameView> m_view;
     bool m_originalValue;
 };
 
 } // namespace blink
 
 #endif // FrameView_h