Changeset 20673 for trunk/WebCore/rendering/RenderFlow.h

Timestamp:

04/02/07 18:01:09 (22 months ago)

Author:

antti

Message:

Reviewed by Hyatt.

Render tree memory savings, part 3

These changes shrink all RenderBlocks by additional 28 bytes. Together with parts 1 and 2
RenderBlock goes from 172 bytes to 128 bytes, a saving of 26%.

• Pack bitfields together in RenderFlow
• Move top/bottom min/max margin values to a struct that is only allocated in case these variables have non default values. Usually this is <5% of all blocks.
• Move rarely used column variables to hash

• rendering/RenderBlock.cpp: (WebCore::ColumnInfo::ColumnInfo): (WebCore::RenderBlock::RenderBlock): (WebCore::RenderBlock::~RenderBlock): (WebCore::RenderBlock::layoutBlock): (WebCore::RenderBlock::collapseMargins): (WebCore::RenderBlock::clearFloatsIfNeeded): (WebCore::RenderBlock::setCollapsedBottomMargin): (WebCore::RenderBlock::layoutBlockChildren): (WebCore::RenderBlock::paintColumns): (WebCore::RenderBlock::paintObject): (WebCore::RenderBlock::fillSelectionGaps): (WebCore::RenderBlock::lowestPosition): (WebCore::RenderBlock::rightmostPosition): (WebCore::RenderBlock::leftmostPosition): (WebCore::RenderBlock::nodeAtPoint): (WebCore::RenderBlock::hitTestColumns): (WebCore::RenderBlock::positionForCoordinates): (WebCore::RenderBlock::availableWidth): (WebCore::RenderBlock::calcColumnWidth): (WebCore::RenderBlock::setDesiredColumnCountAndWidth): (WebCore::RenderBlock::desiredColumnWidth): (WebCore::RenderBlock::desiredColumnCount): (WebCore::RenderBlock::columnRects): (WebCore::RenderBlock::layoutColumns): (WebCore::RenderBlock::adjustPointToColumnContents): (WebCore::RenderBlock::adjustRectForColumns): (WebCore::RenderBlock::setMaxTopMargins): (WebCore::RenderBlock::setMaxBottomMargins):
• rendering/RenderBlock.h: (WebCore::RenderBlock::maxTopMargin): (WebCore::RenderBlock::maxBottomMargin): (WebCore::RenderBlock::maxTopPosMargin): (WebCore::RenderBlock::maxTopNegMargin): (WebCore::RenderBlock::maxBottomPosMargin): (WebCore::RenderBlock::maxBottomNegMargin): (WebCore::RenderBlock::initMaxMarginValues): (WebCore::RenderBlock::MaxMargin::MaxMargin): (WebCore::RenderBlock::MaxMargin::topPosDefault): (WebCore::RenderBlock::MaxMargin::topNegDefault): (WebCore::RenderBlock::MaxMargin::bottomPosDefault): (WebCore::RenderBlock::MaxMargin::bottomNegDefault):
• rendering/RenderFlexibleBox.cpp: (WebCore::RenderFlexibleBox::layoutBlock):
• rendering/RenderFlow.h: (WebCore::RenderFlow::RenderFlow): (WebCore::RenderFlow::hasColumns):
• rendering/RenderInline.cpp: (WebCore::RenderInline::RenderInline):
• rendering/RenderInline.h:

Files:

• trunk/WebCore/rendering/RenderFlow.h (modified) (3 diffs)

trunk/WebCore/rendering/RenderFlow.h

@@ -47 +47 @@
         , m_lastLineBox(0)
         , m_lineHeight(-1)
+        , m_childrenInline(true)
+        , m_firstLine(false)
+        , m_clearStatus(CNONE)
+        , m_topMarginQuirk(false) 
+        , m_bottomMarginQuirk(false)
+        , m_hasMarkupTruncation(false)
+        , m_selectionState(SelectionNone)
+        , m_hasColumns(false)
+        , m_isContinuation(false)
     {
     }
@@ -91 +100 @@
     void paintOutline(GraphicsContext*, int tx, int ty);
 
-    virtual bool hasColumns() const { return false; }
+    virtual bool hasColumns() const { return m_hasColumns; }
 
 private:
@@ -108 +117 @@
 
     mutable short m_lineHeight;
+    
+    // These bitfields are moved here from subclasses to pack them together
+    // from RenderBlock
+    bool m_childrenInline : 1;
+    bool m_firstLine : 1;
+    unsigned m_clearStatus  : 2; // EClear
+    bool m_topMarginQuirk : 1;
+    bool m_bottomMarginQuirk : 1;
+    bool m_hasMarkupTruncation : 1;
+    unsigned m_selectionState : 3; // SelectionState
+    bool m_hasColumns : 1;
+    
+    // from RenderInline
+    bool m_isContinuation : 1; // Whether or not we're a continuation of an inline.
 };