third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.h - 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/workers/SharedWorkerGlobalScope.h

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:

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

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/workers/InProcessWorkerObjectProxy.cpp ('k') | third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.h

diff --git a/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.h b/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.h

index 4879f9a1f2800015ae02adc64cbcb6687956147e..22bcfb0d966f3f02723e966273f7d264ec70f65c 100644

--- a/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.h

+++ b/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.h

@@ -36,7 +36,6 @@

#include "core/workers/WorkerGlobalScope.h"

#include "core/workers/WorkerThreadStartupData.h"

#include "platform/heap/Handle.h"

-#include <memory>

namespace blink {

@@ -47,7 +46,7 @@ class SharedWorkerGlobalScope final : public WorkerGlobalScope {

DEFINE_WRAPPERTYPEINFO();

public:

typedef WorkerGlobalScope Base;

- static SharedWorkerGlobalScope* create(const String& name, SharedWorkerThread*, std::unique_ptr<WorkerThreadStartupData>);

+ static SharedWorkerGlobalScope* create(const String& name, SharedWorkerThread*, PassOwnPtr<WorkerThreadStartupData>);

~SharedWorkerGlobalScope() override;

bool isSharedWorkerGlobalScope() const override { return true; }

@@ -64,8 +63,8 @@ public:

DECLARE_VIRTUAL_TRACE();

private:

- SharedWorkerGlobalScope(const String& name, const KURL&, const String& userAgent, SharedWorkerThread*, std::unique_ptr<SecurityOrigin::PrivilegeData>, WorkerClients*);

- void logExceptionToConsole(const String& errorMessage, std::unique_ptr<SourceLocation>) override;

+ SharedWorkerGlobalScope(const String& name, const KURL&, const String& userAgent, SharedWorkerThread*, PassOwnPtr<SecurityOrigin::PrivilegeData>, WorkerClients*);

+ void logExceptionToConsole(const String& errorMessage, PassOwnPtr<SourceLocation>) override;

String m_name;

};