OLD | NEW |
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 20 matching lines...) Expand all Loading... |
31 #include "config.h" | 31 #include "config.h" |
32 | 32 |
33 #include "core/workers/DedicatedWorkerContext.h" | 33 #include "core/workers/DedicatedWorkerContext.h" |
34 | 34 |
35 #include "core/page/DOMWindow.h" | 35 #include "core/page/DOMWindow.h" |
36 #include "core/workers/DedicatedWorkerThread.h" | 36 #include "core/workers/DedicatedWorkerThread.h" |
37 #include "core/workers/WorkerObjectProxy.h" | 37 #include "core/workers/WorkerObjectProxy.h" |
38 | 38 |
39 namespace WebCore { | 39 namespace WebCore { |
40 | 40 |
41 PassRefPtr<DedicatedWorkerContext> DedicatedWorkerContext::create(const KURL& ur
l, const String& userAgent, PassOwnPtr<GroupSettings> settings, DedicatedWorkerT
hread* thread, const String& contentSecurityPolicy, ContentSecurityPolicy::Heade
rType contentSecurityPolicyType, PassRefPtr<SecurityOrigin> topOrigin) | 41 PassRefPtr<DedicatedWorkerContext> DedicatedWorkerContext::create(const KURL& ur
l, const String& userAgent, PassOwnPtr<GroupSettings> settings, DedicatedWorkerT
hread* thread, const String& contentSecurityPolicy, ContentSecurityPolicy::Heade
rType contentSecurityPolicyType, PassRefPtr<SecurityOrigin> topOrigin, double ti
meOrigin) |
42 { | 42 { |
43 RefPtr<DedicatedWorkerContext> context = adoptRef(new DedicatedWorkerContext
(url, userAgent, settings, thread, topOrigin)); | 43 RefPtr<DedicatedWorkerContext> context = adoptRef(new DedicatedWorkerContext
(url, userAgent, settings, thread, topOrigin, timeOrigin)); |
44 context->applyContentSecurityPolicyFromString(contentSecurityPolicy, content
SecurityPolicyType); | 44 context->applyContentSecurityPolicyFromString(contentSecurityPolicy, content
SecurityPolicyType); |
45 return context.release(); | 45 return context.release(); |
46 } | 46 } |
47 | 47 |
48 DedicatedWorkerContext::DedicatedWorkerContext(const KURL& url, const String& us
erAgent, PassOwnPtr<GroupSettings> settings, DedicatedWorkerThread* thread, Pass
RefPtr<SecurityOrigin> topOrigin) | 48 DedicatedWorkerContext::DedicatedWorkerContext(const KURL& url, const String& us
erAgent, PassOwnPtr<GroupSettings> settings, DedicatedWorkerThread* thread, Pass
RefPtr<SecurityOrigin> topOrigin, double timeOrigin) |
49 : WorkerContext(url, userAgent, settings, thread, topOrigin) | 49 : WorkerContext(url, userAgent, settings, thread, topOrigin, timeOrigin) |
50 { | 50 { |
51 ScriptWrappable::init(this); | 51 ScriptWrappable::init(this); |
52 } | 52 } |
53 | 53 |
54 DedicatedWorkerContext::~DedicatedWorkerContext() | 54 DedicatedWorkerContext::~DedicatedWorkerContext() |
55 { | 55 { |
56 } | 56 } |
57 | 57 |
58 const AtomicString& DedicatedWorkerContext::interfaceName() const | 58 const AtomicString& DedicatedWorkerContext::interfaceName() const |
59 { | 59 { |
(...skipping 14 matching lines...) Expand all Loading... |
74 Base::importScripts(urls, ec); | 74 Base::importScripts(urls, ec); |
75 thread()->workerObjectProxy().reportPendingActivity(hasPendingActivity()); | 75 thread()->workerObjectProxy().reportPendingActivity(hasPendingActivity()); |
76 } | 76 } |
77 | 77 |
78 DedicatedWorkerThread* DedicatedWorkerContext::thread() | 78 DedicatedWorkerThread* DedicatedWorkerContext::thread() |
79 { | 79 { |
80 return static_cast<DedicatedWorkerThread*>(Base::thread()); | 80 return static_cast<DedicatedWorkerThread*>(Base::thread()); |
81 } | 81 } |
82 | 82 |
83 } // namespace WebCore | 83 } // namespace WebCore |
OLD | NEW |