Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1531)

Unified Diff: Source/core/rendering/LayoutState.h

Issue 148823002: *** DO NOT LAND *** Measure the size and complexity of the old multicol implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/ColumnInfo.h ('k') | Source/core/rendering/LayoutState.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/LayoutState.h
diff --git a/Source/core/rendering/LayoutState.h b/Source/core/rendering/LayoutState.h
index 16aa5b6ef363c02f98a280d75e0b25ee61d8235a..430a287eeee20968866710a3bb007f7aa2aabf17 100644
--- a/Source/core/rendering/LayoutState.h
+++ b/Source/core/rendering/LayoutState.h
@@ -26,7 +26,6 @@
#ifndef LayoutState_h
#define LayoutState_h
-#include "core/rendering/ColumnInfo.h"
#include "platform/geometry/LayoutRect.h"
#include "wtf/HashMap.h"
#include "wtf/Noncopyable.h"
@@ -50,7 +49,6 @@ public:
, m_layoutDeltaXSaturated(false)
, m_layoutDeltaYSaturated(false)
#endif
- , m_columnInfo(0)
, m_lineGrid(0)
, m_next(0)
, m_shapeInsideInfo(0)
@@ -61,23 +59,19 @@ public:
{
}
- LayoutState(LayoutState*, RenderBox*, const LayoutSize& offset, LayoutUnit pageHeight, bool pageHeightChanged, ColumnInfo*);
+ LayoutState(LayoutState*, RenderBox*, const LayoutSize& offset, LayoutUnit pageHeight, bool pageHeightChanged);
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 && m_columnInfo->paginationUnit() == ColumnInfo::Column; }
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).
LayoutUnit pageLogicalOffset(RenderBox*, LayoutUnit childLogicalOffset) const;
- void addForcedColumnBreak(RenderBox*, LayoutUnit childLogicalOffset);
-
LayoutUnit pageLogicalHeight() const { return m_pageLogicalHeight; }
bool pageLogicalHeightChanged() const { return m_pageLogicalHeightChanged; }
@@ -98,10 +92,8 @@ private:
void propagateLineGridInfo(RenderBox*);
void establishLineGrid(RenderBlockFlow*);
- void computeLineGridPaginationOrigin(RenderBox*);
-
public:
- // Do not add anything apart from bitfields until after m_columnInfo. See https://bugs.webkit.org/show_bug.cgi?id=100173
+ // Do not add anything apart from bitfields until after m_lineGrid. 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.
@@ -110,8 +102,6 @@ public:
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.
- ColumnInfo* m_columnInfo;
// The current line grid that we're snapping to and the offset of the start of the grid.
RenderBlockFlow* m_lineGrid;
LayoutState* m_next;
« no previous file with comments | « Source/core/rendering/ColumnInfo.h ('k') | Source/core/rendering/LayoutState.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698