Changeset 107473 in webkit

Timestamp:

Feb 10, 2012 8:28:26 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

MathML internals - use createXXX() function naming, ASSERT()s
​https://bugs.webkit.org/show_bug.cgi?id=78384

Patch by David Barton <Dave Barton> on 2012-02-10
Reviewed by Eric Seidel.

Standard RefPtr function naming uses "createXXX" instead of "makeXXX".
I also added a couple of ASSERT()s.

No new tests.

• rendering/mathml/RenderMathMLBlock.cpp:

(WebCore::RenderMathMLBlock::createBlockStyle):

• rendering/mathml/RenderMathMLBlock.h:

(RenderMathMLBlock):

• rendering/mathml/RenderMathMLFenced.cpp:

(WebCore::RenderMathMLFenced::createOperatorStyle):
(WebCore::RenderMathMLFenced::makeFences):
(WebCore::RenderMathMLFenced::addChild):

• rendering/mathml/RenderMathMLFenced.h:

(RenderMathMLFenced):

• rendering/mathml/RenderMathMLFraction.cpp:

(WebCore::RenderMathMLFraction::addChild):

• rendering/mathml/RenderMathMLRoot.cpp:

(WebCore::RenderMathMLRoot::addChild):

• rendering/mathml/RenderMathMLSubSup.cpp:

(WebCore::RenderMathMLSubSup::RenderMathMLSubSup):

• rendering/mathml/RenderMathMLUnderOver.cpp:

(WebCore::RenderMathMLUnderOver::RenderMathMLUnderOver):
(WebCore::RenderMathMLUnderOver::addChild):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/mathml/RenderMathMLBlock.cpp (modified) (1 diff)
• rendering/mathml/RenderMathMLBlock.h (modified) (1 diff)
• rendering/mathml/RenderMathMLFenced.cpp (modified) (3 diffs)
• rendering/mathml/RenderMathMLFenced.h (modified) (1 diff)
• rendering/mathml/RenderMathMLFraction.cpp (modified) (1 diff)
• rendering/mathml/RenderMathMLRoot.cpp (modified) (2 diffs)
• rendering/mathml/RenderMathMLSubSup.cpp (modified) (1 diff)
• rendering/mathml/RenderMathMLUnderOver.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-10  David Barton  <dbarton@mathscribe.com>
+
+        MathML internals - use createXXX() function naming, ASSERT()s
+        https://bugs.webkit.org/show_bug.cgi?id=78384
+
+        Reviewed by Eric Seidel.
+
+        Standard RefPtr function naming uses "createXXX" instead of "makeXXX".
+        I also added a couple of ASSERT()s.
+
+        No new tests.
+
+        * rendering/mathml/RenderMathMLBlock.cpp:
+        (WebCore::RenderMathMLBlock::createBlockStyle):
+        * rendering/mathml/RenderMathMLBlock.h:
+        (RenderMathMLBlock):
+        * rendering/mathml/RenderMathMLFenced.cpp:
+        (WebCore::RenderMathMLFenced::createOperatorStyle):
+        (WebCore::RenderMathMLFenced::makeFences):
+        (WebCore::RenderMathMLFenced::addChild):
+        * rendering/mathml/RenderMathMLFenced.h:
+        (RenderMathMLFenced):
+        * rendering/mathml/RenderMathMLFraction.cpp:
+        (WebCore::RenderMathMLFraction::addChild):
+        * rendering/mathml/RenderMathMLRoot.cpp:
+        (WebCore::RenderMathMLRoot::addChild):
+        * rendering/mathml/RenderMathMLSubSup.cpp:
+        (WebCore::RenderMathMLSubSup::RenderMathMLSubSup):
+        * rendering/mathml/RenderMathMLUnderOver.cpp:
+        (WebCore::RenderMathMLUnderOver::RenderMathMLUnderOver):
+        (WebCore::RenderMathMLUnderOver::addChild):
+
 2012-02-10  Dan Bernstein  <mitz@apple.com>
 

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

@@ -50 +50 @@
 }
 
-PassRefPtr<RenderStyle> RenderMathMLBlock::makeBlockStyle()
+PassRefPtr<RenderStyle> RenderMathMLBlock::createBlockStyle()
 {
     RefPtr<RenderStyle> newStyle = RenderStyle::create();

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

@@ -71 +71 @@
         return 0;
     }
-    virtual PassRefPtr<RenderStyle> makeBlockStyle();
+    virtual PassRefPtr<RenderStyle> createBlockStyle();
 
 private:

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

@@ -81 +81 @@
 }
 
-PassRefPtr<RenderStyle> RenderMathMLFenced::makeOperatorStyle()
+PassRefPtr<RenderStyle> RenderMathMLFenced::createOperatorStyle()
 {
     RefPtr<RenderStyle> newStyle = RenderStyle::create();
@@ -93 +93 @@
 {
     RenderObject* openFence = new (renderArena()) RenderMathMLOperator(node(), m_open);
-    openFence->setStyle(makeOperatorStyle());
+    openFence->setStyle(createOperatorStyle());
     RenderBlock::addChild(openFence, firstChild());
     RenderObject* closeFence = new (renderArena()) RenderMathMLOperator(node(), m_close);
-    closeFence->setStyle(makeOperatorStyle());
+    closeFence->setStyle(createOperatorStyle());
     RenderBlock::addChild(closeFence);
 }
@@ -123 +123 @@
                 
             RenderObject* separatorObj = new (renderArena()) RenderMathMLOperator(node(), separator);
-            separatorObj->setStyle(makeOperatorStyle());
+            separatorObj->setStyle(createOperatorStyle());
             RenderBlock::addChild(separatorObj, lastChild());
         }

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

@@ -42 +42 @@
     virtual const char* renderName() const { return "RenderMathMLFenced"; }
 
-    PassRefPtr<RenderStyle> makeOperatorStyle();
+    PassRefPtr<RenderStyle> createOperatorStyle();
     void makeFences();
     

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

@@ -102 +102 @@
 {
     RenderBlock* row = new (renderArena()) RenderMathMLBlock(node());
-    RefPtr<RenderStyle> rowStyle = makeBlockStyle();
+    RefPtr<RenderStyle> rowStyle = createBlockStyle();
     
     rowStyle->setTextAlign(CENTER);

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

@@ -75 +75 @@
         // Add a block for the index
         RenderBlock* block = new (renderArena()) RenderBlock(node());
-        RefPtr<RenderStyle> indexStyle = makeBlockStyle();
+        RefPtr<RenderStyle> indexStyle = createBlockStyle();
         indexStyle->setDisplay(INLINE_BLOCK);
         block->setStyle(indexStyle.release());
@@ -83 +83 @@
         // this is the base, so wrap it so we can pad it
         block = new (renderArena()) RenderBlock(node());
-        RefPtr<RenderStyle> baseStyle = makeBlockStyle();
+        RefPtr<RenderStyle> baseStyle = createBlockStyle();
         baseStyle->setDisplay(INLINE_BLOCK);
         baseStyle->setPaddingLeft(Length(5 * gRadicalWidth , Percent));

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

@@ -44 +44 @@
     , m_scripts(0)
 {
-    // Determine what kind of under/over expression we have by element name
+    // Determine what kind of sub/sup expression we have by element name
     if (element->hasLocalName(MathMLNames::msubTag))
         m_kind = Sub;
     else if (element->hasLocalName(MathMLNames::msupTag))
         m_kind = Sup;
-    else if (element->hasLocalName(MathMLNames::msubsupTag))
+    else {
+        ASSERT(element->hasLocalName(MathMLNames::msubsupTag));
         m_kind = SubSup;
-    else 
-        m_kind = SubSup;
+    }
 }
 

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

@@ -43 +43 @@
 {
     // Determine what kind of under/over expression we have by element name
-    
     if (element->hasLocalName(MathMLNames::munderTag))
         m_kind = Under;
     else if (element->hasLocalName(MathMLNames::moverTag))
         m_kind = Over;
-    else if (element->hasLocalName(MathMLNames::munderoverTag))
+    else {
+        ASSERT(element->hasLocalName(MathMLNames::munderoverTag));
         m_kind = UnderOver;
-    else 
-        m_kind = Under;
-    
+    }
 }
 
@@ -58 +56 @@
 {    
     RenderMathMLBlock* row = new (renderArena()) RenderMathMLBlock(node());
-    RefPtr<RenderStyle> rowStyle = makeBlockStyle();
+    RefPtr<RenderStyle> rowStyle = createBlockStyle();
     row->setStyle(rowStyle.release());
     row->setIsAnonymous(true);