Index: Source/core/fetch/ResourceFetcher.cpp |
diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp |
index 9e21bc8204212e27d87d09cc8b81a7f79e211b30..f887eaf19084608b9e6a5611cd4261db1c4bea2e 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 |
@@ -802,7 +795,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) { |