OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008 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 |
(...skipping 11 matching lines...) Expand all Loading... |
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 "WorkerMessagingProxy.h" | 30 #include "WorkerMessagingProxy.h" |
31 | 31 |
32 #include "CrossThreadTask.h" | |
33 #include "DedicatedWorkerContext.h" | 32 #include "DedicatedWorkerContext.h" |
34 #include "DedicatedWorkerThread.h" | 33 #include "DedicatedWorkerThread.h" |
35 #include "Document.h" | |
36 #include "ErrorEvent.h" | |
37 #include "ExceptionCode.h" | |
38 #include "InspectorInstrumentation.h" | 34 #include "InspectorInstrumentation.h" |
39 #include "MessageEvent.h" | |
40 #include "ScriptCallStack.h" | 35 #include "ScriptCallStack.h" |
41 #include "ScriptExecutionContext.h" | |
42 #include "Worker.h" | 36 #include "Worker.h" |
43 #include "WorkerDebuggerAgent.h" | 37 #include "WorkerDebuggerAgent.h" |
44 #include "WorkerInspectorController.h" | 38 #include "WorkerInspectorController.h" |
| 39 #include "core/dom/CrossThreadTask.h" |
| 40 #include "core/dom/Document.h" |
| 41 #include "core/dom/ErrorEvent.h" |
| 42 #include "core/dom/ExceptionCode.h" |
| 43 #include "core/dom/MessageEvent.h" |
| 44 #include "core/dom/ScriptExecutionContext.h" |
45 #include "core/page/ContentSecurityPolicy.h" | 45 #include "core/page/ContentSecurityPolicy.h" |
46 #include "core/page/DOMWindow.h" | 46 #include "core/page/DOMWindow.h" |
47 #include "core/page/PageGroup.h" | 47 #include "core/page/PageGroup.h" |
48 #include "core/platform/NotImplemented.h" | 48 #include "core/platform/NotImplemented.h" |
49 #include <wtf/MainThread.h> | 49 #include <wtf/MainThread.h> |
50 | 50 |
51 namespace WebCore { | 51 namespace WebCore { |
52 | 52 |
53 class MessageWorkerContextTask : public ScriptExecutionContext::Task { | 53 class MessageWorkerContextTask : public ScriptExecutionContext::Task { |
54 public: | 54 public: |
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
467 | 467 |
468 m_workerThreadHadPendingActivity = hasPendingActivity; | 468 m_workerThreadHadPendingActivity = hasPendingActivity; |
469 } | 469 } |
470 | 470 |
471 bool WorkerMessagingProxy::hasPendingActivity() const | 471 bool WorkerMessagingProxy::hasPendingActivity() const |
472 { | 472 { |
473 return (m_unconfirmedMessageCount || m_workerThreadHadPendingActivity) && !m
_askedToTerminate; | 473 return (m_unconfirmedMessageCount || m_workerThreadHadPendingActivity) && !m
_askedToTerminate; |
474 } | 474 } |
475 | 475 |
476 } // namespace WebCore | 476 } // namespace WebCore |
OLD | NEW |