diff options
Diffstat (limited to 'WebCore/loader/ResourceLoader.cpp')
| -rw-r--r-- | WebCore/loader/ResourceLoader.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/WebCore/loader/ResourceLoader.cpp b/WebCore/loader/ResourceLoader.cpp index 42b6092..4522965 100644 --- a/WebCore/loader/ResourceLoader.cpp +++ b/WebCore/loader/ResourceLoader.cpp @@ -144,15 +144,10 @@ void ResourceLoader::start() return; } -<<<<<<< HEAD #if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size - if (m_documentLoader->scheduleArchiveLoad(this, clientRequest, r.url())) - return true; -#endif -======= if (m_documentLoader->scheduleArchiveLoad(this, m_request, m_request.url())) return; ->>>>>>> webkit.org at r72274 +#endif #if ENABLE(OFFLINE_WEB_APPLICATIONS) if (m_documentLoader->applicationCacheHost()->maybeLoadResource(this, m_request, m_request.url())) |