Changeset 161493 in webkit

Timestamp:

Jan 8, 2014 3:20:11 AM (10 years ago)

Author:

akling@apple.com

Message:

RenderMathMLRow::createAnonymousWithParentRenderer() should return RenderPtr.
<​https://webkit.org/b/126631>

Reviewed by Antti Koivisto.

• rendering/mathml/RenderMathMLRow.h:
• rendering/mathml/RenderMathMLRow.cpp:

(WebCore::RenderMathMLRow::createAnonymousWithParentRenderer):

Tweak to return RenderPtr<RenderMathMLRow> and removed comment(!)
about how this should return a smart pointer. Also take the
parent renderer as a RenderMathMLRoot& instead of a RenderObject*
since that's all we ever pass.

• rendering/mathml/RenderMathMLRoot.cpp:

(WebCore::RenderMathMLRoot::addChild):

Updated for new createAnonymousWithParentRenderer() signature.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/mathml/RenderMathMLRoot.cpp (modified) (1 diff)
• rendering/mathml/RenderMathMLRow.cpp (modified) (2 diffs)
• rendering/mathml/RenderMathMLRow.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-08  Andreas Kling  <akling@apple.com>
+
+        RenderMathMLRow::createAnonymousWithParentRenderer() should return RenderPtr.
+        <https://webkit.org/b/126631>
+
+        Reviewed by Antti Koivisto.
+
+        * rendering/mathml/RenderMathMLRow.h:
+        * rendering/mathml/RenderMathMLRow.cpp:
+        (WebCore::RenderMathMLRow::createAnonymousWithParentRenderer):
+
+            Tweak to return RenderPtr<RenderMathMLRow> and removed comment(!)
+            about how this should return a smart pointer. Also take the
+            parent renderer as a RenderMathMLRoot& instead of a RenderObject*
+            since that's all we ever pass.
+
+        * rendering/mathml/RenderMathMLRoot.cpp:
+        (WebCore::RenderMathMLRoot::addChild):
+
+            Updated for new createAnonymousWithParentRenderer() signature.
+
 2014-01-08  Mario Sanchez Prada  <mario.prada@samsung.com>
 

trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp

@@ -164 +164 @@
     // to measure and store a glyph-based height for preferredLogicalHeightAfterSizing.
     if (!firstChild())
-        RenderMathMLBlock::addChild(RenderMathMLRow::createAnonymousWithParentRenderer(this));
+        RenderMathMLBlock::addChild(RenderMathMLRow::createAnonymousWithParentRenderer(*this).leakPtr());
     
     // An <mroot>'s index has { position: absolute }.

trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp

@@ -33 +33 @@
 #include "RenderIterator.h"
 #include "RenderMathMLOperator.h"
+#include "RenderMathMLRoot.h"
 
 namespace WebCore {
@@ -48 +49 @@
 }
 
-// FIXME: Change all these createAnonymous... routines to return a PassOwnPtr<>.
-RenderMathMLRow* RenderMathMLRow::createAnonymousWithParentRenderer(const RenderObject* parent)
+RenderPtr<RenderMathMLRow> RenderMathMLRow::createAnonymousWithParentRenderer(RenderMathMLRoot& parent)
 {
-    RenderMathMLRow* newMRow = new RenderMathMLRow(parent->document(), RenderStyle::createAnonymousStyleWithDisplay(&parent->style(), FLEX));
+    RenderPtr<RenderMathMLRow> newMRow = createRenderer<RenderMathMLRow>(parent.document(), RenderStyle::createAnonymousStyleWithDisplay(&parent.style(), FLEX));
     newMRow->initializeStyle();
     return newMRow;

trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.h

@@ -32 +32 @@
 
 namespace WebCore {
-    
+
+class RenderMathMLRoot;
+
 class RenderMathMLRow : public RenderMathMLBlock {
 public:
@@ -38 +40 @@
     RenderMathMLRow(Document&, PassRef<RenderStyle>);
 
-    static RenderMathMLRow* createAnonymousWithParentRenderer(const RenderObject*);
+    static RenderPtr<RenderMathMLRow> createAnonymousWithParentRenderer(RenderMathMLRoot&);
 
 protected: