Changeset 155962 in webkit

Timestamp:

Sep 17, 2013, 9:00:04 AM (12 years ago)

Author:

Antti Koivisto

Message:

Add RenderObject bit for isBR().
​https://bugs.webkit.org/show_bug.cgi?id=121494

Reviewed by Andreas Kling.

It is no longer piggybacking on isText() flag and is now hot in inline layout.

• rendering/RenderBR.cpp:

(WebCore::RenderBR::RenderBR):

• rendering/RenderBR.h:
• rendering/RenderObject.h:

(WebCore::RenderObject::isBR):
(WebCore::RenderObject::setIsBR):
(WebCore::RenderObject::RenderObjectBitfields::RenderObjectBitfields):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBR.cpp (modified) (1 diff)
• rendering/RenderBR.h (modified) (1 diff)
• rendering/RenderObject.h (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-17  Antti Koivisto  <antti@apple.com>
+
+        Add RenderObject bit for isBR().
+        https://bugs.webkit.org/show_bug.cgi?id=121494
+
+        Reviewed by Andreas Kling.
+
+        It is no longer piggybacking on isText() flag and is now hot in inline layout.
+
+        * rendering/RenderBR.cpp:
+        (WebCore::RenderBR::RenderBR):
+        * rendering/RenderBR.h:
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::isBR):
+        (WebCore::RenderObject::setIsBR):
+        (WebCore::RenderObject::RenderObjectBitfields::RenderObjectBitfields):
+
 2013-09-17  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/rendering/RenderBR.cpp

@@ -37 +37 @@
     , m_cachedLineHeight(invalidLineHeight)
 {
+    setIsBR();
 }
 

trunk/Source/WebCore/rendering/RenderBR.h

@@ -51 +51 @@
 
 private:
-    virtual bool isBR() const OVERRIDE { return true; }
-
     virtual VisiblePosition positionForPoint(const LayoutPoint&) OVERRIDE;
     virtual int caretMinOffset() const OVERRIDE;

trunk/Source/WebCore/rendering/RenderObject.h

@@ -344 +344 @@
     bool isPseudoElement() const { return node() && node()->isPseudoElement(); }
 
-    virtual bool isBR() const { return false; }
     virtual bool isBoxModelObject() const { return false; }
     virtual bool isCounter() const { return false; }
@@ -569 +568 @@
 
     bool isText() const  { return !m_bitfields.isBox() && m_bitfields.isTextOrRenderView(); }
+    bool isBR() const { return m_bitfields.isBR(); }
     bool isBox() const { return m_bitfields.isBox(); }
     bool isRenderView() const  { return m_bitfields.isBox() && m_bitfields.isTextOrRenderView(); }
@@ -701 +701 @@
 
     void setIsText() { ASSERT(!isBox()); m_bitfields.setIsTextOrRenderView(true); }
+    void setIsBR() { m_bitfields.setIsBR(true); }
     void setIsBox() { m_bitfields.setIsBox(true); }
     void setIsRenderView() { ASSERT(isBox()); m_bitfields.setIsTextOrRenderView(true); }
@@ -1100 +1101 @@
             , m_isInline(true)
             , m_isReplaced(false)
+            , m_isBR(false)
             , m_horizontalWritingMode(true)
             , m_isDragging(false)
@@ -1117 +1119 @@
         }
         
-        // 31 bits have been used here. There is one bit available.
+        // 32 bits have been used here. There are no bits available.
         ADD_BOOLEAN_BITFIELD(needsLayout, NeedsLayout);
         ADD_BOOLEAN_BITFIELD(needsPositionedMovementLayout, NeedsPositionedMovementLayout);
@@ -1131 +1133 @@
         ADD_BOOLEAN_BITFIELD(isInline, IsInline);
         ADD_BOOLEAN_BITFIELD(isReplaced, IsReplaced);
+        ADD_BOOLEAN_BITFIELD(isBR, IsBR);
         ADD_BOOLEAN_BITFIELD(horizontalWritingMode, HorizontalWritingMode);
         ADD_BOOLEAN_BITFIELD(isDragging, IsDragging);