Changeset 143289 in webkit

Timestamp:

Feb 18, 2013 7:38:46 PM (11 years ago)

Author:

rniwa@webkit.org

Message:

Encapsulate FloatingObject's constructor inside create
​https://bugs.webkit.org/show_bug.cgi?id=110169

Reviewed by Darin Adler.

Added FloatingObject::create and made FloatingObject's constructor private.
Also added RenderBlock::ensureFloatingObjects to help lazily creating FloatingObjects.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::insertFloatingObject):
(WebCore::RenderBlock::addOverhangingFloats):
(WebCore::RenderBlock::addIntrudingFloats):
(WebCore::RenderBlock::ensureFloatingObjects):
(WebCore::RenderBlock::FloatingObjects::create):
(WebCore::RenderBlock::FloatingObjects::FloatingObjects):

• rendering/RenderBlock.h:

(FloatingObjects):
(RenderBlock):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-18  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Encapsulate FloatingObject's constructor inside create
+        https://bugs.webkit.org/show_bug.cgi?id=110169
+
+        Reviewed by Darin Adler.
+
+        Added FloatingObject::create and made FloatingObject's constructor private.
+        Also added RenderBlock::ensureFloatingObjects to help lazily creating FloatingObjects.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::insertFloatingObject):
+        (WebCore::RenderBlock::addOverhangingFloats):
+        (WebCore::RenderBlock::addIntrudingFloats):
+        (WebCore::RenderBlock::ensureFloatingObjects):
+        (WebCore::RenderBlock::FloatingObjects::create):
+        (WebCore::RenderBlock::FloatingObjects::FloatingObjects):
+        * rendering/RenderBlock.h:
+        (FloatingObjects):
+        (RenderBlock):
+
 2013-02-18  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -3889 +3889 @@
     // Create the list of special objects if we don't aleady have one
     if (!m_floatingObjects)
-        m_floatingObjects = adoptPtr(new FloatingObjects(this, isHorizontalWritingMode()));
+        createFloatingObjects();
     else {
         // Don't insert the object again if it's already in the list
@@ -4656 +4656 @@
                 // We create the floating object list lazily.
                 if (!m_floatingObjects)
-                    m_floatingObjects = adoptPtr(new FloatingObjects(this, isHorizontalWritingMode()));
-
+                    createFloatingObjects();
                 m_floatingObjects->add(floatingObj);
             }
@@ -4729 +4728 @@
                 // We create the floating object list lazily.
                 if (!m_floatingObjects)
-                    m_floatingObjects = adoptPtr(new FloatingObjects(this, isHorizontalWritingMode()));
+                    createFloatingObjects();
                 m_floatingObjects->add(floatingObj);
             }
@@ -7761 +7760 @@
 }
 
+inline RenderBlock::FloatingObjects::FloatingObjects(const RenderBlock* renderer, bool horizontalWritingMode)
+    : m_placedFloatsTree(UninitializedTree)
+    , m_leftObjectsCount(0)
+    , m_rightObjectsCount(0)
+    , m_horizontalWritingMode(horizontalWritingMode)
+    , m_renderer(renderer)
+{
+}
+
+inline PassOwnPtr<RenderBlock::FloatingObjects> RenderBlock::FloatingObjects::create(const RenderBlock* renderer, bool horizontalWritingMode)
+{
+    return adoptPtr(new FloatingObjects(renderer, horizontalWritingMode));
+}
+
+void RenderBlock::createFloatingObjects()
+{
+    if (m_floatingObjects)
+        return;
+    m_floatingObjects = FloatingObjects::create(this, isHorizontalWritingMode());
+}
+
 inline void RenderBlock::FloatingObjects::clear()
 {

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -1140 +1140 @@
 
     class FloatingObjects {
+        WTF_MAKE_NONCOPYABLE(FloatingObjects); WTF_MAKE_FAST_ALLOCATED;
     public:
-        FloatingObjects(const RenderBlock* renderer, bool horizontalWritingMode)
-            : m_placedFloatsTree(UninitializedTree)
-            , m_leftObjectsCount(0)
-            , m_rightObjectsCount(0)
-            , m_horizontalWritingMode(horizontalWritingMode)
-            , m_renderer(renderer)
-        {
-        }
-
+        static PassOwnPtr<FloatingObjects> create(const RenderBlock*, bool horizontalWritingMode);
         void clear();
         void add(FloatingObject*);
@@ -1166 +1159 @@
         }
     private:
+        FloatingObjects(const RenderBlock*, bool horizontalWritingMode);
         void computePlacedFloatsTree();
         inline void computePlacedFloatsTreeIfNeeded()
@@ -1183 +1177 @@
         const RenderBlock* m_renderer;
     };
+
     OwnPtr<FloatingObjects> m_floatingObjects;
+
+    void createFloatingObjects();
+
 
     // Allocated only when some of these fields have non-default values