Make LayoutState members private

Source/core/rendering/LayoutState.h

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 24 matching lines @@
 
 class RenderBlockFlow;
 class RenderBox;
 class RenderObject;
 class RenderFlowThread;
 class ShapeInsideInfo;
 
 class LayoutState {
     WTF_MAKE_NONCOPYABLE(LayoutState);
 public:
-    LayoutState()
+    // Constructor for root LayoutState created by RenderView
+    LayoutState(LayoutUnit pageLogicalHeight, bool pageLogicalHeightChanged)
         : m_clipped(false)
-        , m_isPaginated(false)
-        , m_pageLogicalHeightChanged(false)
+        , m_isPaginated(pageLogicalHeight)
+        , m_pageLogicalHeightChanged(pageLogicalHeightChanged)
 #if !ASSERT_DISABLED
         , m_layoutDeltaXSaturated(false)
         , m_layoutDeltaYSaturated(false)
 #endif
         , m_columnInfo(0)
         , m_next(0)
         , m_shapeInsideInfo(0)
-        , m_pageLogicalHeight(0)
+        , m_pageLogicalHeight(pageLogicalHeight)
 #ifndef NDEBUG
         , m_renderer(0)
 #endif
     {
     }
 
-    LayoutState(LayoutState*, RenderBox&, const LayoutSize& offset, LayoutUnit pageHeight, bool pageHeightChanged, ColumnInfo*);
+    LayoutState(LayoutState*, RenderBox&, const LayoutSize& offset, LayoutUnit pageLogicalHeight, bool pageHeightLogicalChanged, ColumnInfo*);
     explicit LayoutState(RenderObject&);
 
     // LayoutState is allocated out of the rendering partition.
     void* operator new(size_t);
     void operator delete(void*);
 
     void clearPaginationInformation();
     bool isPaginatingColumns() const { return m_columnInfo; }
     bool isPaginated() const { return m_isPaginated; }
+    bool isClipped() const { return m_clipped; }
 
     // The page logical offset is the object's offset from the top of the page in the page progression
     // direction (so an x-offset in vertical text and a y-offset for horizontal text).
     LayoutUnit pageLogicalOffset(const RenderBox&, const LayoutUnit& childLogicalOffset) const;
 
     void addForcedColumnBreak(const RenderBox&, const LayoutUnit& childLogicalOffset);
 
+    void addLayoutDelta(const LayoutSize& delta)
+    {
+        m_layoutDelta += delta;
+#if !ASSERT_DISABLED
+            m_layoutDeltaXSaturated |= m_layoutDelta.width() == LayoutUnit::max() || m_layoutDelta.width() == LayoutUnit::min();
+            m_layoutDeltaYSaturated |= m_layoutDelta.height() == LayoutUnit::max() || m_layoutDelta.height() == LayoutUnit::min();
+#endif
+    }
+
+    void setColumnInfo(ColumnInfo* columnInfo) { m_columnInfo = columnInfo; }
+
+    const LayoutSize& layoutOffset() const { return m_layoutOffset; }
+    const LayoutSize& layoutDelta() const { return m_layoutDelta; }
+    const LayoutSize& pageOffset() const { return m_pageOffset; }
     LayoutUnit pageLogicalHeight() const { return m_pageLogicalHeight; }
     bool pageLogicalHeightChanged() const { return m_pageLogicalHeightChanged; }
 
-    LayoutSize layoutOffset() const { return m_layoutOffset; }
+    LayoutState* next() const { return m_next; }
 
     bool needsBlockDirectionLocationSetBeforeLayout() const { return m_isPaginated && m_pageLogicalHeight; }
 
     ShapeInsideInfo* shapeInsideInfo() const { return m_shapeInsideInfo; }
+    ColumnInfo* columnInfo() const { return m_columnInfo; }
+
+    const LayoutRect& clipRect() const { return m_clipRect; }
+    const LayoutSize& paintOffset() const { return m_paintOffset; }
 
 #ifndef NDEBUG
     RenderObject* renderer() const { return m_renderer; }
 #endif
+#if !ASSERT_DISABLED
+    bool layoutDeltaXSaturated() const { return m_layoutDeltaXSaturated; }
+    bool layoutDeltaYSaturated() const { return m_layoutDeltaYSaturated; }
+#endif
 
-public:
+private:
     // Do not add anything apart from bitfields until after m_columnInfo. See https://bugs.webkit.org/show_bug.cgi?id=100173
     bool m_clipped:1;
     bool m_isPaginated:1;
     // If our page height has changed, this will force all blocks to relayout.
     bool m_pageLogicalHeightChanged:1;
 #if !ASSERT_DISABLED
     bool m_layoutDeltaXSaturated:1;
     bool m_layoutDeltaYSaturated:1;
 #endif
     // If the enclosing pagination model is a column model, then this will store column information for easy retrieval/manipulation.
@@ skipping 20 matching lines @@
     LayoutSize m_pageOffset;
 
 #ifndef NDEBUG
     RenderObject* m_renderer;
 #endif
 };
 
 } // namespace WebCore
 
 #endif // LayoutState_h