commit a0f5d1546d499ef0cd7dbfba9a866ae5a27e1541
author reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jun 22 17:38:10 2009 +0000
committer reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jun 22 17:38:10 2009 +0000
tree 4e74bc93f6d794826a8eb1a78d4642ab9b215143
parent 1a2fec55d914f0a01cbee37077105ef6c8a7366f

move xfermode modes from porterduff into xfermode itself



git-svn-id: http://skia.googlecode.com/svn/trunk@232 2bbb7eff-a529-9590-31e7-b0007b416f81

src/ports/SkFontHost_FreeType.cpp

diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index 8c11604..7aa14b2 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -75,7 +75,9 @@
     virtual ~SkScalerContext_FreeType();
 
     bool success() const {
-        return fFaceRec != NULL && fFTSize != NULL;
+        return fFaceRec != NULL &&
+               fFTSize != NULL &&
+               fFace != NULL;
     }
 
 protected:
@@ -761,10 +763,6 @@
     }
 
     FT_Face face = fFace;
-    if (!face) {
-        goto ERROR;
-    }
-
     int upem = face->units_per_EM;
     if (upem <= 0) {
         goto ERROR;