Changeset 161501 in webkit

Timestamp:

Jan 8, 2014 7:43:52 AM (10 years ago)

Author:

akling@apple.com

Message:

Deploy RenderPtr in RenderMathMLOperator::updateFromElement().
<​https://webkit.org/b/126628>

Reviewed by Antti Koivisto.

• rendering/mathml/RenderMathMLOperator.cpp:

(WebCore::RenderMathMLOperator::updateFromElement):

Use RenderPtr/createRenderer for renderer creation.
Removed an unnecessary null check (text is always created.)
Also use RenderStyle::createAnonymousStyleWithDisplay()
helper to shorten down the code a bit.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/mathml/RenderMathMLOperator.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-08  Andreas Kling  <akling@apple.com>
+
+        Deploy RenderPtr in RenderMathMLOperator::updateFromElement().
+        <https://webkit.org/b/126628>
+
+        Reviewed by Antti Koivisto.
+
+        * rendering/mathml/RenderMathMLOperator.cpp:
+        (WebCore::RenderMathMLOperator::updateFromElement):
+
+            Use RenderPtr/createRenderer for renderer creation.
+            Removed an unnecessary null check (text is always created.)
+            Also use RenderStyle::createAnonymousStyleWithDisplay()
+            helper to shorten down the code a bit.
+
 2014-01-08  Alberto Garcia  <berto@igalia.com>
 

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

@@ -173 +173 @@
     // renderer to 0, so we need to restore it.
     element().setRenderer(savedRenderer);
-    
-    auto newStyle = RenderStyle::create();
-    newStyle.get().inheritFrom(&style());
-    newStyle.get().setDisplay(FLEX);
-
-    RenderMathMLBlock* container = new RenderMathMLBlock(element(), std::move(newStyle));
+
+    RenderPtr<RenderMathMLBlock> container = createRenderer<RenderMathMLBlock>(element(), RenderStyle::createAnonymousStyleWithDisplay(&style(), FLEX));
     // This container doesn't offer any useful information to accessibility.
     container->setIgnoreInAccessibilityTree(true);
     container->initializeStyle();
 
-    addChild(container);
-    RenderText* text;
+    RenderPtr<RenderText> text;
     if (m_operator)
-        text = new RenderText(document(), String(&m_operator, 1));
+        text = createRenderer<RenderText>(document(), String(&m_operator, 1));
     else
-        text = new RenderText(document(), element().textContent().replace(hyphenMinus, minusSign).impl());
-
-    // If we can't figure out the text, leave it blank.
-    if (text)
-        container->addChild(text);
+        text = createRenderer<RenderText>(document(), element().textContent().replace(hyphenMinus, minusSign).impl());
+
+    container->addChild(text.leakPtr());
+    addChild(container.leakPtr());
 
     updateStyle();