Bug 745054 - Part 1: Fix Skia compilation on windows. r=mattwoodrow
authorBas Schouten <bschouten@mozilla.com>
Fri, 13 Apr 2012 04:10:22 +0200
changeset 94888 a50d4ef25d84404e86e0148f1382bb3bd62bf703
parent 94887 39acc9f51df8904f08de2c5b2e38a8db35128278
child 94889 bbadf6bceab14e36a343b8ba71db91a2d17b120c
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmattwoodrow
bugs745054
milestone14.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 745054 - Part 1: Fix Skia compilation on windows. r=mattwoodrow
gfx/2d/ScaledFontWin.cpp
--- a/gfx/2d/ScaledFontWin.cpp
+++ b/gfx/2d/ScaledFontWin.cpp
@@ -31,17 +31,17 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "ScaledFontWin.h"
-#include "ScaeldFontBase.h"
+#include "ScaledFontBase.h"
 
 #ifdef USE_SKIA
 #include "skia/SkTypeface_win.h"
 #endif
 
 namespace mozilla {
 namespace gfx {
 
@@ -50,17 +50,17 @@ ScaledFontWin::ScaledFontWin(LOGFONT* aF
   , mLogFont(*aFont)
 {
 }
 
 #ifdef USE_SKIA
 SkTypeface* ScaledFontWin::GetSkTypeface()
 {
   if (!mTypeface) {
-    mTypeface = SkCreateTypefaceFromLOGFONT(lf);
+    mTypeface = SkCreateTypefaceFromLOGFONT(mLogFont);
   }
   return mTypeface;
 }
 #endif
 
 
 }
 }