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

Unified Diff: Source/core/fetch/ResourceFetcher.cpp

Issue 1124153003: [Oilpan] [Reland] Migrate classes under core/fetch to Oilpan heap (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Check m_fetcher in DocumentLoader Created 5 years, 6 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/fetch/ResourceFetcher.cpp
diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp
index af4d726b500337d7789b38d13b016ba462ba6dc7..7341560686bd98d6f6d7957c6d5a87951322039f 100644
--- a/Source/core/fetch/ResourceFetcher.cpp
+++ b/Source/core/fetch/ResourceFetcher.cpp
@@ -155,7 +155,7 @@ static WebURLRequest::RequestContext requestContextFromType(bool isMainFrame, Re
return WebURLRequest::RequestContextSubresource;
}
-ResourceFetcher::ResourceFetcher(PassOwnPtrWillBeRawPtr<FetchContext> context)
+ResourceFetcher::ResourceFetcher(FetchContext* context)
: m_context(context)
, m_garbageCollectDocumentResourcesTimer(this, &ResourceFetcher::garbageCollectDocumentResourcesTimerFired)
, m_resourceTimingReportTimer(this, &ResourceFetcher::resourceTimingReportTimerFired)
@@ -168,13 +168,6 @@ ResourceFetcher::ResourceFetcher(PassOwnPtrWillBeRawPtr<FetchContext> context)
ResourceFetcher::~ResourceFetcher()
{
clearPreloads();
-
-#if !ENABLE(OILPAN)
- // Make sure no requests still point to this ResourceFetcher
- // Oilpan: no object reference can be keeping this alive,
- // so property trivially holds.
- ASSERT(!m_loaders || m_loaders->isEmpty());
-#endif
}
Resource* ResourceFetcher::cachedResource(const KURL& resourceURL) const
@@ -801,7 +794,6 @@ bool ResourceFetcher::scheduleArchiveLoad(Resource* resource, const ResourceRequ
void ResourceFetcher::didFinishLoading(Resource* resource, double finishTime, int64_t encodedDataLength)
{
TRACE_EVENT_ASYNC_END0("blink.net", "Resource", resource);
- RefPtrWillBeRawPtr<ResourceFetcher> protect(this);
willTerminateResourceLoader(resource->loader());
if (resource && resource->response().isHTTP() && resource->response().httpStatusCode() < 400) {

Powered by Google App Engine
This is Rietveld 408576698