| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008, 2010 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008, 2010 Apple Inc. All Rights Reserved. |
| 3 * Copyright (C) 2009 Google Inc. All Rights Reserved. | 3 * Copyright (C) 2009 Google 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 | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| 11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
| 12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
| 13 * | 13 * |
| 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 * | 25 * |
| 26 */ | 26 */ |
| 27 | 27 |
| 28 #include "config.h" | 28 #include "config.h" |
| 29 | 29 |
| 30 #include "Worker.h" | 30 #include "core/workers/Worker.h" |
| 31 | 31 |
| 32 #include "InspectorInstrumentation.h" | 32 #include "InspectorInstrumentation.h" |
| 33 #include "WorkerContextProxy.h" | |
| 34 #include "WorkerScriptLoader.h" | |
| 35 #include "WorkerThread.h" | |
| 36 #include "core/dom/Document.h" | 33 #include "core/dom/Document.h" |
| 37 #include "core/dom/EventException.h" | 34 #include "core/dom/EventException.h" |
| 38 #include "core/dom/EventListener.h" | 35 #include "core/dom/EventListener.h" |
| 39 #include "core/dom/EventNames.h" | 36 #include "core/dom/EventNames.h" |
| 40 #include "core/dom/ExceptionCode.h" | 37 #include "core/dom/ExceptionCode.h" |
| 41 #include "core/dom/MessageEvent.h" | 38 #include "core/dom/MessageEvent.h" |
| 42 #include "core/loader/FrameLoader.h" | 39 #include "core/loader/FrameLoader.h" |
| 43 #include "core/loader/cache/CachedResourceLoader.h" | 40 #include "core/loader/cache/CachedResourceLoader.h" |
| 44 #include "core/page/DOMWindow.h" | 41 #include "core/page/DOMWindow.h" |
| 45 #include "core/page/Frame.h" | 42 #include "core/page/Frame.h" |
| 46 #include "core/page/UseCounter.h" | 43 #include "core/page/UseCounter.h" |
| 47 #include "core/platform/text/TextEncoding.h" | 44 #include "core/platform/text/TextEncoding.h" |
| 45 #include "core/workers/WorkerContextProxy.h" |
| 46 #include "core/workers/WorkerScriptLoader.h" |
| 47 #include "core/workers/WorkerThread.h" |
| 48 #include <wtf/MainThread.h> | 48 #include <wtf/MainThread.h> |
| 49 | 49 |
| 50 namespace WebCore { | 50 namespace WebCore { |
| 51 | 51 |
| 52 inline Worker::Worker(ScriptExecutionContext* context) | 52 inline Worker::Worker(ScriptExecutionContext* context) |
| 53 : AbstractWorker(context) | 53 : AbstractWorker(context) |
| 54 , m_contextProxy(WorkerContextProxy::create(this)) | 54 , m_contextProxy(WorkerContextProxy::create(this)) |
| 55 { | 55 { |
| 56 } | 56 } |
| 57 | 57 |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 startMode = PauseWorkerContextOnStart; | 142 startMode = PauseWorkerContextOnStart; |
| 143 m_contextProxy->startWorkerContext(m_scriptLoader->url(), scriptExecutio
nContext()->userAgent(m_scriptLoader->url()), m_scriptLoader->script(), startMod
e); | 143 m_contextProxy->startWorkerContext(m_scriptLoader->url(), scriptExecutio
nContext()->userAgent(m_scriptLoader->url()), m_scriptLoader->script(), startMod
e); |
| 144 InspectorInstrumentation::scriptImported(scriptExecutionContext(), m_scr
iptLoader->identifier(), m_scriptLoader->script()); | 144 InspectorInstrumentation::scriptImported(scriptExecutionContext(), m_scr
iptLoader->identifier(), m_scriptLoader->script()); |
| 145 } | 145 } |
| 146 m_scriptLoader = nullptr; | 146 m_scriptLoader = nullptr; |
| 147 | 147 |
| 148 unsetPendingActivity(this); | 148 unsetPendingActivity(this); |
| 149 } | 149 } |
| 150 | 150 |
| 151 } // namespace WebCore | 151 } // namespace WebCore |
| OLD | NEW |