Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Side by Side Diff: Source/modules/serviceworkers/ServiceWorkerClient.cpp

Issue 777483004: Bind Window focus ability to the ExecutionContext instead of the process. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@sw_client_focus
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
12 #include "modules/serviceworkers/ServiceWorkerError.h" 13 #include "modules/serviceworkers/ServiceWorkerError.h"
13 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" 14 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h"
14 #include "public/platform/WebString.h" 15 #include "public/platform/WebString.h"
15 #include "wtf/RefPtr.h" 16 #include "wtf/RefPtr.h"
16 17
17 namespace blink { 18 namespace blink {
18 19
19 ServiceWorkerClient* ServiceWorkerClient::create(unsigned id) 20 ServiceWorkerClient* ServiceWorkerClient::create(unsigned id)
20 { 21 {
21 return new ServiceWorkerClient(id); 22 return new ServiceWorkerClient(id);
(...skipping 14 matching lines...) Expand all
36 WebString messageString = message->toWireString(); 37 WebString messageString = message->toWireString();
37 OwnPtr<WebMessagePortChannelArray> webChannels = MessagePort::toWebMessagePo rtChannelArray(channels.release()); 38 OwnPtr<WebMessagePortChannelArray> webChannels = MessagePort::toWebMessagePo rtChannelArray(channels.release());
38 ServiceWorkerGlobalScopeClient::from(context)->postMessageToClient(m_id, mes sageString, webChannels.release()); 39 ServiceWorkerGlobalScopeClient::from(context)->postMessageToClient(m_id, mes sageString, webChannels.release());
39 } 40 }
40 41
41 ScriptPromise ServiceWorkerClient::focus(ScriptState* scriptState) 42 ScriptPromise ServiceWorkerClient::focus(ScriptState* scriptState)
42 { 43 {
43 RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scrip tState); 44 RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scrip tState);
44 ScriptPromise promise = resolver->promise(); 45 ScriptPromise promise = resolver->promise();
45 46
46 // FIXME: there should be a check for whether the caller is allowed to focus 47 if (!scriptState->executionContext()->isWindowFocusAllowed()) {
47 // the client. The promise should succeed with |false| if the call is not 48 resolver->resolve(false);
48 // allowed. https://crbug.com/437149 49 return promise;
50 }
51 scriptState->executionContext()->consumeWindowFocus();
49 52
50 ServiceWorkerGlobalScopeClient::from(scriptState->executionContext())->focus (m_id, new CallbackPromiseAdapter<bool, ServiceWorkerError>(resolver)); 53 ServiceWorkerGlobalScopeClient::from(scriptState->executionContext())->focus (m_id, new CallbackPromiseAdapter<bool, ServiceWorkerError>(resolver));
51 return promise; 54 return promise;
52 } 55 }
53 56
54 } // namespace blink 57 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698