Changeset 29031 in webkit

Timestamp:

Dec 29, 2007 8:06:23 AM (16 years ago)

Author:

Nikolas Zimmermann

Message:

Reviewed by Alexey.

Respect horiz-origin-x / horiz-origin-y / vert-origin-x / vert-origin-y properties when drawing SVG Fonts.
(Fixes fonts-elem-05-t.svg in a --svg-fonts build)

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• svg/SVGFont.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-12-29  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed by Alexey.
+
+        Respect horiz-origin-x / horiz-origin-y / vert-origin-x / vert-origin-y properties when drawing SVG Fonts.
+        (Fixes fonts-elem-05-t.svg in a --svg-fonts build)
+
+        * svg/SVGFont.cpp:
+        (WebCore::Font::drawGlyphsWithSVGFont):
+
 2007-12-29  Nikolas Zimmermann  <zimmermann@kde.org>
 

trunk/WebCore/svg/SVGFont.cpp

@@ -67 +67 @@
     unsigned unitsPerEm = fontFace->unitsPerEm();
     bool isVerticalText = isVerticalWritingMode(style->svgStyle());
+    float scale = SVGFontData::convertEmUnitToPixel(fontSize, unitsPerEm, 1.0f);
 
     SVGPaintServer* fillPaintServer = SVGPaintServer::fillPaintServer(style, renderObject);
@@ -72 +73 @@
 
     FloatPoint startPoint = point;
+
+    FloatPoint glyphOrigin;
+    if (!isVerticalText) {
+        glyphOrigin.setX(SVGFontData::convertEmUnitToPixel(fontSize, unitsPerEm, svgFontData->horizontalOriginX));
+        glyphOrigin.setY(SVGFontData::convertEmUnitToPixel(fontSize, unitsPerEm, svgFontData->horizontalOriginY));
+    }
+
     for (int i = from; i < to; ++i) {
         SVGGlyphIdentifier identifier = fontFace->glyphIdentifierForGlyphCode(glyphBuffer.glyphAt(i));
@@ -77 +85 @@
         // TODO: Support arbitary SVG content as glyph (currently limited to <glyph d="..."> situations)
         if (!identifier.pathData.isEmpty()) {
-            float scale = SVGFontData::convertEmUnitToPixel(size(), fontFace->unitsPerEm(), 1.0f); 
-
-            AffineTransform ctm;
-            ctm.translate(startPoint.x(), startPoint.y());
-            ctm.scale(scale, -scale);
+            if (isVerticalText) {
+                glyphOrigin.setX(SVGFontData::convertEmUnitToPixel(fontSize, unitsPerEm, identifier.verticalOriginX));
+                glyphOrigin.setY(SVGFontData::convertEmUnitToPixel(fontSize, unitsPerEm, identifier.verticalOriginY));
+            }
 
             context->save();
-            context->concatCTM(ctm);
+            context->translate(startPoint.x() + glyphOrigin.x(), startPoint.y() + glyphOrigin.y());
+            context->scale(FloatSize(scale, -scale));
 
             context->beginPath();