Source/core/workers/WorkerMessagingProxy.cpp - Issue 106353005: Expose performance.memory in workers

Unified Diff: Source/core/workers/WorkerMessagingProxy.cpp

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

Patch Set: Introduce WorkerSettings 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

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

Index: Source/core/workers/WorkerMessagingProxy.cpp

diff --git a/Source/core/workers/WorkerMessagingProxy.cpp b/Source/core/workers/WorkerMessagingProxy.cpp

index 425700aee6e39a6d218e3f5e5735e9339b91beee..d946b453761c8ea98f095f3de2f8ec5a2d9edfc0 100644

--- a/Source/core/workers/WorkerMessagingProxy.cpp

+++ b/Source/core/workers/WorkerMessagingProxy.cpp

@@ -35,6 +35,7 @@

#include "core/events/MessageEvent.h"

#include "core/frame/ContentSecurityPolicy.h"

#include "core/frame/DOMWindow.h"

+#include "core/frame/Settings.h"

#include "core/inspector/InspectorInstrumentation.h"

#include "core/inspector/ScriptCallStack.h"

#include "core/inspector/WorkerDebuggerAgent.h"

@@ -111,7 +112,10 @@ void WorkerMessagingProxy::startWorkerGlobalScope(const KURL& scriptURL, const S

ASSERT(m_executionContext->isDocument());

Document* document = toDocument(m_executionContext.get());

- OwnPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::create(scriptURL, userAgent, sourceCode, startMode, document->contentSecurityPolicy()->deprecatedHeader(), document->contentSecurityPolicy()->deprecatedHeaderType(), m_workerClients.release());

+ OwnPtr<WorkerSettings> settings = WorkerSettings::create();

+ if (document->settings())

+ settings->setMemoryInfoEnabled(document->settings()->memoryInfoEnabled());

kinuko 2014/03/04 04:34:35 Could we have these settings-to-settings copy meth

Pan 2014/03/06 08:50:56 right, thanks！ Done.

+ OwnPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::create(scriptURL, userAgent, sourceCode, startMode, document->contentSecurityPolicy()->deprecatedHeader(), document->contentSecurityPolicy()->deprecatedHeaderType(), m_workerClients.release(), settings.release());

double originTime = document->loader() ? document->loader()->timing()->referenceMonotonicTime() : monotonicallyIncreasingTime();

RefPtr<DedicatedWorkerThread> thread = DedicatedWorkerThread::create(*this, *m_workerObjectProxy.get(), originTime, startupData.release());

« Source/core/workers/WorkerGlobalScope.h ('K') | « Source/core/workers/WorkerGlobalScope.cpp ('k') | Source/core/workers/WorkerSettings.h » ('j') | Source/core/workers/WorkerSettings.h » ('J')