OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 16 matching lines...) Expand all Loading... |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "modules/serviceworkers/ServiceWorker.h" | 31 #include "modules/serviceworkers/ServiceWorker.h" |
32 | 32 |
33 #include <memory> | 33 #include <memory> |
34 #include "bindings/core/v8/ExceptionState.h" | 34 #include "bindings/core/v8/ExceptionState.h" |
35 #include "bindings/core/v8/ScriptState.h" | 35 #include "bindings/core/v8/ScriptState.h" |
36 #include "core/dom/ExceptionCode.h" | 36 #include "core/dom/ExceptionCode.h" |
| 37 #include "core/dom/ExecutionContext.h" |
37 #include "core/dom/MessagePort.h" | 38 #include "core/dom/MessagePort.h" |
38 #include "core/events/Event.h" | 39 #include "core/events/Event.h" |
39 #include "modules/EventTargetModules.h" | 40 #include "modules/EventTargetModules.h" |
40 #include "modules/serviceworkers/ServiceWorkerContainerClient.h" | 41 #include "modules/serviceworkers/ServiceWorkerContainerClient.h" |
41 #include "public/platform/WebMessagePortChannel.h" | 42 #include "public/platform/WebMessagePortChannel.h" |
42 #include "public/platform/WebSecurityOrigin.h" | 43 #include "public/platform/WebSecurityOrigin.h" |
43 #include "public/platform/WebString.h" | 44 #include "public/platform/WebString.h" |
44 #include "public/platform/modules/serviceworker/WebServiceWorkerState.h" | 45 #include "public/platform/modules/serviceworker/WebServiceWorkerState.h" |
45 | 46 |
46 namespace blink { | 47 namespace blink { |
(...skipping 10 matching lines...) Expand all Loading... |
57 ServiceWorkerContainerClient::From(GetExecutionContext()); | 58 ServiceWorkerContainerClient::From(GetExecutionContext()); |
58 if (!client || !client->Provider()) { | 59 if (!client || !client->Provider()) { |
59 exception_state.ThrowDOMException( | 60 exception_state.ThrowDOMException( |
60 kInvalidStateError, | 61 kInvalidStateError, |
61 "Failed to post a message: No associated provider is available."); | 62 "Failed to post a message: No associated provider is available."); |
62 return; | 63 return; |
63 } | 64 } |
64 | 65 |
65 // Disentangle the port in preparation for sending it to the remote context. | 66 // Disentangle the port in preparation for sending it to the remote context. |
66 MessagePortChannelArray channels = MessagePort::DisentanglePorts( | 67 MessagePortChannelArray channels = MessagePort::DisentanglePorts( |
67 script_state->GetExecutionContext(), ports, exception_state); | 68 ExecutionContext::From(script_state), ports, exception_state); |
68 if (exception_state.HadException()) | 69 if (exception_state.HadException()) |
69 return; | 70 return; |
70 if (handle_->ServiceWorker()->GetState() == kWebServiceWorkerStateRedundant) { | 71 if (handle_->ServiceWorker()->GetState() == kWebServiceWorkerStateRedundant) { |
71 exception_state.ThrowDOMException(kInvalidStateError, | 72 exception_state.ThrowDOMException(kInvalidStateError, |
72 "ServiceWorker is in redundant state."); | 73 "ServiceWorker is in redundant state."); |
73 return; | 74 return; |
74 } | 75 } |
75 | 76 |
76 WebString message_string = message->ToWireString(); | 77 WebString message_string = message->ToWireString(); |
77 WebMessagePortChannelArray web_channels = | 78 WebMessagePortChannelArray web_channels = |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 handle_->ServiceWorker()->SetProxy(this); | 159 handle_->ServiceWorker()->SetProxy(this); |
159 } | 160 } |
160 | 161 |
161 ServiceWorker::~ServiceWorker() {} | 162 ServiceWorker::~ServiceWorker() {} |
162 | 163 |
163 DEFINE_TRACE(ServiceWorker) { | 164 DEFINE_TRACE(ServiceWorker) { |
164 AbstractWorker::Trace(visitor); | 165 AbstractWorker::Trace(visitor); |
165 } | 166 } |
166 | 167 |
167 } // namespace blink | 168 } // namespace blink |
OLD | NEW |