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 27 matching lines...) Expand all Loading... |
38 #include "core/page/DOMWindow.h" | 38 #include "core/page/DOMWindow.h" |
39 #include "core/workers/SharedWorkerThread.h" | 39 #include "core/workers/SharedWorkerThread.h" |
40 #include "core/workers/WorkerClients.h" | 40 #include "core/workers/WorkerClients.h" |
41 #include "core/workers/WorkerThreadStartupData.h" | 41 #include "core/workers/WorkerThreadStartupData.h" |
42 #include "wtf/CurrentTime.h" | 42 #include "wtf/CurrentTime.h" |
43 | 43 |
44 namespace WebCore { | 44 namespace WebCore { |
45 | 45 |
46 PassRefPtr<MessageEvent> createConnectEvent(PassRefPtr<MessagePort> port) | 46 PassRefPtr<MessageEvent> createConnectEvent(PassRefPtr<MessagePort> port) |
47 { | 47 { |
48 RefPtr<MessageEvent> event = MessageEvent::create(adoptPtr(new MessagePortAr
ray(1, port))); | 48 RefPtr<MessagePort> sourcePort = port; |
| 49 RefPtr<MessageEvent> event = MessageEvent::create(adoptPtr(new MessagePortAr
ray(1, sourcePort)), sourcePort); |
49 event->initEvent(eventNames().connectEvent, false, false); | 50 event->initEvent(eventNames().connectEvent, false, false); |
50 return event.release(); | 51 return event.release(); |
51 } | 52 } |
52 | 53 |
53 // static | 54 // static |
54 PassRefPtr<SharedWorkerGlobalScope> SharedWorkerGlobalScope::create(const String
& name, SharedWorkerThread* thread, PassOwnPtr<WorkerThreadStartupData> startupD
ata) | 55 PassRefPtr<SharedWorkerGlobalScope> SharedWorkerGlobalScope::create(const String
& name, SharedWorkerThread* thread, PassOwnPtr<WorkerThreadStartupData> startupD
ata) |
55 { | 56 { |
56 RefPtr<SharedWorkerGlobalScope> context = adoptRef(new SharedWorkerGlobalSco
pe(name, startupData->m_scriptURL, startupData->m_userAgent, thread, startupData
->m_workerClients.release())); | 57 RefPtr<SharedWorkerGlobalScope> context = adoptRef(new SharedWorkerGlobalSco
pe(name, startupData->m_scriptURL, startupData->m_userAgent, thread, startupData
->m_workerClients.release())); |
57 context->applyContentSecurityPolicyFromString(startupData->m_contentSecurity
Policy, startupData->m_contentSecurityPolicyType); | 58 context->applyContentSecurityPolicyFromString(startupData->m_contentSecurity
Policy, startupData->m_contentSecurityPolicyType); |
58 return context.release(); | 59 return context.release(); |
(...skipping 20 matching lines...) Expand all Loading... |
79 return static_cast<SharedWorkerThread*>(Base::thread()); | 80 return static_cast<SharedWorkerThread*>(Base::thread()); |
80 } | 81 } |
81 | 82 |
82 void SharedWorkerGlobalScope::logExceptionToConsole(const String& errorMessage,
const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCall
Stack> callStack) | 83 void SharedWorkerGlobalScope::logExceptionToConsole(const String& errorMessage,
const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCall
Stack> callStack) |
83 { | 84 { |
84 WorkerGlobalScope::logExceptionToConsole(errorMessage, sourceURL, lineNumber
, columnNumber, callStack); | 85 WorkerGlobalScope::logExceptionToConsole(errorMessage, sourceURL, lineNumber
, columnNumber, callStack); |
85 addMessageToWorkerConsole(JSMessageSource, ErrorMessageLevel, errorMessage,
sourceURL, lineNumber, callStack); | 86 addMessageToWorkerConsole(JSMessageSource, ErrorMessageLevel, errorMessage,
sourceURL, lineNumber, callStack); |
86 } | 87 } |
87 | 88 |
88 } // namespace WebCore | 89 } // namespace WebCore |
OLD | NEW |