Merge "Remove invalid SkASSERT that prevents us from running with SK_DEBUG" into lmp-dev

2014-07-21 16:56:14 +00:00
parent 8319317e5a 2cb8c3c9e5
commit 94ca6cd7c9
1 changed files with 0 additions and 1 deletions
--- a/core/jni/android/graphics/Graphics.cpp
+++ b/core/jni/android/graphics/Graphics.cpp
@@ -386,7 +386,6 @@ android::TypefaceImpl* GraphicsJNI::getNativeTypeface(JNIEnv* env, jobject paint
    SkASSERT(env->IsInstanceOf(paint, gPaint_class));
    jlong typefaceHandle = env->GetLongField(paint, gPaint_nativeTypefaceID);
    android::TypefaceImpl* p = reinterpret_cast<android::TypefaceImpl*>(typefaceHandle);
-    SkASSERT(p);
    return p;
 }