Source/core/workers/WorkerThreadStartupData.h - Issue 106353005: Expose performance.memory in workers

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: Source/core/workers/WorkerThreadStartupData.h

Issue 106353005: Expose performance.memory in workers (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@Perf-Memory-SharedWorker

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

« Source/core/workers/WorkerSettings.h ('K') | « Source/core/workers/WorkerSettings.cpp ('k') | Source/core/workers/WorkerThreadStartupData.cpp » ('j') | Source/web/WebSharedWorkerImpl.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/workers/WorkerThreadStartupData.h

diff --git a/Source/core/workers/WorkerThreadStartupData.h b/Source/core/workers/WorkerThreadStartupData.h

index c1b13d703b78729c32c75eb9c8f345c9f9523832..e10ab87d4ae767fc2c3a88249cac57d6eb263925 100644

--- a/Source/core/workers/WorkerThreadStartupData.h

+++ b/Source/core/workers/WorkerThreadStartupData.h

@@ -33,6 +33,7 @@

#include "core/frame/ContentSecurityPolicy.h"

#include "core/workers/WorkerClients.h"

+#include "core/workers/WorkerSettings.h"

#include "core/workers/WorkerThread.h"

#include "platform/weborigin/KURL.h"

#include "wtf/Forward.h"

@@ -45,9 +46,9 @@ class WorkerClients;

struct WorkerThreadStartupData {

WTF_MAKE_NONCOPYABLE(WorkerThreadStartupData); WTF_MAKE_FAST_ALLOCATED;

public:

- static PassOwnPtr<WorkerThreadStartupData> create(const KURL& scriptURL, const String& userAgent, const String& sourceCode, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, PassOwnPtr<WorkerClients> workerClients)

+ static PassOwnPtr<WorkerThreadStartupData> create(const KURL& scriptURL, const String& userAgent, const String& sourceCode, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, PassOwnPtr<WorkerClients> workerClients, PassOwnPtr<WorkerSettings> workerSettings)

{

- return adoptPtr(new WorkerThreadStartupData(scriptURL, userAgent, sourceCode, startMode, contentSecurityPolicy, contentSecurityPolicyType, workerClients));

+ return adoptPtr(new WorkerThreadStartupData(scriptURL, userAgent, sourceCode, startMode, contentSecurityPolicy, contentSecurityPolicyType, workerClients, workerSettings));

}

~WorkerThreadStartupData();

@@ -59,9 +60,10 @@ public:

String m_contentSecurityPolicy;

ContentSecurityPolicy::HeaderType m_contentSecurityPolicyType;

OwnPtr<WorkerClients> m_workerClients;

+ OwnPtr<WorkerSettings> m_workerSettings;

private:

- WorkerThreadStartupData(const KURL& scriptURL, const String& userAgent, const String& sourceCode, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, PassOwnPtr<WorkerClients>);

+ WorkerThreadStartupData(const KURL& scriptURL, const String& userAgent, const String& sourceCode, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, PassOwnPtr<WorkerClients>, PassOwnPtr<WorkerSettings>);

};

} // namespace WebCore