Changeset 47403 in webkit

Timestamp:

Aug 17, 2009 5:58:10 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-08-17 Roland Steiner <​rolandsteiner@google.com>

Reviewed by Eric Seidel.

Moved implementation of isAfterContent to RenderObject
(as inline method to avoid potential performance regressions).

BUG 28376 - [Cleanup] isAfterContent() implemented twice, should be member of RenderObject
(​https://bugs.webkit.org/show_bug.cgi?id=28376)

• rendering/RenderBox.cpp:
• rendering/RenderBox.h:
• rendering/RenderInline.cpp:
• rendering/RenderObject.h: (WebCore::RenderObject::isAfterContent):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (1 diff)
• rendering/RenderBox.h (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (1 diff)
• rendering/RenderObject.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-17  Roland Steiner  <rolandsteiner@google.com>
+
+        Reviewed by Eric Seidel.
+
+        Moved implementation of isAfterContent to RenderObject
+        (as inline method to avoid potential performance regressions).
+
+        BUG 28376 -  [Cleanup] isAfterContent() implemented twice, should be member of RenderObject
+        (https://bugs.webkit.org/show_bug.cgi?id=28376)
+
+        * rendering/RenderBox.cpp:
+        * rendering/RenderBox.h:
+        * rendering/RenderInline.cpp:
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::isAfterContent):
+
 2009-08-17  Shinichiro Hamaji  <hamaji@chromium.org>
 

trunk/WebCore/rendering/RenderBox.cpp

@@ -2656 +2656 @@
 }
 
-bool RenderBox::isAfterContent(RenderObject* child) const
-{
-    return (child && child->style()->styleType() == AFTER && (!child->isText() || child->isBR()));
-}
-
 VisiblePosition RenderBox::positionForPoint(const IntPoint& point)
 {

trunk/WebCore/rendering/RenderBox.h

@@ -335 +335 @@
     virtual void calcPrefWidths() { setPrefWidthsDirty(false); }
 
-protected:
-    bool isAfterContent(RenderObject* child) const;
-
 private:
     // The width/height of the contents + borders + padding.  The x/y location is relative to our container (which is not always our parent).

trunk/WebCore/rendering/RenderInline.cpp

@@ -132 +132 @@
 }
 
-static inline bool isAfterContent(RenderObject* child)
-{
-    if (!child)
-        return false;
-    if (child->style()->styleType() != AFTER)
-        return false;
-    // Text nodes don't have their own styles, so ignore the style on a text node.
-    if (child->isText() && !child->isBR())
-        return false;
-    return true;
-}
-
 void RenderInline::addChild(RenderObject* newChild, RenderObject* beforeChild)
 {

trunk/WebCore/rendering/RenderObject.h

@@ -286 +286 @@
     bool isHTMLMarquee() const;
 
+    inline bool isAfterContent() const;
+    static inline bool isAfterContent(const RenderObject* obj) { return obj && obj->isAfterContent(); }
+
     bool childrenInline() const { return m_childrenInline; }
     void setChildrenInline(bool b = true) { m_childrenInline = b; }
@@ -859 +862 @@
 }
 
+inline bool RenderObject::isAfterContent() const
+{
+    if (style()->styleType() != AFTER)
+        return false;
+    // Text nodes don't have their own styles, so ignore the style on a text node.
+    if (isText() && !isBR())
+        return false;
+    return true;
+}
+
 inline void RenderObject::setNeedsLayout(bool b, bool markParents)
 {