third_party/WebKit/Source/core/fetch/ImageResource.cpp - Issue 1667843003: Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #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/ImageResource.cpp

Issue 1667843003: Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix known issues 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/dom/ScriptLoader.cpp ('K') | « third_party/WebKit/Source/core/fetch/ImageResource.h ('k') | third_party/WebKit/Source/core/fetch/ImageResourceTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/fetch/ImageResource.cpp

diff --git a/third_party/WebKit/Source/core/fetch/ImageResource.cpp b/third_party/WebKit/Source/core/fetch/ImageResource.cpp

index 6395714499de125843536a2427f34ecaa71bd934..8a614214b3554e66d37cc7c4af690b309def1db7 100644

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

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

@@ -41,7 +41,7 @@

namespace blink {

-ResourcePtr<ImageResource> ImageResource::fetch(FetchRequest& request, ResourceFetcher* fetcher)

+PassRefPtrWillBeRawPtr<ImageResource> ImageResource::fetch(FetchRequest& request, ResourceFetcher* fetcher)

{

if (request.resourceRequest().requestContext() == WebURLRequest::RequestContextUnspecified)

request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestContextImage);

@@ -49,7 +49,7 @@ ResourcePtr<ImageResource> ImageResource::fetch(FetchRequest& request, ResourceF

KURL requestURL = request.resourceRequest().url();

if (requestURL.isValid() && fetcher->context().canRequest(Resource::Image, request.resourceRequest(), requestURL, request.options(), request.forPreload(), request.originRestriction()))

fetcher->context().sendImagePing(requestURL);

- return 0;

+ return nullptr;

}

if (fetcher->clientDefersImage(request.resourceRequest().url()))