Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Unified Diff: Source/modules/serviceworkers/ServiceWorkerThread.cpp

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, 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
Index: Source/modules/serviceworkers/ServiceWorkerThread.cpp
diff --git a/Source/modules/serviceworkers/ServiceWorkerThread.cpp b/Source/modules/serviceworkers/ServiceWorkerThread.cpp
index 72d86290707f45dd22a87304a259c3ccf98d39f4..a452ee00fc03c6dbaee05e81d681f054d6811ce1 100644
--- a/Source/modules/serviceworkers/ServiceWorkerThread.cpp
+++ b/Source/modules/serviceworkers/ServiceWorkerThread.cpp
@@ -39,11 +39,13 @@ namespace WebCore {
PassRefPtr<ServiceWorkerThread> ServiceWorkerThread::create(WorkerLoaderProxy& workerLoaderProxy, WorkerReportingProxy& workerReportingProxy, PassOwnPtr<WorkerThreadStartupData> startupData)
{
- return adoptRef(new ServiceWorkerThread(workerLoaderProxy, workerReportingProxy, startupData));
+ // Worker settings has not been passed to ServiceWorker yet.
+ OwnPtr<WorkerSettings> settings = WorkerSettings::create();
+ return adoptRef(new ServiceWorkerThread(workerLoaderProxy, workerReportingProxy, settings.release(), startupData));
}
-ServiceWorkerThread::ServiceWorkerThread(WorkerLoaderProxy& workerLoaderProxy, WorkerReportingProxy& workerReportingProxy, PassOwnPtr<WorkerThreadStartupData> startupData)
- : WorkerThread(workerLoaderProxy, workerReportingProxy, startupData)
+ServiceWorkerThread::ServiceWorkerThread(WorkerLoaderProxy& workerLoaderProxy, WorkerReportingProxy& workerReportingProxy, PassOwnPtr<WorkerSettings> settings, PassOwnPtr<WorkerThreadStartupData> startupData)
+ : WorkerThread(workerLoaderProxy, workerReportingProxy, settings, startupData)
{
}
@@ -53,7 +55,7 @@ ServiceWorkerThread::~ServiceWorkerThread()
PassRefPtr<WorkerGlobalScope> ServiceWorkerThread::createWorkerGlobalScope(PassOwnPtr<WorkerThreadStartupData> startupData)
{
- return ServiceWorkerGlobalScope::create(this, startupData);
+ return ServiceWorkerGlobalScope::create(this, startupData, *settings());
}
} // namespace WebCore

Powered by Google App Engine
This is Rietveld 408576698