Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 0 insertions, 87 deletions

diff --git a/WebCore/mathml/MathMLInlineContainerElement.cpp b/WebCore/mathml/MathMLInlineContainerElement.cpp
deleted file mode 100644
index eb579d2..0000000
--- a/WebCore/mathml/MathMLInlineContainerElement.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if ENABLE(MATHML)
-
-#include "MathMLInlineContainerElement.h"
-
-#include "MathMLNames.h"
-#include "RenderMathMLBlock.h"
-#include "RenderMathMLFenced.h"
-#include "RenderMathMLFraction.h"
-#include "RenderMathMLRoot.h"
-#include "RenderMathMLRow.h"
-#include "RenderMathMLSquareRoot.h"
-#include "RenderMathMLSubSup.h"
-#include "RenderMathMLUnderOver.h"
-
-namespace WebCore {
-    
-using namespace MathMLNames;
-
-MathMLInlineContainerElement::MathMLInlineContainerElement(const QualifiedName& tagName, Document* document)
-    : MathMLElement(tagName, document)
-{
-}
-
-PassRefPtr<MathMLInlineContainerElement> MathMLInlineContainerElement::create(const QualifiedName& tagName, Document* document)
-{
-    return adoptRef(new MathMLInlineContainerElement(tagName, document));
-}
-
-RenderObject* MathMLInlineContainerElement::createRenderer(RenderArena* arena, RenderStyle*)
-{
-    if (hasLocalName(mrowTag))
-        return new (arena) RenderMathMLRow(this);
-    if (hasLocalName(msubTag))
-        return new (arena) RenderMathMLSubSup(this);
-    if (hasLocalName(msupTag))
-        return new (arena) RenderMathMLSubSup(this);
-    if (hasLocalName(msubsupTag))
-        return new (arena) RenderMathMLSubSup(this);
-    if (hasLocalName(moverTag))
-        return new (arena) RenderMathMLUnderOver(this);
-    if (hasLocalName(munderTag))
-        return new (arena) RenderMathMLUnderOver(this);
-    if (hasLocalName(munderoverTag))
-        return new (arena) RenderMathMLUnderOver(this);
-    if (hasLocalName(mfracTag))
-        return new (arena) RenderMathMLFraction(this);
-    if (hasLocalName(msqrtTag))
-        return new (arena) RenderMathMLSquareRoot(this);
-    if (hasLocalName(mrootTag))
-        return new (arena) RenderMathMLRoot(this);
-    if (hasLocalName(mfencedTag))
-        return new (arena) RenderMathMLFenced(this);
-
-    return new (arena) RenderMathMLBlock(this);
-}
-
-}
-
-#endif // ENABLE(MATHML)