Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1161)

Unified Diff: Source/core/loader/DocumentLoader.cpp

Issue 1116613003: Remove ResourceFetcher's access to a FrameFetchContext when detaching (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/loader/DocumentLoader.cpp
diff --git a/Source/core/loader/DocumentLoader.cpp b/Source/core/loader/DocumentLoader.cpp
index 23d5ec9197acc0cd384b638d8f36e33fe0c86074..3c52b29e41c85bebc5c09413d99d3622e3cc3db4 100644
--- a/Source/core/loader/DocumentLoader.cpp
+++ b/Source/core/loader/DocumentLoader.cpp
@@ -108,7 +108,6 @@ ResourceLoader* DocumentLoader::mainResourceLoader() const
DocumentLoader::~DocumentLoader()
{
ASSERT(!m_frame || !isLoading());
- static_cast<FrameFetchContext&>(m_fetcher->context()).clearDocumentLoader();
clearMainResourceHandle();
m_applicationCacheHost->dispose();
}
@@ -563,6 +562,7 @@ void DocumentLoader::detachFromFrame()
// frame have any loads active, so go ahead and kill all the loads.
stopLoading();
+ m_fetcher->clearContext();
m_applicationCacheHost->setApplicationCache(0);
WeakIdentifierMap<DocumentLoader>::notifyObjectDestroyed(this);
m_frame = 0;

Powered by Google App Engine
This is Rietveld 408576698