third_party/WebKit/Source/core/fetch/ResourceLoader.cpp - Issue 1738623004: Rename enums/functions that collide in chromium style.

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/ResourceLoader.cpp

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4

Patch Set: get-names-5: rebase-and-stuff 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

« no previous file with comments | « third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp ('k') | third_party/WebKit/Source/core/fetch/ScriptResource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..2ff8e64f0f3caeb801343d7cdba34af92545fd17 100644

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

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

@@ -366,7 +366,7 @@ void ResourceLoader::didReceiveResponse(WebURLLoader*, const WebURLResponse& res

if (response.toResourceResponse().isMultipart()) {

// We only support multipart for images, though the image may be loaded

// as a main resource that we end up displaying through an ImageDocument.

- if (!m_resource->isImage() && m_resource->type() != Resource::MainResource) {

+ if (!m_resource->isImage() && m_resource->getType() != Resource::MainResource) {

cancel();

return;

}