Changeset 128968 in webkit

Timestamp:

Sep 18, 2012, 11:19:31 PM (13 years ago)

Author:

bashi@chromium.org

Message:

[Chromium] SkiaGetGlyphWidthAndExtents() should invert y-axis
​https://bugs.webkit.org/show_bug.cgi?id=97067

Reviewed by Yuta Kitamura.

Invert skBounds.fTop and skBounds.height(). Don't call hb_font_set_ppem().

No new tests. Arabic shadda (U+0651) should be placed more higher when Arabic lam (U+0644) follows it.
Tests under svg/W3C-I18N contain such sequences so these tests cover this change.

• platform/graphics/harfbuzz/ng/HarfBuzzNGFaceSkia.cpp:

(WebCore::SkiaGetGlyphWidthAndExtents):
(WebCore::HarfBuzzNGFace::createFont):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/harfbuzz/ng/HarfBuzzNGFaceSkia.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-18  Kenichi Ishibashi  <bashi@chromium.org>
+
+        [Chromium] SkiaGetGlyphWidthAndExtents() should invert y-axis
+        https://bugs.webkit.org/show_bug.cgi?id=97067
+
+        Reviewed by Yuta Kitamura.
+
+        Invert skBounds.fTop and skBounds.height(). Don't call hb_font_set_ppem().
+
+        No new tests. Arabic shadda (U+0651) should be placed more higher when Arabic lam (U+0644) follows it.
+        Tests under svg/W3C-I18N contain such sequences so these tests cover this change.
+
+        * platform/graphics/harfbuzz/ng/HarfBuzzNGFaceSkia.cpp:
+        (WebCore::SkiaGetGlyphWidthAndExtents):
+        (WebCore::HarfBuzzNGFace::createFont):
+
 2012-09-18  Kenichi Ishibashi  <bashi@chromium.org>
 

trunk/Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzNGFaceSkia.cpp

@@ -69 +69 @@
         *width = SkiaScalarToHarfbuzzPosition(skWidth);
     if (extents) {
+        // Invert y-axis because Skia is y-grows-down but we set up harfbuzz to be y-grows-up.
         extents->x_bearing = SkiaScalarToHarfbuzzPosition(skBounds.fLeft);
-        // The extents are unused in harfbuzz now so we're unsure whether a negation is needed here. Revisit when we're sure.
-        extents->y_bearing = SkiaScalarToHarfbuzzPosition(skBounds.fTop);
+        extents->y_bearing = SkiaScalarToHarfbuzzPosition(-skBounds.fTop);
         extents->width = SkiaScalarToHarfbuzzPosition(skBounds.width());
-        extents->height = SkiaScalarToHarfbuzzPosition(skBounds.height());
+        extents->height = SkiaScalarToHarfbuzzPosition(-skBounds.height());
     }
 }
@@ -172 +172 @@
     hb_font_set_funcs(font, harfbuzzSkiaGetFontFuncs(), paint, destroyPaint);
     float size = m_platformData->size();
-    if (floorf(size) == size)
-        hb_font_set_ppem(font, size, size);
     int scale = SkiaScalarToHarfbuzzPosition(size);
     hb_font_set_scale(font, scale, scale);