| Index: Source/core/fetch/ResourceFetcher.cpp
|
| diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp
|
| index 8fdd96d46d063bc213f206260b9e155acb3e8638..8eddc019efc63c564bcbb7f94e817b054f8dfb42 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
|
| @@ -803,7 +796,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) {
|
|
|