OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
3 * Copyright (C) 2010 Apple Inc. All rights reserved. | 3 * Copyright (C) 2010 Apple Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
7 * met: | 7 * met: |
8 * | 8 * |
9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 #include "core/loader/FrameLoader.h" | 42 #include "core/loader/FrameLoader.h" |
43 #include "core/loader/FrameLoaderClient.h" | 43 #include "core/loader/FrameLoaderClient.h" |
44 #include "core/workers/SharedWorkerRepositoryClient.h" | 44 #include "core/workers/SharedWorkerRepositoryClient.h" |
45 #include "platform/weborigin/KURL.h" | 45 #include "platform/weborigin/KURL.h" |
46 #include "platform/weborigin/SecurityOrigin.h" | 46 #include "platform/weborigin/SecurityOrigin.h" |
47 | 47 |
48 namespace blink { | 48 namespace blink { |
49 | 49 |
50 inline SharedWorker::SharedWorker(ExecutionContext* context) | 50 inline SharedWorker::SharedWorker(ExecutionContext* context) |
51 : AbstractWorker(context) | 51 : AbstractWorker(context) |
| 52 , ActiveScriptWrappable(this) |
52 , m_isBeingConnected(false) | 53 , m_isBeingConnected(false) |
53 { | 54 { |
54 } | 55 } |
55 | 56 |
56 SharedWorker* SharedWorker::create(ExecutionContext* context, const String& url,
const String& name, ExceptionState& exceptionState) | 57 SharedWorker* SharedWorker::create(ExecutionContext* context, const String& url,
const String& name, ExceptionState& exceptionState) |
57 { | 58 { |
58 ASSERT(isMainThread()); | 59 ASSERT(isMainThread()); |
59 ASSERT_WITH_SECURITY_IMPLICATION(context->isDocument()); | 60 ASSERT_WITH_SECURITY_IMPLICATION(context->isDocument()); |
60 | 61 |
61 UseCounter::count(context, UseCounter::SharedWorkerStart); | 62 UseCounter::count(context, UseCounter::SharedWorkerStart); |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 } | 102 } |
102 | 103 |
103 DEFINE_TRACE(SharedWorker) | 104 DEFINE_TRACE(SharedWorker) |
104 { | 105 { |
105 visitor->trace(m_port); | 106 visitor->trace(m_port); |
106 HeapSupplementable<SharedWorker>::trace(visitor); | 107 HeapSupplementable<SharedWorker>::trace(visitor); |
107 AbstractWorker::trace(visitor); | 108 AbstractWorker::trace(visitor); |
108 } | 109 } |
109 | 110 |
110 } // namespace blink | 111 } // namespace blink |
OLD | NEW |