| Index: third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
|
| diff --git a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
|
| index d53920a74f301b0c897fa9635f12c6439c71031b..5bfb6448791be819c075dac1c1102e75b765fbe6 100644
|
| --- a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
|
| @@ -178,7 +178,7 @@ void ResourceLoader::setDefersLoading(bool defers)
|
| }
|
| }
|
|
|
| -void ResourceLoader::attachThreadedDataReceiver(PassRefPtrWillBeRawPtr<ThreadedDataReceiver> threadedDataReceiver)
|
| +void ResourceLoader::attachThreadedDataReceiver(RawPtr<ThreadedDataReceiver> threadedDataReceiver)
|
| {
|
| if (m_loader) {
|
| // The implementor of the WebURLLoader assumes ownership of the
|
| @@ -430,7 +430,7 @@ void ResourceLoader::didFinishLoading(WebURLLoader*, double finishTime, int64_t
|
| ASSERT(m_state != Terminated);
|
| WTF_LOG(ResourceLoading, "Received '%s'.", m_resource->url().string().latin1().data());
|
|
|
| - RefPtrWillBeRawPtr<Resource> protectResource(m_resource.get());
|
| + RawPtr<Resource> protectResource(m_resource.get());
|
| m_state = Finishing;
|
| m_resource->setLoadFinishTime(finishTime);
|
| didFinishLoadingOnePart(finishTime, encodedDataLength);
|
| @@ -451,7 +451,7 @@ void ResourceLoader::didFail(WebURLLoader*, const WebURLError& error)
|
| ASSERT(m_state != Terminated);
|
| WTF_LOG(ResourceLoading, "Failed to load '%s'.\n", m_resource->url().string().latin1().data());
|
|
|
| - RefPtrWillBeRawPtr<Resource> protectResource(m_resource.get());
|
| + RawPtr<Resource> protectResource(m_resource.get());
|
| m_state = Finishing;
|
| m_resource->setResourceError(error);
|
|
|
| @@ -483,7 +483,7 @@ void ResourceLoader::requestSynchronously()
|
| // downloadToFile is not supported for synchronous requests.
|
| ASSERT(!m_request.downloadToFile());
|
|
|
| - RefPtrWillBeRawPtr<Resource> protectResource(m_resource.get());
|
| + RawPtr<Resource> protectResource(m_resource.get());
|
|
|
| RELEASE_ASSERT(m_connectionState == ConnectionStateNew);
|
| m_connectionState = ConnectionStateStarted;
|
|
|