Changeset 20673 for trunk/WebCore/rendering/RenderBlock.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/RenderBlock.h (modified) (4 diffs)

trunk/WebCore/rendering/RenderBlock.h

@@ -77 +77 @@
     virtual bool isBottomMarginQuirk() const { return m_bottomMarginQuirk; }
 
-    virtual int maxTopMargin(bool positive) const { return positive ? m_maxTopPosMargin : m_maxTopNegMargin; }
-    virtual int maxBottomMargin(bool positive) const { return positive ? m_maxBottomPosMargin : m_maxBottomNegMargin; }
-
+    virtual int maxTopMargin(bool positive) const { return positive ? maxTopPosMargin() : maxTopNegMargin(); }
+    virtual int maxBottomMargin(bool positive) const { return positive ? maxBottomPosMargin() : maxBottomNegMargin(); }
+
+    int maxTopPosMargin() const { return m_maxMargin ? m_maxMargin->m_topPos : MaxMargin::topPosDefault(this); }
+    int maxTopNegMargin() const { return m_maxMargin ? m_maxMargin->m_topNeg : MaxMargin::topNegDefault(this); }
+    int maxBottomPosMargin() const { return m_maxMargin ? m_maxMargin->m_bottomPos : MaxMargin::bottomPosDefault(this); }
+    int maxBottomNegMargin() const { return m_maxMargin ? m_maxMargin->m_bottomNeg : MaxMargin::bottomNegDefault(this); }
+    void setMaxTopMargins(int pos, int neg);
+    void setMaxBottomMargins(int pos, int neg);
+    
     void initMaxMarginValues()
     {
-        int margTop = marginTop();
-        if (margTop >= 0) {
-            m_maxTopPosMargin = margTop;
-            m_maxTopNegMargin = 0;
-        } else {
-            m_maxTopNegMargin = -margTop;
-            m_maxTopPosMargin = 0;
-        }
-        int margBottom = marginBottom();
-        if (margBottom >= 0) {
-            m_maxBottomPosMargin = margBottom;
-            m_maxBottomNegMargin = 0;
-        } else {
-            m_maxBottomNegMargin = -margBottom;
-            m_maxBottomPosMargin = 0;
+        if (m_maxMargin) {
+            m_maxMargin->m_topPos = MaxMargin::topPosDefault(this);
+            m_maxMargin->m_topNeg = MaxMargin::topNegDefault(this);
+            m_maxMargin->m_bottomPos = MaxMargin::bottomPosDefault(this);
+            m_maxMargin->m_bottomNeg = MaxMargin::bottomNegDefault(this);
         }
     }
@@ -286 +283 @@
     void clearTruncation();
 
-    virtual bool hasColumns() const { return m_desiredColumnCount > 1; }
+    int desiredColumnWidth() const;
+    unsigned desiredColumnCount() const;
+    Vector<IntRect>* columnRects() const;
+    void setDesiredColumnCountAndWidth(int count, int width);
+    
     void adjustRectForColumns(IntRect&) const;
 private:
@@ -437 +438 @@
     DeprecatedPtrList<FloatingObject>* m_floatingObjects;
     DeprecatedPtrList<RenderObject>* m_positionedObjects;
-
-    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
+         
+     // Allocated only when some of these fields have non-default values
+     struct MaxMargin {
+         MaxMargin(const RenderBlock* o) 
+             : m_topPos(topPosDefault(o))
+             , m_topNeg(topNegDefault(o))
+             , m_bottomPos(bottomPosDefault(o))
+             , m_bottomNeg(bottomNegDefault(o))
+             { 
+             }
+         static int topPosDefault(const RenderBlock* o) { return o->marginTop() > 0 ? o->marginTop() : 0; }
+         static int topNegDefault(const RenderBlock* o) { return o->marginTop() < 0 ? -o->marginTop() : 0; }
+         static int bottomPosDefault(const RenderBlock* o) { return o->marginBottom() > 0 ? o->marginBottom() : 0; }
+         static int bottomNegDefault(const RenderBlock* o) { return o->marginBottom() < 0 ? -o->marginBottom() : 0; }
+         
+         int m_topPos;
+         int m_topNeg;
+         int m_bottomPos;
+         int m_bottomNeg;
+     };
+
+    MaxMargin* m_maxMargin;
 
 protected:
-    int m_maxTopPosMargin;
-    int m_maxTopNegMargin;
-    int m_maxBottomPosMargin;
-    int m_maxBottomNegMargin;
-
     // How much content overflows out of our block vertically or horizontally.
     int m_overflowHeight;
@@ -457 +467 @@
     int m_overflowLeft;
     int m_overflowTop;
-
-private:
-
-    // Column information.
-    int m_desiredColumnWidth;
-    unsigned m_desiredColumnCount;
-    Vector<IntRect>* m_columnRects;
 };