diff options
| author | John Reck <jreck@google.com> | 2012-05-08 08:49:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-08 08:49:41 -0700 |
| commit | c2749f95bc9ee83dd35c260da5be5c38a3a2ad45 (patch) | |
| tree | 490788bc3e4c3d82a5feaf3cfd724f9a27717c54 /Source/WebKit/android/jni/WebIconDatabase.cpp | |
| parent | d65e985be95311ae46bfcb518b42721130469eb9 (diff) | |
| parent | e38a6c283211dcfd3b1fb390e4c108a86481dd8a (diff) | |
| download | external_webkit-c2749f95bc9ee83dd35c260da5be5c38a3a2ad45.zip external_webkit-c2749f95bc9ee83dd35c260da5be5c38a3a2ad45.tar.gz external_webkit-c2749f95bc9ee83dd35c260da5be5c38a3a2ad45.tar.bz2 | |
Merge "Delay creating Java objects for WebHistoryItem" into jb-dev
Diffstat (limited to 'Source/WebKit/android/jni/WebIconDatabase.cpp')
| -rw-r--r-- | Source/WebKit/android/jni/WebIconDatabase.cpp | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/Source/WebKit/android/jni/WebIconDatabase.cpp b/Source/WebKit/android/jni/WebIconDatabase.cpp index c53db0e..da8ce63 100644 --- a/Source/WebKit/android/jni/WebIconDatabase.cpp +++ b/Source/WebKit/android/jni/WebIconDatabase.cpp @@ -50,17 +50,25 @@ namespace android { -jobject webcoreImageToJavaBitmap(JNIEnv* env, WebCore::Image* icon) +SkBitmap webcoreImageToSkBitmap(WebCore::Image* icon) { - if (!icon) - return NULL; SkBitmap bm; + if (!icon) + return bm; WebCore::SharedBuffer* buffer = icon->data(); - if (!buffer || !SkImageDecoder::DecodeMemory(buffer->data(), buffer->size(), - &bm, SkBitmap::kNo_Config, - SkImageDecoder::kDecodePixels_Mode)) - return NULL; + if (!buffer) + return bm; + SkImageDecoder::DecodeMemory(buffer->data(), buffer->size(), &bm, + SkBitmap::kNo_Config, + SkImageDecoder::kDecodePixels_Mode); + return bm; +} +jobject webcoreImageToJavaBitmap(JNIEnv* env, WebCore::Image* icon) +{ + SkBitmap bm = webcoreImageToSkBitmap(icon); + if (bm.isNull()) + return NULL; return GraphicsJNI::createBitmap(env, new SkBitmap(bm), false, NULL); } |