Changeset 31338 for trunk/WebCore/svg/SVGFont.cpp

Timestamp:

03/26/08 18:52:55 (2 years ago)

Author:

hyatt@apple.com

Message:

2008-03-26 David Hyatt < hyatt@apple.com>

Add support for the rendering and measurement of the <altGlyph> element in SVG. This patch brings
is half of what's needed to reach 100/100 on Acid3 and pass the test. Maciej has coded up the other half. :)

Reviewed by mjs

Added svg/custom/altGlyph.svg

• svg/SVGAltGlyphElement.cpp: (WebCore::SVGAltGlyphElement::childShouldCreateRenderer): (WebCore::SVGAltGlyphElement::glyphElement):
• svg/SVGAltGlyphElement.h:
• svg/SVGFont.cpp: (WebCore::SVGTextRunWalker::walk):
• svg/SVGFontFaceElement.cpp: (WebCore::SVGFontFaceElement::insertedIntoDocument):
• svg/SVGGlyphElement.cpp: (WebCore::SVGGlyphElement::insertedIntoDocument): (WebCore::SVGGlyphElement::removedFromDocument):

Files:

• trunk/WebCore/svg/SVGFont.cpp (modified) (3 diffs)

trunk/WebCore/svg/SVGFont.cpp

@@ -28 +28 @@
 #include "RenderObject.h"
 #include "SimpleFontData.h"
+#include "SVGAltGlyphElement.h"
 #include "SVGFontData.h"
 #include "SVGGlyphElement.h"
@@ -250 +251 @@
         int endOfScanRange = to + m_walkerData.extraCharsAvailable;
 
+        bool haveAltGlyph = false;
+        SVGGlyphIdentifier altGlyphIdentifier;
+        if (RenderObject* renderObject = run.referencingRenderObject()) {
+            if (renderObject->element() && renderObject->element()->hasTagName(SVGNames::altGlyphTag)) {
+                SVGGlyphElement* glyphElement = static_cast<SVGAltGlyphElement*>(renderObject->element())->glyphElement();
+                if (glyphElement) {
+                    haveAltGlyph = true;
+                    altGlyphIdentifier = glyphElement->buildGlyphIdentifier();
+                    altGlyphIdentifier.isValid = true;
+                    altGlyphIdentifier.nameLength = to - from;
+                }
+            }
+        }
+        
         for (int i = from; i < to; ++i) {
             // If characterLookupRange is > 0, then the font defined ligatures (length of unicode property value > 1).
@@ -257 +272 @@
 
             String lookupString(run.data(run.rtl() ? run.length() - (i + characterLookupRange) : i), characterLookupRange);
-
             Vector<SVGGlyphIdentifier> glyphs;
-            m_fontElement->getGlyphIdentifiersForString(lookupString, glyphs);
+            if (haveAltGlyph)
+                glyphs.append(altGlyphIdentifier);
+            else
+                m_fontElement->getGlyphIdentifiersForString(lookupString, glyphs);
+
             Vector<SVGGlyphIdentifier>::iterator it = glyphs.begin();
             Vector<SVGGlyphIdentifier>::iterator end = glyphs.end();