Attempted build fix after r98765.
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 28 Oct 2011 23:06:00 +0000 (23:06 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 28 Oct 2011 23:06:00 +0000 (23:06 +0000)
* platform/graphics/mac/SimpleFontDataMac.mm:
(WebCore::SimpleFontData::platformWidthForGlyph):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@98774 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm

index a2bd0f964cf8693820062ba15ddf52df2b5ad35d..22ea4c9f3b8ea6f3d76840d1b73d06f7d26d3874 100755 (executable)
@@ -1,3 +1,10 @@
+2011-10-28  Dan Bernstein  <mitz@apple.com>
+
+        Attempted build fix after r98765.
+
+        * platform/graphics/mac/SimpleFontDataMac.mm:
+        (WebCore::SimpleFontData::platformWidthForGlyph):
+
 2011-10-28  Chris Marrin  <cmarrin@apple.com>
 
         CSS grammar doesn't support functions with no parameters
index 3a458c3fc5d3722d98e684cdd70a7c7ef58275bc..54c03f8795f31c6e170f6351c749a18fead6d067 100644 (file)
@@ -402,7 +402,7 @@ float SimpleFontData::platformWidthForGlyph(Glyph glyph) const
     if (platformData().orientation() == Horizontal || m_isBrokenIdeographFallback) {
         NSFont *font = platformData().font();
         if (font && platformData().isColorBitmapFont())
-            advance = [font advancementForGlyph:glyph];
+            advance = NSSizeToCGSize([font advancementForGlyph:glyph]);
         else {
             float pointSize = platformData().m_size;
             CGAffineTransform m = CGAffineTransformMakeScale(pointSize, pointSize);