Changeset 23199 in webkit

Timestamp:

Mar 27, 2007 1:59:40 AM (17 years ago)

Author:

hyatt

Message:

Add support for glyph offsets to the GlyphBuffer.

Location:

branches/WindowsMerge/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/win/FontWin.cpp (modified) (2 diffs)
• platform/win/UniscribeController.cpp (modified) (2 diffs)

branches/WindowsMerge/WebCore/ChangeLog

@@ +1 @@
+2007-03-27  Dave Hyatt  <hyatt@apple.com>
+
+        Add support for glyph offsets to the GlyphBuffer.
+       
+        Reviewed by olliej
+
+        * platform/win/FontWin.cpp:
+        (WebCore::Font::drawGlyphs):
+        * platform/win/UniscribeController.cpp:
+        (WebCore::UniscribeController::shapeAndPlaceItem):
+
 2007-03-26  Antti Koivisto  <antti@apple.com>
 

branches/WindowsMerge/WebCore/platform/win/FontWin.cpp

@@ -68 +68 @@
 
     CGAffineTransform matrix = CGAffineTransformIdentity;
-    //memcpy(&matrix, [drawFont matrix], sizeof(matrix));
-    //if ([gContext isFlipped]) {
-    {
-        matrix.b = -matrix.b;
-        matrix.d = -matrix.d;
-    }
+    matrix.b = -matrix.b;
+    matrix.d = -matrix.d;
+
     if (platformData.syntheticOblique())
     {
@@ -79 +76 @@
         matrix = CGAffineTransformConcat(matrix, CGAffineTransformMake(1, 0, skew, 1, 0, 0));
     }
+
+    // Uniscribe gives us offsets to help refine the positioning of combining glyphs.
+    FloatSize translation = glyphBuffer.offsetAt(from);
+    if (translation.width() || translation.height())
+        CGAffineTransformTranslate(matrix, translation.width(), translation.height());
+    
     CGContextSetTextMatrix(cgContext, matrix);
 

branches/WindowsMerge/WebCore/platform/win/UniscribeController.cpp

@@ -335 +335 @@
         Glyph glyph = glyphs[k];
         float advance = advances[k] / 32.0f;
+        float offsetX = offsets[k].du / 32.0f;
+        float offsetY = offsets[k].dv / 32.0f;
 
         // Match AppKit's rules for the integer vs. non-integer rendering modes.
         float roundedAdvance = roundf(advance);
-        if (!m_font.isPrinterFont() && !fontData->isSystemFont())
+        if (!m_font.isPrinterFont() && !fontData->isSystemFont()) {
             advance = roundedAdvance;
-        
+            offsetX = roundf(offsetX);
+            offsetY = roundf(offsetY);
+        }
+       
         // We special case spaces in two ways when applying word rounding.
         // First, we round spaces to an adjusted width in all fonts.
@@ -401 +406 @@
         // translation.
         if (glyphBuffer)
-            glyphBuffer->add(glyph, fontData, advance);
+            glyphBuffer->add(glyph, fontData, advance, &FloatSize(offsetX, offsetY));
 
         // Mutate the glyph array to contain our altered advances.