Changeset 97052 in webkit

Timestamp:

Oct 10, 2011, 3:14:25 AM (14 years ago)

Author:

andreas.kling@nokia.com

Message:

Shrink RootInlineBox.
​https://bugs.webkit.org/show_bug.cgi?id=69707

Reviewed by Antti Koivisto.

Move the bitfields from RootInlineBox up into its base class (InlineFlowBox.)
This shrinks RootInlineBox by one CPU word without growing InlineFlowBox.
Enum bitfields were changed to "unsigned" for the MSVC signedness quirk.

Also move one 32-bit member to the head of RootInlineBox so it falls into the
padding at the end of InlineFlowBox on 64-bit.

This reduces memory consumption by 780 kB (on 64-bit) when loading the full
HTML5 spec.

• rendering/InlineFlowBox.h:

(WebCore::InlineFlowBox::InlineFlowBox):

• rendering/RootInlineBox.cpp:

(WebCore::RootInlineBox::RootInlineBox):
(WebCore::RootInlineBox::lineBreakBidiStatus):

• rendering/RootInlineBox.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineFlowBox.h (modified) (2 diffs)
• rendering/RootInlineBox.cpp (modified) (4 diffs)
• rendering/RootInlineBox.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-10  Andreas Kling  <kling@webkit.org>
+
+        Shrink RootInlineBox.
+        https://bugs.webkit.org/show_bug.cgi?id=69707
+
+        Reviewed by Antti Koivisto.
+
+        Move the bitfields from RootInlineBox up into its base class (InlineFlowBox.)
+        This shrinks RootInlineBox by one CPU word without growing InlineFlowBox.
+        Enum bitfields were changed to "unsigned" for the MSVC signedness quirk.
+
+        Also move one 32-bit member to the head of RootInlineBox so it falls into the
+        padding at the end of InlineFlowBox on 64-bit.
+
+        This reduces memory consumption by 780 kB (on 64-bit) when loading the full
+        HTML5 spec.
+
+        * rendering/InlineFlowBox.h:
+        (WebCore::InlineFlowBox::InlineFlowBox):
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::RootInlineBox):
+        (WebCore::RootInlineBox::lineBreakBidiStatus):
+        * rendering/RootInlineBox.h:
+
 2011-10-10  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/Source/WebCore/rendering/InlineFlowBox.h

@@ -47 +47 @@
         , m_includeLogicalRightEdge(false)
         , m_descendantsHaveSameLineHeightAndBaseline(true)
+        , m_baselineType(AlphabeticBaseline)
+        , m_hasAnnotationsBefore(false)
+        , m_hasAnnotationsAfter(false)
 #ifndef NDEBUG
         , m_hasBadChildList(false)
@@ -297 +300 @@
     bool m_descendantsHaveSameLineHeightAndBaseline : 1;
 
-#ifndef NDEBUG
+    // The following members are only used by RootInlineBox but moved here to keep the bits packed.
+
+    // Whether or not this line uses alphabetic or ideographic baselines by default.
+    unsigned m_baselineType : 1; // FontBaseline
+
+    // If the line contains any ruby runs, then this will be true.
+    bool m_hasAnnotationsBefore : 1;
+    bool m_hasAnnotationsAfter : 1;
+
+    unsigned m_lineBreakBidiStatusEor : 5; // WTF::Unicode::Direction
+    unsigned m_lineBreakBidiStatusLastStrong : 5; // WTF::Unicode::Direction
+    unsigned m_lineBreakBidiStatusLast : 5; // WTF::Unicode::Direction
+
+    // End of RootInlineBox-specific members.
+
+#ifndef NDEBUG
+private:
     bool m_hasBadChildList;
 #endif

trunk/Source/WebCore/rendering/RootInlineBox.cpp

@@ -35 +35 @@
 #include "RenderBlock.h"
 #include "VerticalPositionCache.h"
+#include <wtf/unicode/Unicode.h>
 
 using namespace std;
@@ -45 +46 @@
 RootInlineBox::RootInlineBox(RenderBlock* block)
     : InlineFlowBox(block)
+    , m_lineBreakPos(0)
     , m_lineBreakObj(0)
-    , m_lineBreakPos(0)
     , m_lineTop(0)
     , m_lineBottom(0)
@@ -53 +54 @@
     , m_paginationStrut(0)
     , m_paginatedLineWidth(0)
-    , m_baselineType(AlphabeticBaseline)
-    , m_hasAnnotationsBefore(false)
-    , m_hasAnnotationsAfter(false)
 {
     setIsHorizontal(block->isHorizontalWritingMode());
@@ -515 +513 @@
 BidiStatus RootInlineBox::lineBreakBidiStatus() const
 { 
-    return BidiStatus(m_lineBreakBidiStatusEor, m_lineBreakBidiStatusLastStrong, m_lineBreakBidiStatusLast, m_lineBreakContext);
+    return BidiStatus(static_cast<WTF::Unicode::Direction>(m_lineBreakBidiStatusEor), static_cast<WTF::Unicode::Direction>(m_lineBreakBidiStatusLastStrong), static_cast<WTF::Unicode::Direction>(m_lineBreakBidiStatusLast), m_lineBreakContext);
 }
 

trunk/Source/WebCore/rendering/RootInlineBox.h

@@ -185 +185 @@
     int beforeAnnotationsAdjustment() const;
 
+    // This folds into the padding at the end of InlineFlowBox on 64-bit.
+    unsigned m_lineBreakPos;
+
     // Where this line ended.  The exact object and the position within that object are stored so that
     // we can create an InlineIterator beginning just after the end of this line.
     RenderObject* m_lineBreakObj;
-    unsigned m_lineBreakPos;
     RefPtr<BidiContext> m_lineBreakContext;
 
@@ -203 +205 @@
     // good for as long as the line has not been marked dirty.
     OwnPtr<Vector<RenderBox*> > m_floats;
-
-    // Whether or not this line uses alphabetic or ideographic baselines by default.
-    unsigned m_baselineType : 1; // FontBaseline
-    
-    // If the line contains any ruby runs, then this will be true.
-    bool m_hasAnnotationsBefore : 1;
-    bool m_hasAnnotationsAfter : 1;
-
-    WTF::Unicode::Direction m_lineBreakBidiStatusEor : 5;
-    WTF::Unicode::Direction m_lineBreakBidiStatusLastStrong : 5;
-    WTF::Unicode::Direction m_lineBreakBidiStatusLast : 5;
 };