diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 14:44:04 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-25 12:25:49 +0100 |
| commit | d73b16bdebb9d20b17be0a30e626dc9e66b6d868 (patch) | |
| tree | 01132a34552f1414cc645c5f8e87bb1ed8fe5714 /Source/WebKit/android | |
| parent | 15f1859ccdb0b25adc4607224a80c99b686fe0bb (diff) | |
| download | external_webkit-d73b16bdebb9d20b17be0a30e626dc9e66b6d868.zip external_webkit-d73b16bdebb9d20b17be0a30e626dc9e66b6d868.tar.gz external_webkit-d73b16bdebb9d20b17be0a30e626dc9e66b6d868.tar.bz2 | |
Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard
This replaces, and therefore conflicts with, Android's existing
ENABLE_ARCHIVE guard. This change resolves the conflicts by taking the
upstream guard in WebCore, updates WebKit to use the new guard, and
enables this guard on Android.
See http://trac.webkit.org/changeset/78439
See also http://trac.webkit.org/changeset/78342 for FrameLoader.cpp
Change-Id: I28ebaf3d69ea4c352ab4cfbf91c33a8ba25f89b5
Diffstat (limited to 'Source/WebKit/android')
| -rw-r--r-- | Source/WebKit/android/jni/WebCoreFrameBridge.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp index 21ac8ef..5caf633 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -78,6 +78,7 @@ #include "SubstituteData.h" #include "UrlInterceptResponse.h" #include "UserGestureIndicator.h" +#include "WebArchiveAndroid.h" #include "WebCache.h" #include "WebCoreJni.h" #include "WebCoreResourceLoader.h" @@ -119,10 +120,6 @@ #include "TimeCounter.h" #endif -#if ENABLE(ARCHIVE) -#include "WebArchiveAndroid.h" -#endif - #if ENABLE(WEB_AUTOFILL) #include "autofill/WebAutoFill.h" #endif @@ -1422,7 +1419,7 @@ static void StopLoading(JNIEnv *env, jobject obj) pFrame->loader()->stopForUserCancel(); } -#if ENABLE(ARCHIVE) +#if ENABLE(WEB_ARCHIVE) static String saveArchiveAutoname(String basename, String name, String extension) { if (name.isNull() || name.isEmpty()) { name = String("index"); @@ -1458,11 +1455,11 @@ static String saveArchiveAutoname(String basename, String name, String extension return String(); } -#endif +#endif // ENABLE(WEB_ARCHIVE) static jstring SaveWebArchive(JNIEnv *env, jobject obj, jstring basename, jboolean autoname) { -#if ENABLE(ARCHIVE) +#if ENABLE(WEB_ARCHIVE) WebCore::Frame* pFrame = GET_NATIVE_FRAME(env, obj); LOG_ASSERT(pFrame, "nativeSaveWebArchive must take a valid frame pointer!"); String mimeType = pFrame->loader()->documentLoader()->mainResource()->mimeType(); @@ -1504,7 +1501,7 @@ static jstring SaveWebArchive(JNIEnv *env, jobject obj, jstring basename, jboole if (result) return wtfStringToJstring(env, filename); -#endif +#endif // ENABLE(WEB_ARCHIVE) return NULL; } |