Changeset 31338 in webkit

Timestamp:

Mar 26, 2008 6:52:55 PM (16 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):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• svg/SVGAltGlyphElement.cpp (modified) (3 diffs)
• svg/SVGAltGlyphElement.h (modified) (2 diffs)
• svg/SVGFont.cpp (modified) (3 diffs)
• svg/SVGFontFaceElement.cpp (modified) (1 diff)
• svg/SVGGlyphElement.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+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):
+
 2008-03-26  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/svg/SVGAltGlyphElement.cpp

@@ -28 +28 @@
 #include "RenderInline.h"
 #include "RenderSVGTSpan.h"
+#include "SVGGlyphElement.h"
 #include "SVGNames.h"
+#include "XLinkNames.h"
 
 namespace WebCore {
@@ -65 +67 @@
     if (child->isTextNode())
         return true;
-
     return false;
 }
@@ -74 +75 @@
 }
 
+SVGGlyphElement* SVGAltGlyphElement::glyphElement() const
+{
+    Element* elt = document()->getElementById(getTarget(getAttribute(XLinkNames::hrefAttr)));
+    if (!elt || !elt->hasTagName(SVGNames::glyphTag))
+        return 0;
+    return static_cast<SVGGlyphElement*>(elt);
+}
+
 }
 

trunk/WebCore/svg/SVGAltGlyphElement.h

@@ -30 +30 @@
 namespace WebCore
 {
+    class SVGGlyphElement;
+
     class SVGAltGlyphElement : public SVGTextPositioningElement, public SVGURIReference
     {
@@ -44 +46 @@
         void setFormat(const AtomicString&, ExceptionCode&);
     
+        SVGGlyphElement* glyphElement() const;
+
     protected:
         virtual const SVGElement* contextElement() const { return this; }

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();

trunk/WebCore/svg/SVGFontFaceElement.cpp

@@ -351 +351 @@
 {
     rebuildFontFace();
+    SVGElement::insertedIntoDocument();
 }
 

trunk/WebCore/svg/SVGGlyphElement.cpp

@@ -52 +52 @@
             element->addGlyphToCache(this);
     }
+    SVGStyledElement::insertedIntoDocument();
 }
 
@@ -61 +62 @@
             element->removeGlyphFromCache(this);
     }
+    SVGStyledElement::removedFromDocument();
 }