third_party/WebKit/Source/core/fetch/Resource.cpp - Issue 2080623002: Revert "Remove OwnPtr from Blink."

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

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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:

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

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

index 20b69e38de6bd385ea801e11c98a8aafe177faef..c481de075a3582a3b8c47d10158a998684da6045 100644

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

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

@@ -48,7 +48,6 @@

#include "wtf/text/CString.h"

#include "wtf/text/StringBuilder.h"

#include <algorithm>

-#include <memory>

namespace blink {

@@ -237,7 +236,7 @@ private:

ResourceCallback();

void runTask();

- std::unique_ptr<CancellableTaskFactory> m_callbackTaskFactory;

+ OwnPtr<CancellableTaskFactory> m_callbackTaskFactory;

HeapHashSet<Member<Resource>> m_resourcesWithPendingClients;

};

@@ -568,7 +567,7 @@ bool Resource::unlock()

return true;

}

-void Resource::responseReceived(const ResourceResponse& response, std::unique_ptr<WebDataConsumerHandle>)

+void Resource::responseReceived(const ResourceResponse& response, PassOwnPtr<WebDataConsumerHandle>)

{

m_responseTimestamp = currentTime();

if (m_preloadDiscoveryTime) {