| 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/CallbackPromiseAdapter.h" | 8 #include "bindings/core/v8/CallbackPromiseAdapter.h" |
| 9 #include "bindings/core/v8/ExceptionState.h" | 9 #include "bindings/core/v8/ExceptionState.h" |
| 10 #include "bindings/core/v8/ScriptPromiseResolver.h" | 10 #include "bindings/core/v8/ScriptPromiseResolver.h" |
| 11 #include "bindings/core/v8/SerializedScriptValue.h" | 11 #include "bindings/core/v8/SerializedScriptValue.h" |
| 12 #include "core/page/WindowFocusAllowedIndicator.h" | |
| 13 #include "modules/serviceworkers/ServiceWorkerError.h" | 12 #include "modules/serviceworkers/ServiceWorkerError.h" |
| 14 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" | 13 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" |
| 15 #include "public/platform/WebString.h" | 14 #include "public/platform/WebString.h" |
| 16 #include "wtf/RefPtr.h" | 15 #include "wtf/RefPtr.h" |
| 17 | 16 |
| 18 namespace blink { | 17 namespace blink { |
| 19 | 18 |
| 20 ServiceWorkerClient* ServiceWorkerClient::create(const WebServiceWorkerClientInf
o& info) | 19 ServiceWorkerClient* ServiceWorkerClient::create(const WebServiceWorkerClientInf
o& info) |
| 21 { | 20 { |
| 22 return new ServiceWorkerClient(info); | 21 return new ServiceWorkerClient(info); |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 WebString messageString = message->toWireString(); | 66 WebString messageString = message->toWireString(); |
| 68 OwnPtr<WebMessagePortChannelArray> webChannels = MessagePort::toWebMessagePo
rtChannelArray(channels.release()); | 67 OwnPtr<WebMessagePortChannelArray> webChannels = MessagePort::toWebMessagePo
rtChannelArray(channels.release()); |
| 69 ServiceWorkerGlobalScopeClient::from(context)->postMessageToClient(m_id, mes
sageString, webChannels.release()); | 68 ServiceWorkerGlobalScopeClient::from(context)->postMessageToClient(m_id, mes
sageString, webChannels.release()); |
| 70 } | 69 } |
| 71 | 70 |
| 72 ScriptPromise ServiceWorkerClient::focus(ScriptState* scriptState) | 71 ScriptPromise ServiceWorkerClient::focus(ScriptState* scriptState) |
| 73 { | 72 { |
| 74 RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scrip
tState); | 73 RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scrip
tState); |
| 75 ScriptPromise promise = resolver->promise(); | 74 ScriptPromise promise = resolver->promise(); |
| 76 | 75 |
| 77 if (!scriptState->executionContext()->isWindowFocusAllowed()) { | 76 // FIXME: there should be a check for whether the caller is allowed to focus |
| 78 resolver->resolve(false); | 77 // the client. The promise should succeed with |false| if the call is not |
| 79 return promise; | 78 // allowed. https://crbug.com/437149 |
| 80 } | |
| 81 scriptState->executionContext()->consumeWindowFocus(); | |
| 82 | 79 |
| 83 ServiceWorkerGlobalScopeClient::from(scriptState->executionContext())->focus
(m_id, new CallbackPromiseAdapter<bool, ServiceWorkerError>(resolver)); | 80 ServiceWorkerGlobalScopeClient::from(scriptState->executionContext())->focus
(m_id, new CallbackPromiseAdapter<bool, ServiceWorkerError>(resolver)); |
| 84 return promise; | 81 return promise; |
| 85 } | 82 } |
| 86 | 83 |
| 87 } // namespace blink | 84 } // namespace blink |
| OLD | NEW |