diff -r 000000000000 -r 4f2f89ce4247 WebCore/svg/SVGGlyphElement.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/WebCore/svg/SVGGlyphElement.cpp	Fri Sep 17 09:02:29 2010 +0300
@@ -0,0 +1,181 @@
+/*
+   Copyright (C) 2007 Eric Seidel <eric@webkit.org>
+   Copyright (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
+   Copyright (C) 2008 Rob Buis <buis@kde.org>
+
+   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.
+*/
+
+#include "config.h"
+
+#if ENABLE(SVG_FONTS)
+#include "SVGGlyphElement.h"
+
+#include "Attribute.h"
+#include "SVGFontData.h"
+#include "SVGFontElement.h"
+#include "SVGFontFaceElement.h"
+#include "SVGNames.h"
+#include "SVGPathBuilder.h"
+#include "SimpleFontData.h"
+#include "XMLNames.h"
+
+namespace WebCore {
+
+using namespace SVGNames;
+
+SVGGlyphElement::SVGGlyphElement(const QualifiedName& tagName, Document* doc)
+    : SVGStyledElement(tagName, doc)
+{
+}
+
+SVGGlyphElement::~SVGGlyphElement()
+{
+}
+
+void SVGGlyphElement::invalidateGlyphCache()
+{
+    Node* fontNode = parentNode();
+    if (fontNode && fontNode->hasTagName(SVGNames::fontTag)) {
+        if (SVGFontElement* element = static_cast<SVGFontElement*>(fontNode))
+            element->invalidateGlyphCache();
+    }
+}
+
+void SVGGlyphElement::parseMappedAttribute(Attribute* attr)
+{
+    if (attr->name() == SVGNames::dAttr)
+        invalidateGlyphCache();
+    else
+        SVGStyledElement::parseMappedAttribute(attr);
+}
+
+void SVGGlyphElement::insertedIntoDocument()
+{
+    invalidateGlyphCache();
+    SVGStyledElement::insertedIntoDocument();
+}
+
+void SVGGlyphElement::removedFromDocument()
+{
+    invalidateGlyphCache();
+    SVGStyledElement::removedFromDocument();
+}
+
+static inline SVGGlyphIdentifier::ArabicForm parseArabicForm(const AtomicString& value)
+{
+    if (value == "medial")
+        return SVGGlyphIdentifier::Medial;
+    else if (value == "terminal")
+        return SVGGlyphIdentifier::Terminal;
+    else if (value == "isolated")
+        return SVGGlyphIdentifier::Isolated;
+    else if (value == "initial")
+        return SVGGlyphIdentifier::Initial;
+
+    return SVGGlyphIdentifier::None;
+}
+
+static inline SVGGlyphIdentifier::Orientation parseOrientation(const AtomicString& value)
+{
+    if (value == "h")
+        return SVGGlyphIdentifier::Horizontal;
+    else if (value == "v")
+        return SVGGlyphIdentifier::Vertical;
+
+    return SVGGlyphIdentifier::Both;
+}
+
+static inline Path parsePathData(const AtomicString& value)
+{
+    Path result;
+    SVGPathBuilder builder(result);
+    // FIXME: We should analyse the returned value.
+    builder.build(value);
+
+    return result;
+}
+
+void SVGGlyphElement::inheritUnspecifiedAttributes(SVGGlyphIdentifier& identifier, const SVGFontData* svgFontData)
+{
+    if (identifier.horizontalAdvanceX == SVGGlyphIdentifier::inheritedValue())
+        identifier.horizontalAdvanceX = svgFontData->horizontalAdvanceX();
+
+    if (identifier.verticalOriginX == SVGGlyphIdentifier::inheritedValue())
+        identifier.verticalOriginX = svgFontData->verticalOriginX();
+
+    if (identifier.verticalOriginY == SVGGlyphIdentifier::inheritedValue())
+        identifier.verticalOriginY = svgFontData->verticalOriginY();
+
+    if (identifier.verticalAdvanceY == SVGGlyphIdentifier::inheritedValue())
+        identifier.verticalAdvanceY = svgFontData->verticalAdvanceY();
+}
+
+static inline float parseSVGGlyphAttribute(const SVGElement* element, const WebCore::QualifiedName& name)
+{
+    AtomicString value(element->getAttribute(name));
+    if (value.isEmpty())
+        return SVGGlyphIdentifier::inheritedValue();
+
+    return value.toFloat();
+}
+
+SVGGlyphIdentifier SVGGlyphElement::buildGenericGlyphIdentifier(const SVGElement* element)
+{
+    SVGGlyphIdentifier identifier;
+    identifier.pathData = parsePathData(element->getAttribute(dAttr));
+ 
+    // Spec: The horizontal advance after rendering the glyph in horizontal orientation.
+    // If the attribute is not specified, the effect is as if the attribute were set to the
+    // value of the font's horiz-adv-x attribute. Glyph widths are required to be non-negative,
+    // even if the glyph is typically rendered right-to-left, as in Hebrew and Arabic scripts.
+    identifier.horizontalAdvanceX = parseSVGGlyphAttribute(element, horiz_adv_xAttr);
+
+    // Spec: The X-coordinate in the font coordinate system of the origin of the glyph to be
+    // used when drawing vertically oriented text. If the attribute is not specified, the effect
+    // is as if the attribute were set to the value of the font's vert-origin-x attribute.
+    identifier.verticalOriginX = parseSVGGlyphAttribute(element, vert_origin_xAttr);
+
+    // Spec: The Y-coordinate in the font coordinate system of the origin of a glyph to be
+    // used when drawing vertically oriented text. If the attribute is not specified, the effect
+    // is as if the attribute were set to the value of the font's vert-origin-y attribute.
+    identifier.verticalOriginY = parseSVGGlyphAttribute(element, vert_origin_yAttr);
+
+    // Spec: The vertical advance after rendering a glyph in vertical orientation.
+    // If the attribute is not specified, the effect is as if the attribute were set to the
+    // value of the font's vert-adv-y attribute.
+    identifier.verticalAdvanceY = parseSVGGlyphAttribute(element, vert_adv_yAttr);
+
+    return identifier;
+}
+
+SVGGlyphIdentifier SVGGlyphElement::buildGlyphIdentifier() const
+{
+    SVGGlyphIdentifier identifier(buildGenericGlyphIdentifier(this));
+    identifier.glyphName = getAttribute(glyph_nameAttr);
+    identifier.orientation = parseOrientation(getAttribute(orientationAttr));
+    identifier.arabicForm = parseArabicForm(getAttribute(arabic_formAttr));
+
+    String language = getAttribute(SVGNames::langAttr);
+    if (!language.isEmpty())
+        identifier.languages = parseDelimitedString(language, ',');
+
+    return identifier;
+}
+
+}
+
+#endif // ENABLE(SVG_FONTS)