| Index: third_party/WebKit/Source/core/fetch/Resource.cpp
|
| diff --git a/third_party/WebKit/Source/core/fetch/Resource.cpp b/third_party/WebKit/Source/core/fetch/Resource.cpp
|
| index d804be566ea13d9688d2afdefe438764ece3d30a..dbb8562fdd1443bd6c9ea20ac00e11804238bca3 100644
|
| --- a/third_party/WebKit/Source/core/fetch/Resource.cpp
|
| +++ b/third_party/WebKit/Source/core/fetch/Resource.cpp
|
| @@ -297,17 +297,11 @@ void Resource::error(Resource::Status status)
|
| markClientsFinished();
|
| }
|
|
|
| -void Resource::finishOnePart()
|
| -{
|
| - setLoading(false);
|
| - checkNotify();
|
| -}
|
| -
|
| void Resource::finish()
|
| {
|
| ASSERT(m_revalidatingRequest.isNull());
|
| - ASSERT(!errorOccurred());
|
| - finishOnePart();
|
| + setLoading(false);
|
| + checkNotify();
|
| markClientsFinished();
|
| if (!errorOccurred())
|
| m_status = Cached;
|
| @@ -457,7 +451,6 @@ void Resource::responseReceived(const ResourceResponse& response, PassOwnPtr<Web
|
| }
|
| revalidationFailed();
|
| }
|
| -
|
| setResponse(response);
|
| String encoding = response.textEncodingName();
|
| if (!encoding.isNull())
|
|
|