third_party/WebKit/Source/core/fetch/Resource.cpp - Issue 1710733002: Move multipart resource handling to core/fetch (2/2)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/fetch/Resource.cpp

Issue 1710733002: Move multipart resource handling to core/fetch (2/2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@multipart-cleanup

Patch Set: Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/core/fetch/ImageResource.cpp ('K') | « third_party/WebKit/Source/core/fetch/Resource.h ('k') | third_party/WebKit/Source/core/fetch/ResourceLoader.h » ('j') | third_party/WebKit/Source/core/fetch/ResourceLoader.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 0035e20190b8ec815b98b4637e750dad196751a3..5ee37c948f08ad9e2589748e0ce3039b9653e985 100644

--- a/third_party/WebKit/Source/core/fetch/Resource.cpp

+++ b/third_party/WebKit/Source/core/fetch/Resource.cpp

@@ -303,17 +303,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;

@@ -462,7 +456,6 @@ void Resource::responseReceived(const ResourceResponse& response, PassOwnPtr<Web

}

revalidationFailed();

}

setResponse(response);

String encoding = response.textEncodingName();

if (!encoding.isNull())