Changeset 109658 in webkit

Timestamp:

Mar 3, 2012 1:12:21 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Free up a bit in RenderObject.
​http://webkit.org/b/80208

Patch by Andreas Kling <​awesomekling@apple.com> on 2012-03-03
Reviewed by Anders Carlsson.

Move m_hasMarkupTruncation to RenderBlock, stealing one bit from m_lineHeight.
This flag is only used by RenderBlock.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::RenderBlock):

• rendering/RenderBlock.h:

(WebCore::RenderBlock::setHasMarkupTruncation):
(WebCore::RenderBlock::hasMarkupTruncation):
(RenderBlock):

• rendering/RenderObject.h:

(RenderObject):
(WebCore::RenderObject::RenderObjectBitfields::RenderObjectBitfields):
(RenderObjectBitfields):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderBlock.h (modified) (2 diffs)
• rendering/RenderObject.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-03  Andreas Kling  <awesomekling@apple.com>
+
+        Free up a bit in RenderObject.
+        http://webkit.org/b/80208
+
+        Reviewed by Anders Carlsson.
+
+        Move m_hasMarkupTruncation to RenderBlock, stealing one bit from m_lineHeight.
+        This flag is only used by RenderBlock.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::RenderBlock):
+        * rendering/RenderBlock.h:
+        (WebCore::RenderBlock::setHasMarkupTruncation):
+        (WebCore::RenderBlock::hasMarkupTruncation):
+        (RenderBlock):
+        * rendering/RenderObject.h:
+        (RenderObject):
+        (WebCore::RenderObject::RenderObjectBitfields::RenderObjectBitfields):
+        (RenderObjectBitfields):
+
 2012-03-03  Joe Thomas  <joethomas@motorola.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -167 +167 @@
       , m_beingDestroyed(false)
       , m_hasPositionedFloats(false)
+      , m_hasMarkupTruncation(false)
 {
     setChildrenInline(true);

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -114 +114 @@
 #endif
 
+    void setHasMarkupTruncation(bool b) { m_hasMarkupTruncation = b; }
+    bool hasMarkupTruncation() const { return m_hasMarkupTruncation; }
+
     RootInlineBox* createAndAppendRootInlineBox();
 
@@ -1120 +1123 @@
     RenderLineBoxList m_lineBoxes;   // All of the root line boxes created for this block flow.  For example, <div>Hello<br>world.</div> will have two total lines for the <div>.
 
-    mutable signed m_lineHeight : 30;
+    mutable signed m_lineHeight : 29;
     bool m_beingDestroyed : 1;
     bool m_hasPositionedFloats : 1;
+    bool m_hasMarkupTruncation : 1;
 
     // RenderRubyBase objects need to be able to split and merge, moving their children around

trunk/Source/WebCore/rendering/RenderObject.h

@@ -746 +746 @@
     // Applied as a "slop" to dirty rect checks during the outline painting phase's dirty-rect checks.
     LayoutUnit maximalOutlineSize(PaintPhase) const;
-
-    void setHasMarkupTruncation(bool b = true) { m_bitfields.setHasMarkupTruncation(b); }
-    bool hasMarkupTruncation() const { return m_bitfields.hasMarkupTruncation(); }
 
     enum SelectionState {
@@ -935 +932 @@
             , m_marginBeforeQuirk(false) 
             , m_marginAfterQuirk(false)
-            , m_hasMarkupTruncation(false)
             , m_hasColumns(false)
             , m_selectionState(SelectionNone)
@@ -979 +975 @@
         ADD_BOOLEAN_BITFIELD(marginBeforeQuirk, MarginBeforeQuirk);
         ADD_BOOLEAN_BITFIELD(marginAfterQuirk, MarginAfterQuirk);
-        ADD_BOOLEAN_BITFIELD(hasMarkupTruncation, HasMarkupTruncation);
         ADD_BOOLEAN_BITFIELD(hasColumns, HasColumns);