third_party/WebKit/Source/core/workers/WorkerThreadStartupData.cpp - Issue 2050123002: 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/workers/WorkerThreadStartupData.cpp

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

Patch Set: Address comments from Kent; merge. 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:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/core/dom/ExecutionContextTask.h ('K') | « third_party/WebKit/Source/core/workers/WorkerThreadStartupData.h ('k') | third_party/WebKit/Source/core/workers/WorkerThreadTest.cpp » ('j') | third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequestUpload.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/workers/WorkerThreadStartupData.cpp

diff --git a/third_party/WebKit/Source/core/workers/WorkerThreadStartupData.cpp b/third_party/WebKit/Source/core/workers/WorkerThreadStartupData.cpp

index e9b767cab9c20e63b7977043bd91fffee057ec72..659d28b060eb451a8f465f1b1072d6829cc5e8eb 100644

--- a/third_party/WebKit/Source/core/workers/WorkerThreadStartupData.cpp

+++ b/third_party/WebKit/Source/core/workers/WorkerThreadStartupData.cpp

@@ -31,10 +31,12 @@

#include "core/workers/WorkerThreadStartupData.h"

#include "platform/network/ContentSecurityPolicyParsers.h"

+#include "wtf/PtrUtil.h"

+#include <memory>

namespace blink {

-WorkerThreadStartupData::WorkerThreadStartupData(const KURL& scriptURL, const String& userAgent, const String& sourceCode, PassOwnPtr<Vector<char>> cachedMetaData, WorkerThreadStartMode startMode, const Vector<CSPHeaderAndType>* contentSecurityPolicyHeaders, const SecurityOrigin* starterOrigin, WorkerClients* workerClients, WebAddressSpace addressSpace, const Vector<String>* originTrialTokens, V8CacheOptions v8CacheOptions)

+WorkerThreadStartupData::WorkerThreadStartupData(const KURL& scriptURL, const String& userAgent, const String& sourceCode, std::unique_ptr<Vector<char>> cachedMetaData, WorkerThreadStartMode startMode, const Vector<CSPHeaderAndType>* contentSecurityPolicyHeaders, const SecurityOrigin* starterOrigin, WorkerClients* workerClients, WebAddressSpace addressSpace, const Vector<String>* originTrialTokens, V8CacheOptions v8CacheOptions)

: m_scriptURL(scriptURL.copy())

, m_userAgent(userAgent.isolatedCopy())

, m_sourceCode(sourceCode.isolatedCopy())

@@ -45,7 +47,7 @@ WorkerThreadStartupData::WorkerThreadStartupData(const KURL& scriptURL, const St

, m_addressSpace(addressSpace)

, m_v8CacheOptions(v8CacheOptions)

{

- m_contentSecurityPolicyHeaders = adoptPtr(new Vector<CSPHeaderAndType>());

+ m_contentSecurityPolicyHeaders = wrapUnique(new Vector<CSPHeaderAndType>());

if (contentSecurityPolicyHeaders) {

for (const auto& header : *contentSecurityPolicyHeaders) {

CSPHeaderAndType copiedHeader(header.first.isolatedCopy(), header.second);