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.h | |
| 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.h')
| -rw-r--r-- | Source/WebKit/android/jni/WebIconDatabase.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebKit/android/jni/WebIconDatabase.h b/Source/WebKit/android/jni/WebIconDatabase.h index 3011b9f..c3e7947 100644 --- a/Source/WebKit/android/jni/WebIconDatabase.h +++ b/Source/WebKit/android/jni/WebIconDatabase.h @@ -28,6 +28,7 @@ #include "IconDatabaseClient.h" #include "PlatformString.h" +#include "SkBitmap.h" #include "utils/threads.h" #include <jni.h> #include <wtf/Vector.h> @@ -73,6 +74,7 @@ namespace android { bool mDeliveryRequested; }; + SkBitmap webcoreImageToSkBitmap(WebCore::Image* icon); jobject webcoreImageToJavaBitmap(JNIEnv* env, WebCore::Image* icon); }; |