Use drawsNothing instead of getSize to check SkBitmap in ShortcutHelper
SkBitmap: :isNull(), SkBitmap::isNull() may still return false even if
SkBitmap: :getSize() returns non-zero value. Consequently, it may
Review-Url: https://codereview.chromium.org/2924713003
Cr-Commit-Position: refs/heads/master@{#477635}
diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc
index 0cf1e5a2..ae166f2 100644
--- a/chrome/browser/android/shortcut_helper.cc
+++ b/chrome/browser/android/shortcut_helper.cc
@@ -93,7 +93,7 @@
base::android::ConvertUTF8ToJavaString(env,
info.best_primary_icon_url.spec());
ScopedJavaLocalRef<jobject> java_bitmap;
- if (icon_bitmap.getSize())
+ if (!icon_bitmap.drawsNothing())
java_bitmap = gfx::ConvertToJavaBitmap(&icon_bitmap);
// The callback will need to be run after shortcut creation completes in order
@@ -122,7 +122,7 @@
ScopedJavaLocalRef<jstring> java_user_title =
base::android::ConvertUTF16ToJavaString(env, info.user_title);
ScopedJavaLocalRef<jobject> java_bitmap;
- if (icon_bitmap.getSize())
+ if (!icon_bitmap.drawsNothing())
java_bitmap = gfx::ConvertToJavaBitmap(&icon_bitmap);
Java_ShortcutHelper_addShortcut(env, java_id, java_url, java_user_title,
