Index: ui/gfx/android/java_bitmap.cc |
diff --git a/ui/gfx/android/java_bitmap.cc b/ui/gfx/android/java_bitmap.cc |
index 0f6f2ea06e1f02348abc71dbe6a3d4a1eab8190d..39a459ecf1d7534513749c726b54fd78730c30a1 100644 |
--- a/ui/gfx/android/java_bitmap.cc |
+++ b/ui/gfx/android/java_bitmap.cc |
@@ -9,7 +9,6 @@ |
#include "base/android/jni_string.h" |
#include "base/logging.h" |
#include "jni/BitmapHelper_jni.h" |
-#include "skia/ext/image_operations.h" |
#include "ui/gfx/size.h" |
using base::android::AttachCurrentThread; |
@@ -86,26 +85,6 @@ ScopedJavaLocalRef<jobject> ConvertToJavaBitmap(const SkBitmap* skbitmap) { |
return jbitmap; |
} |
-SkBitmap CreateSkBitmapFromAndroidResource(const char* name, gfx::Size size) { |
- DCHECK(name); |
- DCHECK(!size.IsEmpty()); |
- JNIEnv* env = AttachCurrentThread(); |
- ScopedJavaLocalRef<jstring> jname(ConvertUTF8ToJavaString(env, name)); |
- base::android::ScopedJavaLocalRef<jobject> jobj = |
- Java_BitmapHelper_decodeDrawableResource( |
- env, jname.obj(), size.width(), size.height()); |
- |
- if (jobj.is_null()) |
- return SkBitmap(); |
- |
- SkBitmap bitmap = CreateSkBitmapFromJavaBitmap(gfx::JavaBitmap(jobj.obj())); |
- if (bitmap.isNull()) |
- return bitmap; |
- |
- return skia::ImageOperations::Resize( |
- bitmap, skia::ImageOperations::RESIZE_BOX, size.width(), size.height()); |
-} |
- |
SkBitmap CreateSkBitmapFromJavaBitmap(const JavaBitmap& jbitmap) { |
// TODO(jdduke): Convert to DCHECK's when sufficient data has been capture for |
// crbug.com/341406. |