| Index: Source/core/workers/WorkerGlobalScope.h
|
| diff --git a/Source/core/workers/WorkerGlobalScope.h b/Source/core/workers/WorkerGlobalScope.h
|
| index 8bbc43e3c645db3b87f577eda5e21ac283e24f13..6d6b5ac152f6cbab96d98e8966ec865488f9c2ff 100644
|
| --- a/Source/core/workers/WorkerGlobalScope.h
|
| +++ b/Source/core/workers/WorkerGlobalScope.h
|
| @@ -135,13 +135,15 @@ namespace WebCore {
|
|
|
| double timeOrigin() const { return m_timeOrigin; }
|
|
|
| + bool memoryInfoEnabled() const { return m_memoryInfoEnabled; };
|
| +
|
| WorkerClients* clients() { return m_workerClients.get(); }
|
|
|
| using SecurityContext::securityOrigin;
|
| using SecurityContext::contentSecurityPolicy;
|
|
|
| protected:
|
| - WorkerGlobalScope(const KURL&, const String& userAgent, WorkerThread*, double timeOrigin, PassOwnPtr<WorkerClients>);
|
| + WorkerGlobalScope(const KURL&, const String& userAgent, WorkerThread*, double timeOrigin, bool memoryInfoEnabled, PassOwnPtr<WorkerClients>);
|
| void applyContentSecurityPolicyFromString(const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType);
|
|
|
| virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack>) OVERRIDE;
|
| @@ -181,6 +183,7 @@ namespace WebCore {
|
| OwnPtr<WorkerClients> m_workerClients;
|
|
|
| double m_timeOrigin;
|
| + bool m_memoryInfoEnabled;
|
| };
|
|
|
| DEFINE_TYPE_CASTS(WorkerGlobalScope, ExecutionContext, context, context->isWorkerGlobalScope(), context.isWorkerGlobalScope());
|
|
|