third_party/WebKit/Source/core/fetch/DocumentResource.h - 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/DocumentResource.h

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

Patch Set: Rebase + address review comments 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/CachingCorrectnessTest.cpp ('k') | third_party/WebKit/Source/core/fetch/DocumentResource.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/fetch/DocumentResource.h

diff --git a/third_party/WebKit/Source/core/fetch/DocumentResource.h b/third_party/WebKit/Source/core/fetch/DocumentResource.h

index 326e2a54dc49b839fc0ffc5d00377e8ebb8c2886..fbbf7e54b37db13bbf51c028e4d9a2652b2c6060 100644

--- a/third_party/WebKit/Source/core/fetch/DocumentResource.h

+++ b/third_party/WebKit/Source/core/fetch/DocumentResource.h

@@ -25,7 +25,6 @@

#include "core/fetch/Resource.h"

#include "core/fetch/ResourceClient.h"

-#include "core/fetch/ResourcePtr.h"

#include "core/html/parser/TextResourceDecoder.h"

namespace blink {

@@ -38,7 +37,7 @@ class DocumentResource final : public Resource {

public:

using ClientType = ResourceClient;

- static ResourcePtr<DocumentResource> fetchSVGDocument(FetchRequest&, ResourceFetcher*);

+ static PassRefPtrWillBeRawPtr<DocumentResource> fetchSVGDocument(FetchRequest&, ResourceFetcher*);

~DocumentResource() override;

DECLARE_VIRTUAL_TRACE();

@@ -54,9 +53,9 @@ private:

SVGDocumentResourceFactory()

: ResourceFactory(Resource::SVGDocument) { }

- Resource* create(const ResourceRequest& request, const String& charset) const override

+ PassRefPtrWillBeRawPtr<Resource> create(const ResourceRequest& request, const String& charset) const override

{

- return new DocumentResource(request, Resource::SVGDocument);

+ return adoptRefWillBeNoop(new DocumentResource(request, Resource::SVGDocument));

}

};

DocumentResource(const ResourceRequest&, Type);

@@ -68,7 +67,7 @@ private:

};

DEFINE_TYPE_CASTS(DocumentResource, Resource, resource, resource->type() == Resource::SVGDocument, resource.type() == Resource::SVGDocument); \

-inline DocumentResource* toDocumentResource(const ResourcePtr<Resource>& ptr) { return toDocumentResource(ptr.get()); }

+inline DocumentResource* toDocumentResource(const RefPtrWillBeRawPtr<Resource>& ptr) { return toDocumentResource(ptr.get()); }

class DocumentResourceClient : public ResourceClient {

public: