diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-15 09:06:43 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-15 09:31:31 (GMT) |
| commit | c411f16870f112c3407c28c22b617f613a82cff4 (patch) | |
| tree | 29a1bcd590c8b31af2aab445bfe8a978dc5bf582 /src/3rdparty/webkit/WebCore/loader/ResourceLoader.cpp | |
| parent | 3d77b56b32a0c53ec0bbfaa07236fedb900ff336 (diff) | |
| download | Qt-c411f16870f112c3407c28c22b617f613a82cff4.zip Qt-c411f16870f112c3407c28c22b617f613a82cff4.tar.gz Qt-c411f16870f112c3407c28c22b617f613a82cff4.tar.bz2 | |
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit-4.6-snapshot-15062009 ( 65232bf00dc494ebfd978f998c88f58d18ecce1e )
Diffstat (limited to 'src/3rdparty/webkit/WebCore/loader/ResourceLoader.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/loader/ResourceLoader.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/3rdparty/webkit/WebCore/loader/ResourceLoader.cpp b/src/3rdparty/webkit/WebCore/loader/ResourceLoader.cpp index 3bac2a7..e2fc7ba 100644 --- a/src/3rdparty/webkit/WebCore/loader/ResourceLoader.cpp +++ b/src/3rdparty/webkit/WebCore/loader/ResourceLoader.cpp @@ -64,9 +64,6 @@ ResourceLoader::ResourceLoader(Frame* frame, bool sendResourceLoadCallbacks, boo , m_shouldContentSniff(shouldContentSniff) , m_shouldBufferData(true) , m_defersLoading(frame->page()->defersLoading()) -#if ENABLE(OFFLINE_WEB_APPLICATIONS) - , m_wasLoadedFromApplicationCache(false) -#endif { } @@ -122,10 +119,8 @@ bool ResourceLoader::load(const ResourceRequest& r) return true; #if ENABLE(OFFLINE_WEB_APPLICATIONS) - if (m_documentLoader->scheduleApplicationCacheLoad(this, clientRequest, r.url())) { - m_wasLoadedFromApplicationCache = true; + if (m_documentLoader->scheduleApplicationCacheLoad(this, clientRequest, r.url())) return true; - } #endif if (m_defersLoading) { @@ -200,7 +195,6 @@ bool ResourceLoader::scheduleLoadFallbackResourceFromApplicationCache(Applicatio { if (documentLoader()->scheduleLoadFallbackResourceFromApplicationCache(this, m_request, cache)) { handle()->cancel(); - m_wasLoadedFromApplicationCache = true; return true; } return false; |