Bug 719575 - Fix clang builds which are broken now because of Skia changes; r=mattwoodrow
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 19 Jan 2012 16:32:41 -0500
changeset 86183 26998c1affd1e787ea00b330a68e5edee8ee635d
parent 86182 d0eed1fd4272f7559db1ed5b1bdc503143bc442e
child 86184 eb09304af438ae482b9ec98218700fa35d2fafe8
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmattwoodrow
bugs719575
milestone12.0a1
Bug 719575 - Fix clang builds which are broken now because of Skia changes; r=mattwoodrow
gfx/skia/src/ports/SkFontHost_mac_coretext.cpp
--- a/gfx/skia/src/ports/SkFontHost_mac_coretext.cpp
+++ b/gfx/skia/src/ports/SkFontHost_mac_coretext.cpp
@@ -791,18 +791,18 @@ CGRGBPixel* Offscreen::getCG(const SkSca
     SkASSERT(rowBytesPtr);
     *rowBytesPtr = rowBytes;
     return image;
 }
 
 void SkScalerContext_Mac::getVerticalOffset(CGGlyph glyphID, SkIPoint* offset) const {
     CGSize vertOffset;
     CTFontGetVerticalTranslationsForGlyphs(fCTVerticalFont, &glyphID, &vertOffset, 1);
-    const SkPoint trans = {SkFloatToScalar(vertOffset.width),
-                           SkFloatToScalar(vertOffset.height)};
+    const SkPoint trans = {SkScalar(SkFloatToScalar(vertOffset.width)),
+                           SkScalar(SkFloatToScalar(vertOffset.height))};
     SkPoint floatOffset;
     fVerticalMatrix.mapPoints(&floatOffset, &trans, 1);
     if (!isSnowLeopard()) {
     // SnowLeopard fails to apply the font's matrix to the vertical metrics,
     // but Lion and Leopard do. The unit matrix describes the font's matrix at
     // point size 1. There may be some way to avoid mapping here by setting up
     // fVerticalMatrix differently, but this works for now.
         fUnitMatrix.mapPoints(&floatOffset, 1);