third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.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/inspector/InspectorResourceContentLoader.cpp

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/inspector/InspectorResourceContentLoader.h ('k') | third_party/WebKit/Source/core/inspector/NetworkResourcesData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp

diff --git a/third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp b/third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp

index 49fff9b49e021dae66008bca5cc12760c3860233..b428c73fed0519d951e42c40b9cddd3b24d18760 100644

--- a/third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp

+++ b/third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp

@@ -12,7 +12,6 @@

#include "core/fetch/RawResource.h"

#include "core/fetch/Resource.h"

#include "core/fetch/ResourceFetcher.h"

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

#include "core/fetch/StyleSheetResourceClient.h"

#include "core/frame/LocalFrame.h"

#include "core/inspector/InspectedFrames.h"

@@ -114,7 +113,7 @@ void InspectorResourceContentLoader::start()

if (!resourceRequest.url().string().isEmpty()) {

urlsToFetch.add(resourceRequest.url().string());

FetchRequest request(resourceRequest, FetchInitiatorTypeNames::internal);

- ResourcePtr<Resource> resource = RawResource::fetch(request, document->fetcher());

+ RefPtrWillBeRawPtr<Resource> resource = RawResource::fetch(request, document->fetcher());

if (resource) {

// Prevent garbage collection by holding a reference to this resource.

m_resources.append(resource.get());

@@ -135,7 +134,7 @@ void InspectorResourceContentLoader::start()

urlsToFetch.add(url);

FetchRequest request(ResourceRequest(url), FetchInitiatorTypeNames::internal);

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

- ResourcePtr<Resource> resource = CSSStyleSheetResource::fetch(request, document->fetcher());

+ RefPtrWillBeRawPtr<Resource> resource = CSSStyleSheetResource::fetch(request, document->fetcher());

if (!resource)

continue;

// Prevent garbage collection by holding a reference to this resource.

@@ -168,6 +167,7 @@ DEFINE_TRACE(InspectorResourceContentLoader)

#if ENABLE(OILPAN)

visitor->trace(m_inspectedFrame);

visitor->trace(m_pendingResourceClients);

+ visitor->trace(m_resources);

#endif

}