| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 | 44 |
| 45 PassRefPtr<MessageEvent> createConnectEvent(PassRefPtr<MessagePort> prpPort) | 45 PassRefPtr<MessageEvent> createConnectEvent(PassRefPtr<MessagePort> prpPort) |
| 46 { | 46 { |
| 47 RefPtr<MessagePort> port = prpPort; | 47 RefPtr<MessagePort> port = prpPort; |
| 48 RefPtr<MessageEvent> event = MessageEvent::create(adoptPtr(new MessagePortAr
ray(1, port)), String(), String(), port); | 48 RefPtr<MessageEvent> event = MessageEvent::create(adoptPtr(new MessagePortAr
ray(1, port)), String(), String(), port); |
| 49 event->initEvent(EventTypeNames::connect, false, false); | 49 event->initEvent(EventTypeNames::connect, false, false); |
| 50 return event.release(); | 50 return event.release(); |
| 51 } | 51 } |
| 52 | 52 |
| 53 // static | 53 // static |
| 54 PassRefPtr<SharedWorkerGlobalScope> SharedWorkerGlobalScope::create(const String
& name, SharedWorkerThread* thread, PassOwnPtr<WorkerThreadStartupData> startupD
ata) | 54 PassRefPtrWillBeRawPtr<SharedWorkerGlobalScope> SharedWorkerGlobalScope::create(
const String& name, SharedWorkerThread* thread, PassOwnPtr<WorkerThreadStartupDa
ta> startupData) |
| 55 { | 55 { |
| 56 RefPtr<SharedWorkerGlobalScope> context = adoptRef(new SharedWorkerGlobalSco
pe(name, startupData->m_scriptURL, startupData->m_userAgent, thread, startupData
->m_workerClients.release())); | 56 RefPtrWillBeRawPtr<SharedWorkerGlobalScope> context = adoptRefWillBeRefCount
edGarbageCollected(new SharedWorkerGlobalScope(name, startupData->m_scriptURL, s
tartupData->m_userAgent, thread, startupData->m_workerClients.release())); |
| 57 context->applyContentSecurityPolicyFromString(startupData->m_contentSecurity
Policy, startupData->m_contentSecurityPolicyType); | 57 context->applyContentSecurityPolicyFromString(startupData->m_contentSecurity
Policy, startupData->m_contentSecurityPolicyType); |
| 58 return context.release(); | 58 return context.release(); |
| 59 } | 59 } |
| 60 | 60 |
| 61 SharedWorkerGlobalScope::SharedWorkerGlobalScope(const String& name, const KURL&
url, const String& userAgent, SharedWorkerThread* thread, PassOwnPtr<WorkerClie
nts> workerClients) | 61 SharedWorkerGlobalScope::SharedWorkerGlobalScope(const String& name, const KURL&
url, const String& userAgent, SharedWorkerThread* thread, PassOwnPtr<WorkerClie
nts> workerClients) |
| 62 : WorkerGlobalScope(url, userAgent, thread, monotonicallyIncreasingTime(), w
orkerClients) | 62 : WorkerGlobalScope(url, userAgent, thread, monotonicallyIncreasingTime(), w
orkerClients) |
| 63 , m_name(name) | 63 , m_name(name) |
| 64 { | 64 { |
| 65 ScriptWrappable::init(this); | 65 ScriptWrappable::init(this); |
| 66 } | 66 } |
| (...skipping 11 matching lines...) Expand all Loading... |
| 78 { | 78 { |
| 79 return static_cast<SharedWorkerThread*>(Base::thread()); | 79 return static_cast<SharedWorkerThread*>(Base::thread()); |
| 80 } | 80 } |
| 81 | 81 |
| 82 void SharedWorkerGlobalScope::logExceptionToConsole(const String& errorMessage,
const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCall
Stack> callStack) | 82 void SharedWorkerGlobalScope::logExceptionToConsole(const String& errorMessage,
const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCall
Stack> callStack) |
| 83 { | 83 { |
| 84 WorkerGlobalScope::logExceptionToConsole(errorMessage, sourceURL, lineNumber
, columnNumber, callStack); | 84 WorkerGlobalScope::logExceptionToConsole(errorMessage, sourceURL, lineNumber
, columnNumber, callStack); |
| 85 addMessageToWorkerConsole(JSMessageSource, ErrorMessageLevel, errorMessage,
sourceURL, lineNumber, callStack, 0); | 85 addMessageToWorkerConsole(JSMessageSource, ErrorMessageLevel, errorMessage,
sourceURL, lineNumber, callStack, 0); |
| 86 } | 86 } |
| 87 | 87 |
| 88 void SharedWorkerGlobalScope::trace(Visitor* visitor) |
| 89 { |
| 90 WorkerGlobalScope::trace(visitor); |
| 91 } |
| 92 |
| 88 } // namespace WebCore | 93 } // namespace WebCore |
| OLD | NEW |