diff options
| author | John Reck <jreck@google.com> | 2012-05-22 10:48:45 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2012-05-22 11:36:33 -0700 |
| commit | 4d31493c3fa47a28b2753bc5b99e2074b6a7a4df (patch) | |
| tree | 6929331d0246c138b18fa20bd26a6ef7477dbfe7 /Source/WebKit/android/jni/WebIconDatabase.h | |
| parent | fa25b832c863e0ff0a57de465f3e45e51ce780a6 (diff) | |
| download | external_webkit-4d31493c3fa47a28b2753bc5b99e2074b6a7a4df.zip external_webkit-4d31493c3fa47a28b2753bc5b99e2074b6a7a4df.tar.gz external_webkit-4d31493c3fa47a28b2753bc5b99e2074b6a7a4df.tar.bz2 | |
Handle more favicon decoding error cases
Bug: 6517530
Switch to having webcoreImageToSkBitmap return a pointer instead
as it makes dealing with error cases easier. Also add a check to
see if SkImageDecoder::DecodeMemory returned true or false, as if
it returns false we may have already allocated pixels (so isNull = false),
however it might not have valid data or any config
Also aggressively check that we have a valid bitmap with a valid config
Change-Id: I2a2e856a389d73cdda319eaeaee5d1279a9e2eb6
Diffstat (limited to 'Source/WebKit/android/jni/WebIconDatabase.h')
| -rw-r--r-- | Source/WebKit/android/jni/WebIconDatabase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/WebIconDatabase.h b/Source/WebKit/android/jni/WebIconDatabase.h index c3e7947..7b7c937 100644 --- a/Source/WebKit/android/jni/WebIconDatabase.h +++ b/Source/WebKit/android/jni/WebIconDatabase.h @@ -74,7 +74,7 @@ namespace android { bool mDeliveryRequested; }; - SkBitmap webcoreImageToSkBitmap(WebCore::Image* icon); + SkBitmap* webcoreImageToSkBitmap(WebCore::Image* icon); jobject webcoreImageToJavaBitmap(JNIEnv* env, WebCore::Image* icon); }; |