diff options
| author | Derek Sollenberger <djsollen@google.com> | 2014-07-21 16:56:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-17 19:20:15 +0000 |
| commit | 94ca6cd7c932689b8018d1b118ddcd6b7a9eab27 (patch) | |
| tree | d12637077829d76f024cfd171cac23e139f51cd7 | |
| parent | 8319317e5ae64cd78268ce933b924519aea467a3 (diff) | |
| parent | 2cb8c3c9e5d79dfba10d2f39792ad553d4fbc292 (diff) | |
| download | frameworks_base-94ca6cd7c932689b8018d1b118ddcd6b7a9eab27.zip frameworks_base-94ca6cd7c932689b8018d1b118ddcd6b7a9eab27.tar.gz frameworks_base-94ca6cd7c932689b8018d1b118ddcd6b7a9eab27.tar.bz2 | |
Merge "Remove invalid SkASSERT that prevents us from running with SK_DEBUG" into lmp-dev
| -rw-r--r-- | core/jni/android/graphics/Graphics.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/jni/android/graphics/Graphics.cpp b/core/jni/android/graphics/Graphics.cpp index 74be577..320c259 100644 --- 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; } |