diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-10-21 07:00:00 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-10-21 07:00:00 -0700 |
| commit | 9364f22aed35e1a1e9d07c121510f80be3ab0502 (patch) | |
| tree | d49911209b132da58d838efa852daf28d516df21 /WebCore/loader/DocumentLoader.cpp | |
| parent | 87eb0cb35bad8784770ebc807e6c982432e47107 (diff) | |
| download | external_webkit-9364f22aed35e1a1e9d07c121510f80be3ab0502.zip external_webkit-9364f22aed35e1a1e9d07c121510f80be3ab0502.tar.gz external_webkit-9364f22aed35e1a1e9d07c121510f80be3ab0502.tar.bz2 | |
Initial Contribution
Diffstat (limited to 'WebCore/loader/DocumentLoader.cpp')
| -rw-r--r-- | WebCore/loader/DocumentLoader.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/WebCore/loader/DocumentLoader.cpp b/WebCore/loader/DocumentLoader.cpp index ba4eaf2..b90ead6 100644 --- a/WebCore/loader/DocumentLoader.cpp +++ b/WebCore/loader/DocumentLoader.cpp @@ -30,6 +30,9 @@ #include "DocumentLoader.h" #include "CachedPage.h" +#ifdef ANDROID_PRELOAD_CHANGES +#include "DocLoader.h" +#endif #include "Document.h" #include "Event.h" #include "Frame.h" @@ -123,8 +126,7 @@ static void setAllDefersLoading(const ResourceLoaderSet& loaders, bool defers) } DocumentLoader::DocumentLoader(const ResourceRequest& req, const SubstituteData& substituteData) - : RefCounted<DocumentLoader>(0) - , m_deferMainResourceDataLoad(true) + : m_deferMainResourceDataLoad(true) , m_frame(0) , m_originalRequest(req) , m_substituteData(substituteData) @@ -466,10 +468,15 @@ bool DocumentLoader::isLoadingInAPISense() const return true; if (!m_subresourceLoaders.isEmpty()) return true; - if (Document* doc = m_frame->document()) + if (Document* doc = m_frame->document()) { +#ifdef ANDROID_PRELOAD_CHANGES + if (doc->docLoader()->requestCount()) + return true; +#endif if (Tokenizer* tok = doc->tokenizer()) if (tok->processingData()) return true; + } } return frameLoader()->subframeIsLoading(); } |