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/WebCore/loader/archive | |
| 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/WebCore/loader/archive')
| -rw-r--r-- | Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp b/Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp index fbb0aec..55d7cec 100644 --- a/Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp +++ b/Source/WebCore/loader/archive/android/WebArchiveAndroid.cpp @@ -28,7 +28,7 @@ #include "config.h" #include "WebArchiveAndroid.h" -#if ENABLE(ARCHIVE) +#if ENABLE(WEB_ARCHIVE) #include "Base64.h" #include <libxml/encoding.h> @@ -470,4 +470,4 @@ bool WebArchiveAndroid::saveWebArchive(xmlTextWriterPtr writer) } -#endif // ENABLE(ARCHIVE) +#endif // ENABLE(WEB_ARCHIVE) |