diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 18:28:23 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-18 18:28:23 +0100 |
| commit | 5dc3f82ee1d379f4df8606cdf60369965b44486c (patch) | |
| tree | a346ef329f6b325061ec2f58c118938d8253a9d2 | |
| parent | d05cd8d73ef0b36cd415af17933fe79f9f8f328d (diff) | |
| download | external_webkit-5dc3f82ee1d379f4df8606cdf60369965b44486c.zip external_webkit-5dc3f82ee1d379f4df8606cdf60369965b44486c.tar.gz external_webkit-5dc3f82ee1d379f4df8606cdf60369965b44486c.tar.bz2 | |
Fix build when WEBARCHIVE is disabled
Change-Id: Ibbc124a51f2c58188eb8132a57adc5d87373f25c
| -rw-r--r-- | Source/WebCore/config.h | 2 | ||||
| -rw-r--r-- | Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp | 4 | ||||
| -rw-r--r-- | Source/WebKit/android/jni/WebCoreFrameBridge.cpp | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Source/WebCore/config.h b/Source/WebCore/config.h index 1954e0d..3018e29 100644 --- a/Source/WebCore/config.h +++ b/Source/WebCore/config.h @@ -119,8 +119,6 @@ #define ENABLE_XHTMLMP 0 #define ENABLE_XPATH 1 #define ENABLE_XSLT 1 -#undef ENABLE_ARCHIVE // Enabled by default in Platform.h -#define ENABLE_ARCHIVE 1 #define ENABLE_OFFLINE_WEB_APPLICATIONS 1 #define ENABLE_TOUCH_EVENTS 1 #undef ENABLE_GEOLOCATION // Disabled by default in Platform.h diff --git a/Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp b/Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp index 49cfe9d..9cff676 100644 --- a/Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp +++ b/Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp @@ -28,6 +28,8 @@ #include "config.h" #include "WebArchiveAndroid.h" +#if ENABLE(ARCHIVE) + #include "Base64.h" #include <libxml/encoding.h> #include <libxml/parser.h> @@ -467,3 +469,5 @@ bool WebArchiveAndroid::saveWebArchive(xmlTextWriterPtr writer) } } + +#endif // ENABLE(ARCHIVE) diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp index 1ba5934..21ac8ef 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -1504,9 +1504,9 @@ static jstring SaveWebArchive(JNIEnv *env, jobject obj, jstring basename, jboole if (result) return wtfStringToJstring(env, filename); +#endif return NULL; -#endif } static jstring ExternalRepresentation(JNIEnv *env, jobject obj) |