OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 #include "modules/serviceworkers/ServiceWorkerClient.h" | 6 #include "modules/serviceworkers/ServiceWorkerClient.h" |
7 | 7 |
8 #include "bindings/core/v8/ExceptionState.h" | 8 #include "bindings/core/v8/ExceptionState.h" |
9 #include "bindings/core/v8/SerializedScriptValue.h" | 9 #include "bindings/core/v8/SerializedScriptValue.h" |
10 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" | 10 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" |
11 #include "public/platform/WebString.h" | 11 #include "public/platform/WebString.h" |
12 #include "wtf/RefPtr.h" | 12 #include "wtf/RefPtr.h" |
13 | 13 |
14 namespace blink { | 14 namespace blink { |
15 | 15 |
16 PassRefPtrWillBeRawPtr<ServiceWorkerClient> ServiceWorkerClient::create(unsigned id) | 16 ServiceWorkerClient* ServiceWorkerClient::create(unsigned id) |
dominicc (has gone to gerrit)
2014/08/26 14:01:34
Same with this one.
| |
17 { | 17 { |
18 return adoptRefWillBeNoop(new ServiceWorkerClient(id)); | 18 return new ServiceWorkerClient(id); |
19 } | 19 } |
20 | 20 |
21 ServiceWorkerClient::ServiceWorkerClient(unsigned id) | 21 ServiceWorkerClient::ServiceWorkerClient(unsigned id) |
22 : m_id(id) | 22 : m_id(id) |
23 { | 23 { |
24 ScriptWrappable::init(this); | 24 ScriptWrappable::init(this); |
25 } | 25 } |
26 | 26 |
27 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(ServiceWorkerClient); | |
28 | |
29 void ServiceWorkerClient::postMessage(ExecutionContext* context, PassRefPtr<Seri alizedScriptValue> message, const MessagePortArray* ports, ExceptionState& excep tionState) | 27 void ServiceWorkerClient::postMessage(ExecutionContext* context, PassRefPtr<Seri alizedScriptValue> message, const MessagePortArray* ports, ExceptionState& excep tionState) |
30 { | 28 { |
31 // Disentangle the port in preparation for sending it to the remote context. | 29 // Disentangle the port in preparation for sending it to the remote context. |
32 OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(por ts, exceptionState); | 30 OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(por ts, exceptionState); |
33 if (exceptionState.hadException()) | 31 if (exceptionState.hadException()) |
34 return; | 32 return; |
35 | 33 |
36 WebString messageString = message->toWireString(); | 34 WebString messageString = message->toWireString(); |
37 OwnPtr<WebMessagePortChannelArray> webChannels = MessagePort::toWebMessagePo rtChannelArray(channels.release()); | 35 OwnPtr<WebMessagePortChannelArray> webChannels = MessagePort::toWebMessagePo rtChannelArray(channels.release()); |
38 ServiceWorkerGlobalScopeClient::from(context)->postMessageToClient(m_id, mes sageString, webChannels.release()); | 36 ServiceWorkerGlobalScopeClient::from(context)->postMessageToClient(m_id, mes sageString, webChannels.release()); |
39 } | 37 } |
40 | 38 |
41 } // namespace blink | 39 } // namespace blink |
OLD | NEW |