| 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 75dd0bfd3fa5562885c0503b3926b03b90a1870a..e1c794233adb7bf65b6af34aa0719fb346fde660 100644
|
| --- a/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/fetch/ResourceLoader.cpp
|
| @@ -129,14 +129,17 @@ void ResourceLoader::didDownloadData(WebURLLoader*, int length, int encodedDataL
|
| void ResourceLoader::didFinishLoadingOnePart(double finishTime, int64_t encodedDataLength)
|
| {
|
| ASSERT(m_state != ConnectionStateReleased);
|
| - if (!isFinishing()) {
|
| + if (isFinishing()) {
|
| + m_fetcher->removeResourceLoader(this);
|
| + } else {
|
| // When loading a multipart resource, make the loader non-block when
|
| // finishing loading the first part.
|
| - m_fetcher->subresourceLoaderFinishedLoadingOnePart(this);
|
| - }
|
| + m_fetcher->moveResourceLoaderToNonBlocking(this);
|
|
|
| - if (m_state == ConnectionStateReleased)
|
| - return;
|
| + m_fetcher->didLoadResource(m_resource.get());
|
| + if (m_state == ConnectionStateReleased)
|
| + return;
|
| + }
|
|
|
| if (m_notifiedLoadComplete)
|
| return;
|
|
|