X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=Source%2FWebCore%2Frendering%2FLayoutState.h;fp=Source%2FWebCore%2Frendering%2FLayoutState.h;h=14dfabc551c84f4756cc5fb72584f792aa906f2f;hb=186b2535c234ccc42a8c27998f11be6f718f604f;hp=6c8cf686a13577875ce9284c84938b273cf5978f;hpb=1c567be6144228b511852e3cab689fc41b052875;p=vuplus_webkit diff --git a/Source/WebCore/rendering/LayoutState.h b/Source/WebCore/rendering/LayoutState.h index 6c8cf68..14dfabc 100644 --- a/Source/WebCore/rendering/LayoutState.h +++ b/Source/WebCore/rendering/LayoutState.h @@ -35,12 +35,14 @@ class ColumnInfo; class RenderArena; class RenderBox; class RenderObject; +class RenderFlowThread; class LayoutState { WTF_MAKE_NONCOPYABLE(LayoutState); public: LayoutState() : m_clipped(false) + , m_isPaginated(false) , m_pageLogicalHeight(0) , m_pageLogicalHeightChanged(false) , m_columnInfo(0) @@ -52,6 +54,7 @@ public: } LayoutState(LayoutState*, RenderBox*, const LayoutSize& offset, LayoutUnit pageHeight, bool pageHeightChanged, ColumnInfo*); + LayoutState(LayoutState*, RenderFlowThread*); LayoutState(RenderObject*); void destroy(RenderArena*); @@ -64,7 +67,7 @@ public: void clearPaginationInformation(); bool isPaginatingColumns() const { return m_columnInfo; } - bool isPaginated() const { return m_pageLogicalHeight || m_columnInfo; } + bool isPaginated() const { return m_isPaginated; } // 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). @@ -81,6 +84,7 @@ private: public: bool m_clipped; + bool m_isPaginated; LayoutRect m_clipRect; // x/y offset from container. Includes relative positioning and scroll offsets.