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

Side by Side Diff: Source/core/workers/DedicatedWorkerGlobalScope.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, 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 25 matching lines...) Expand all
36 #include "core/frame/DOMWindow.h" 36 #include "core/frame/DOMWindow.h"
37 #include "core/workers/DedicatedWorkerThread.h" 37 #include "core/workers/DedicatedWorkerThread.h"
38 #include "core/workers/WorkerClients.h" 38 #include "core/workers/WorkerClients.h"
39 #include "core/workers/WorkerObjectProxy.h" 39 #include "core/workers/WorkerObjectProxy.h"
40 #include "core/workers/WorkerThreadStartupData.h" 40 #include "core/workers/WorkerThreadStartupData.h"
41 41
42 namespace WebCore { 42 namespace WebCore {
43 43
44 PassRefPtr<DedicatedWorkerGlobalScope> DedicatedWorkerGlobalScope::create(Dedica tedWorkerThread* thread, PassOwnPtr<WorkerThreadStartupData> startupData, double timeOrigin) 44 PassRefPtr<DedicatedWorkerGlobalScope> DedicatedWorkerGlobalScope::create(Dedica tedWorkerThread* thread, PassOwnPtr<WorkerThreadStartupData> startupData, double timeOrigin)
45 { 45 {
46 RefPtr<DedicatedWorkerGlobalScope> context = adoptRef(new DedicatedWorkerGlo balScope(startupData->m_scriptURL, startupData->m_userAgent, thread, timeOrigin, startupData->m_workerClients.release())); 46 RefPtr<DedicatedWorkerGlobalScope> context = adoptRef(new DedicatedWorkerGlo balScope(startupData->m_scriptURL, startupData->m_userAgent, thread, timeOrigin, startupData->m_workerClients.release(), startupData->m_workerSettings.release() ));
47 context->applyContentSecurityPolicyFromString(startupData->m_contentSecurity Policy, startupData->m_contentSecurityPolicyType); 47 context->applyContentSecurityPolicyFromString(startupData->m_contentSecurity Policy, startupData->m_contentSecurityPolicyType);
48 return context.release(); 48 return context.release();
49 } 49 }
50 50
51 DedicatedWorkerGlobalScope::DedicatedWorkerGlobalScope(const KURL& url, const St ring& userAgent, DedicatedWorkerThread* thread, double timeOrigin, PassOwnPtr<Wo rkerClients> workerClients) 51 DedicatedWorkerGlobalScope::DedicatedWorkerGlobalScope(const KURL& url, const St ring& userAgent, DedicatedWorkerThread* thread, double timeOrigin, PassOwnPtr<Wo rkerClients> workerClients, PassOwnPtr<WorkerSettings> settings)
52 : WorkerGlobalScope(url, userAgent, thread, timeOrigin, workerClients) 52 : WorkerGlobalScope(url, userAgent, thread, timeOrigin, workerClients, setti ngs)
53 { 53 {
54 ScriptWrappable::init(this); 54 ScriptWrappable::init(this);
55 } 55 }
56 56
57 DedicatedWorkerGlobalScope::~DedicatedWorkerGlobalScope() 57 DedicatedWorkerGlobalScope::~DedicatedWorkerGlobalScope()
58 { 58 {
59 } 59 }
60 60
61 const AtomicString& DedicatedWorkerGlobalScope::interfaceName() const 61 const AtomicString& DedicatedWorkerGlobalScope::interfaceName() const
62 { 62 {
(...skipping 14 matching lines...) Expand all
77 Base::importScripts(urls, exceptionState); 77 Base::importScripts(urls, exceptionState);
78 thread()->workerObjectProxy().reportPendingActivity(hasPendingActivity()); 78 thread()->workerObjectProxy().reportPendingActivity(hasPendingActivity());
79 } 79 }
80 80
81 DedicatedWorkerThread* DedicatedWorkerGlobalScope::thread() 81 DedicatedWorkerThread* DedicatedWorkerGlobalScope::thread()
82 { 82 {
83 return static_cast<DedicatedWorkerThread*>(Base::thread()); 83 return static_cast<DedicatedWorkerThread*>(Base::thread());
84 } 84 }
85 85
86 } // namespace WebCore 86 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698