diff options
| author | Steve Block <steveblock@google.com> | 2011-05-20 09:10:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-20 09:10:52 -0700 |
| commit | 483066d710566d4c99077d4d150e4aa72654b97d (patch) | |
| tree | 2f920c687609e6b47b4c5426556295bb1dae6164 /Source/WebCore/loader/DocumentLoader.cpp | |
| parent | 41c4de163e4183c0e2a74c5c296de8a734ecc516 (diff) | |
| parent | f2f7d373c9827c5c27771dfda4ca627f173fbe10 (diff) | |
| download | external_webkit-483066d710566d4c99077d4d150e4aa72654b97d.zip external_webkit-483066d710566d4c99077d4d150e4aa72654b97d.tar.gz external_webkit-483066d710566d4c99077d4d150e4aa72654b97d.tar.bz2 | |
Merge changes Ib103214e,Ibc8ca754,I6adc6f64,I4c5fde48,I81552b1b
* changes:
Do not process Inspector.idl using the V8 or JSC code generator
Remove some superfluous ARCHIVE enable guards
Fix WebArchiveAndroid logging
Fix some compiler warnings
Use adoptPtr() and adoptArrayPtr() when setting OwnPtr and OwnArrayPtr
Diffstat (limited to 'Source/WebCore/loader/DocumentLoader.cpp')
| -rw-r--r-- | Source/WebCore/loader/DocumentLoader.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp index 4e7c656..6e91107 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp @@ -30,12 +30,8 @@ #include "DocumentLoader.h" #include "ApplicationCacheHost.h" -#if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size #include "ArchiveFactory.h" #include "ArchiveResourceCollection.h" -#else -#include "SubstituteResource.h" -#endif #include "CachedPage.h" #include "CachedResourceLoader.h" #include "DOMWindow.h" |