diff options
| author | Elliott Slaughter <eds@google.com> | 2010-08-31 15:29:02 -0700 |
|---|---|---|
| committer | Elliott Slaughter <eds@google.com> | 2010-09-01 13:14:17 -0700 |
| commit | c209f6291cef0971b31f983e571c8fad9170c3bf (patch) | |
| tree | 19993a0e8fbff1e1aa019f0d691f673e2796c474 | |
| parent | 0b84ecf50c01e0fbf7307ca7cae55ab3043c75a3 (diff) | |
| download | external_webkit-c209f6291cef0971b31f983e571c8fad9170c3bf.zip external_webkit-c209f6291cef0971b31f983e571c8fad9170c3bf.tar.gz external_webkit-c209f6291cef0971b31f983e571c8fad9170c3bf.tar.bz2 | |
Use the correct types in SaveWebArchive.
Change-Id: I0a963a0e6b29be73aaede56bb58400ce1e81edb7
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index 0e8a7a2..f218cbb 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -1174,7 +1174,7 @@ static String saveArchiveAutoname(String basename, String name, String extension } #endif -static jobject SaveWebArchive(JNIEnv *env, jobject obj, jstring basename, jboolean autoname) +static jstring SaveWebArchive(JNIEnv *env, jobject obj, jstring basename, jboolean autoname) { #if ENABLE(ARCHIVE) WebCore::Frame* pFrame = GET_NATIVE_FRAME(env, obj); @@ -1195,7 +1195,7 @@ static jobject SaveWebArchive(JNIEnv *env, jobject obj, jstring basename, jboole if (filename.isNull() || filename.isEmpty()) { LOGD("saveWebArchive: Failed to select a filename to save."); releaseCharactersForJStringInEnv(env, basename, basenameNative); - return JNI_FALSE; + return NULL; } const int noCompression = 0; @@ -1203,7 +1203,7 @@ static jobject SaveWebArchive(JNIEnv *env, jobject obj, jstring basename, jboole if (writer == NULL) { LOGD("saveWebArchive: Failed to initialize xml writer."); releaseCharactersForJStringInEnv(env, basename, basenameNative); - return JNI_FALSE; + return NULL; } RefPtr<WebArchiveAndroid> archive = WebCore::WebArchiveAndroid::create(pFrame); |