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/platform | |
| 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/platform')
| -rw-r--r-- | Source/WebCore/platform/MIMETypeRegistry.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Source/WebCore/platform/MIMETypeRegistry.cpp b/Source/WebCore/platform/MIMETypeRegistry.cpp index 8017c90..4f9be57 100644 --- a/Source/WebCore/platform/MIMETypeRegistry.cpp +++ b/Source/WebCore/platform/MIMETypeRegistry.cpp @@ -27,12 +27,6 @@ #include "config.h" #include "MIMETypeRegistry.h" -<<<<<<< HEAD -#if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size -#include "ArchiveFactory.h" -#endif -======= ->>>>>>> webkit.org at r78450 #include "MediaPlayer.h" #include <wtf/HashMap.h> #include <wtf/HashSet.h> @@ -256,11 +250,7 @@ static void initializeSupportedNonImageMimeTypes() for (size_t i = 0; i < WTF_ARRAY_LENGTH(types); ++i) supportedNonImageMIMETypes->add(types[i]); -<<<<<<< HEAD -#if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size -======= #if ENABLE(WEB_ARCHIVE) ->>>>>>> webkit.org at r78450 ArchiveFactory::registerKnownArchiveMIMETypes(); #endif } |