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

Index: third_party/WebKit/Source/core/loader/DocumentLoader.cpp

diff --git a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp

index 29ba34b388fae3d211e2d5246a0ffd2ad02fb802..ab016f4d0aea8ab12f312243f608522407321b1a 100644

--- a/third_party/WebKit/Source/core/loader/DocumentLoader.cpp

+++ b/third_party/WebKit/Source/core/loader/DocumentLoader.cpp

@@ -123,7 +123,7 @@ DEFINE_TRACE(DocumentLoader)

{

visitor->trace(m_frame);

visitor->trace(m_fetcher);

- // TODO(sof): start tracing ResourcePtr<>s (and m_mainResource.)

+ visitor->trace(m_mainResource);

visitor->trace(m_writer);

visitor->trace(m_documentLoadTiming);

visitor->trace(m_applicationCacheHost);

@@ -157,9 +157,9 @@ const KURL& DocumentLoader::url() const

return m_request.url();

}

-ResourcePtr<Resource> DocumentLoader::startPreload(Resource::Type type, FetchRequest& request)

+Resource* DocumentLoader::startPreload(Resource::Type type, FetchRequest& request)

{

- ResourcePtr<Resource> resource;

+ RefPtrWillBeRawPtr<Resource> resource = nullptr;

switch (type) {

case Resource::Image:

resource = ImageResource::fetch(request, fetcher());

@@ -193,7 +193,7 @@ ResourcePtr<Resource> DocumentLoader::startPreload(Resource::Type type, FetchReq

if (resource)

fetcher()->preloadStarted(resource.get());

- return resource;

+ return resource.get();

}

void DocumentLoader::didChangePerformanceTiming()