Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 0 insertions, 78 deletions

diff --git a/WebCore/rendering/svg/SVGTextMetrics.h b/WebCore/rendering/svg/SVGTextMetrics.h
deleted file mode 100644
index ba18589..0000000
--- a/WebCore/rendering/svg/SVGTextMetrics.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) Research In Motion Limited 2010. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef SVGTextMetrics_h
-#define SVGTextMetrics_h
-
-#if ENABLE(SVG)
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class Font;
-class RenderSVGInlineText;
-class TextRun;
-
-class SVGTextMetrics {
-public:
-    static SVGTextMetrics emptyMetrics();
-    static SVGTextMetrics measureCharacterRange(RenderSVGInlineText*, unsigned position, unsigned length);
-    static void measureAllCharactersIndividually(RenderSVGInlineText*, Vector<SVGTextMetrics>&);
-
-    bool operator==(const SVGTextMetrics&);
-
-    float width() const { return m_width; }
-    float height() const { return m_height; }
-    unsigned length() const { return m_length; }
-
-    struct Glyph {
-        Glyph()
-            : isValid(false)
-        {
-        }
-
-        bool operator==(const Glyph& other)
-        {
-            return isValid == other.isValid
-                && name == other.name
-                && unicodeString == other.unicodeString;
-        }
-
-        bool isValid;
-        String name;
-        String unicodeString;
-    };
-
-    // Only useful when measuring individual characters, to lookup ligatures.
-    const Glyph& glyph() const { return m_glyph; }
-
-private:
-    SVGTextMetrics();
-    SVGTextMetrics(const Font&, const TextRun&, unsigned position, unsigned textLength);
-
-    float m_width;
-    float m_height;
-    unsigned m_length;
-    Glyph m_glyph;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(SVG)
-#endif