diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebCore/mathml/MathMLInlineContainerElement.cpp | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebCore/mathml/MathMLInlineContainerElement.cpp')
| -rw-r--r-- | WebCore/mathml/MathMLInlineContainerElement.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/WebCore/mathml/MathMLInlineContainerElement.cpp b/WebCore/mathml/MathMLInlineContainerElement.cpp index c5fcac9..efc9f8c 100644 --- a/WebCore/mathml/MathMLInlineContainerElement.cpp +++ b/WebCore/mathml/MathMLInlineContainerElement.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2009 Alex Milowski (alex@milowski.com). All rights reserved. + * Copyright (C) 2010 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -32,7 +33,6 @@ #include "MathMLNames.h" #include "RenderMathMLBlock.h" #include "RenderMathMLFraction.h" -#include "RenderMathMLMath.h" #include "RenderMathMLRoot.h" #include "RenderMathMLRow.h" #include "RenderMathMLSquareRoot.h" @@ -50,16 +50,14 @@ MathMLInlineContainerElement::MathMLInlineContainerElement(const QualifiedName& PassRefPtr<MathMLInlineContainerElement> MathMLInlineContainerElement::create(const QualifiedName& tagName, Document* document) { - return new MathMLInlineContainerElement(tagName, document); + return adoptRef(new MathMLInlineContainerElement(tagName, document)); } -RenderObject* MathMLInlineContainerElement::createRenderer(RenderArena *arena, RenderStyle* style) +RenderObject* MathMLInlineContainerElement::createRenderer(RenderArena* arena, RenderStyle* style) { - RenderObject* object = 0; + RenderObject* object; 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)) @@ -83,9 +81,7 @@ RenderObject* MathMLInlineContainerElement::createRenderer(RenderArena *arena, R object->setStyle(style); return object; } - - + } #endif // ENABLE(MATHML) - |