From dcc8cf2e65d1aa555cce12431a16547e66b469ee Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 27 Apr 2010 16:31:00 +0100 Subject: Merge webkit.org at r58033 : Initial merge by git Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1 --- WebCore/mathml/MathMLInlineContainerElement.cpp | 28 +++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'WebCore/mathml/MathMLInlineContainerElement.cpp') diff --git a/WebCore/mathml/MathMLInlineContainerElement.cpp b/WebCore/mathml/MathMLInlineContainerElement.cpp index 019c4ce..2d682a2 100644 --- a/WebCore/mathml/MathMLInlineContainerElement.cpp +++ b/WebCore/mathml/MathMLInlineContainerElement.cpp @@ -31,6 +31,11 @@ #include "MathMLNames.h" #include "RenderMathMLBlock.h" +#include "RenderMathMLFraction.h" +#include "RenderMathMLMath.h" +#include "RenderMathMLRow.h" +#include "RenderMathMLSubSup.h" +#include "RenderMathMLUnderOver.h" namespace WebCore { @@ -48,8 +53,27 @@ PassRefPtr MathMLInlineContainerElement::create(co RenderObject* MathMLInlineContainerElement::createRenderer(RenderArena *arena, RenderStyle* style) { - // FIXME: This method will contain the specialized renderers based on element name - RenderObject* object = new (arena) RenderMathMLBlock(this); + RenderObject* object = 0; + if (hasLocalName(MathMLNames::mrowTag)) + object = new (arena) RenderMathMLRow(this); + else if (hasLocalName(MathMLNames::mathTag)) + object = new (arena) RenderMathMLMath(this); + else if (hasLocalName(MathMLNames::msubTag)) + object = new (arena) RenderMathMLSubSup(this); + else if (hasLocalName(MathMLNames::msupTag)) + object = new (arena) RenderMathMLSubSup(this); + else if (hasLocalName(MathMLNames::msubsupTag)) + object = new (arena) RenderMathMLSubSup(this); + else if (hasLocalName(MathMLNames::moverTag)) + object = new (arena) RenderMathMLUnderOver(this); + else if (hasLocalName(MathMLNames::munderTag)) + object = new (arena) RenderMathMLUnderOver(this); + else if (hasLocalName(MathMLNames::munderoverTag)) + object = new (arena) RenderMathMLUnderOver(this); + else if (hasLocalName(MathMLNames::mfracTag)) + object = new (arena) RenderMathMLFraction(this); + else + object = new (arena) RenderMathMLBlock(this); object->setStyle(style); return object; } -- cgit v1.1