Changeset 157613 in webkit

Timestamp:

Oct 17, 2013, 4:33:53 PM (13 years ago)

Author:

akling@apple.com

Message:

CTTE: RenderMathMLSpace always has a MathMLTextElement.
<​https://webkit.org/b/122992>

The renderer is never anonymous and always has a corresponding
MathMLTextElement. Overload element() with a tighter return type.

Also marked the class FINAL and made most methods private.

Reviewed by Antti Koivisto.

• rendering/mathml/RenderMathMLSpace.cpp:

(WebCore::RenderMathMLSpace::RenderMathMLSpace):
(WebCore::RenderMathMLSpace::updateFromElement):

• rendering/mathml/RenderMathMLSpace.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/mathml/RenderMathMLSpace.cpp (modified) (3 diffs)
• rendering/mathml/RenderMathMLSpace.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-17  Andreas Kling  <akling@apple.com>
+
+        CTTE: RenderMathMLSpace always has a MathMLTextElement.
+        <https://webkit.org/b/122992>
+
+        The renderer is never anonymous and always has a corresponding
+        MathMLTextElement. Overload element() with a tighter return type.
+
+        Also marked the class FINAL and made most methods private.
+
+        Reviewed by Antti Koivisto.
+
+        * rendering/mathml/RenderMathMLSpace.cpp:
+        (WebCore::RenderMathMLSpace::RenderMathMLSpace):
+        (WebCore::RenderMathMLSpace::updateFromElement):
+        * rendering/mathml/RenderMathMLSpace.h:
+
 2013-10-17  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -37 +37 @@
 using namespace MathMLNames;
 
-RenderMathMLSpace::RenderMathMLSpace(Element& element)
+RenderMathMLSpace::RenderMathMLSpace(MathMLTextElement& element)
     : RenderMathMLBlock(element)
     , m_width(0)
@@ -53 +53 @@
 void RenderMathMLSpace::updateFromElement()
 {
-    Element* space = element();
+    const auto& spaceElement = element();
 
     // This parses the mspace attributes, using 0 as the default values.
@@ -59 +59 @@
     m_height = 0;
     m_depth = 0;
-    parseMathMLLength(space->getAttribute(MathMLNames::widthAttr), m_width, style());
-    parseMathMLLength(space->getAttribute(MathMLNames::heightAttr), m_height, style());
-    parseMathMLLength(space->getAttribute(MathMLNames::depthAttr), m_depth, style());
+    parseMathMLLength(spaceElement.getAttribute(MathMLNames::widthAttr), m_width, style());
+    parseMathMLLength(spaceElement.getAttribute(MathMLNames::heightAttr), m_height, style());
+    parseMathMLLength(spaceElement.getAttribute(MathMLNames::depthAttr), m_depth, style());
 
     // FIXME: Negative width values should be accepted.

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

@@ -29 +29 @@
 #if ENABLE(MATHML)
 
+#include "MathMLTextElement.h"
 #include "RenderMathMLBlock.h"
 
 namespace WebCore {
     
-class RenderMathMLSpace : public RenderMathMLBlock {
+class RenderMathMLSpace FINAL : public RenderMathMLBlock {
 public:
-    explicit RenderMathMLSpace(Element&);
+    explicit RenderMathMLSpace(MathMLTextElement&);
+    MathMLTextElement& element() { return static_cast<MathMLTextElement&>(nodeForNonAnonymous()); }
 
+private:
+    virtual const char* renderName() const OVERRIDE { return isAnonymous() ? "RenderMathMLSpace (anonymous)" : "RenderMathMLSpace"; }
+    virtual bool isRenderMathMLSpace() const OVERRIDE { return true; }
+    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
+    virtual bool isChildAllowed(const RenderObject&, const RenderStyle&) const OVERRIDE { return false; }
+    virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE;
+    virtual void updateFromElement() OVERRIDE;
     virtual int firstLineBoxBaseline() const OVERRIDE;
     virtual void updateLogicalWidth() OVERRIDE;
     virtual void updateLogicalHeight() OVERRIDE;
-
-private:
-    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
-    virtual const char* renderName() const OVERRIDE { return isAnonymous() ? "RenderMathMLSpace (anonymous)" : "RenderMathMLSpace"; }
-
-    virtual bool isRenderMathMLSpace() const OVERRIDE { return true; }
-
-    virtual bool isChildAllowed(const RenderObject&, const RenderStyle&) const OVERRIDE { return false; }
-    virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE;
-
-    virtual void updateFromElement() OVERRIDE;
 
     LayoutUnit m_width;