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

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

Issue 1234603003: CallbackPromiseAdapter types should be more compatible with WebCallbacks (1/3). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: retry! Created 5 years, 4 months 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 | Annotate | Revision Log
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/ServiceWorkerWindowClient.h" 6 #include "modules/serviceworkers/ServiceWorkerWindowClient.h"
7 7
8 #include "bindings/core/v8/CallbackPromiseAdapter.h" 8 #include "bindings/core/v8/CallbackPromiseAdapter.h"
9 #include "bindings/core/v8/ScriptPromiseResolver.h" 9 #include "bindings/core/v8/ScriptPromiseResolver.h"
10 #include "core/dom/DOMException.h" 10 #include "core/dom/DOMException.h"
11 #include "core/dom/ExceptionCode.h" 11 #include "core/dom/ExceptionCode.h"
12 #include "core/page/PageVisibilityState.h" 12 #include "core/page/PageVisibilityState.h"
13 #include "core/workers/WorkerGlobalScope.h" 13 #include "core/workers/WorkerGlobalScope.h"
14 #include "core/workers/WorkerLocation.h" 14 #include "core/workers/WorkerLocation.h"
15 #include "modules/serviceworkers/ServiceWorkerError.h" 15 #include "modules/serviceworkers/ServiceWorkerError.h"
16 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" 16 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h"
17 #include "public/platform/WebString.h" 17 #include "public/platform/WebString.h"
18 #include "wtf/RefPtr.h" 18 #include "wtf/RefPtr.h"
19 19
20 namespace blink { 20 namespace blink {
21 21
22 ServiceWorkerWindowClient* ServiceWorkerWindowClient::take(ScriptPromiseResolver *, PassOwnPtr<ServiceWorkerWindowClient::WebType> webClient) 22 ServiceWorkerWindowClient* ServiceWorkerWindowClient::take(ScriptPromiseResolver *, PassOwnPtr<WebServiceWorkerClientInfo> webClient)
23 { 23 {
24 return webClient ? ServiceWorkerWindowClient::create(*webClient) : nullptr; 24 return webClient ? ServiceWorkerWindowClient::create(*webClient) : nullptr;
25 } 25 }
26 26
27 ServiceWorkerWindowClient* ServiceWorkerWindowClient::create(const WebServiceWor kerClientInfo& info) 27 ServiceWorkerWindowClient* ServiceWorkerWindowClient::create(const WebServiceWor kerClientInfo& info)
28 { 28 {
29 return new ServiceWorkerWindowClient(info); 29 return new ServiceWorkerWindowClient(info);
30 } 30 }
31 31
32 ServiceWorkerWindowClient::ServiceWorkerWindowClient(const WebServiceWorkerClien tInfo& info) 32 ServiceWorkerWindowClient::ServiceWorkerWindowClient(const WebServiceWorkerClien tInfo& info)
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 ServiceWorkerGlobalScopeClient::from(context)->navigate(uuid(), parsedUrl, n ew CallbackPromiseAdapter<ServiceWorkerWindowClient, ServiceWorkerError>(resolve r)); 79 ServiceWorkerGlobalScopeClient::from(context)->navigate(uuid(), parsedUrl, n ew CallbackPromiseAdapter<ServiceWorkerWindowClient, ServiceWorkerError>(resolve r));
80 return promise; 80 return promise;
81 } 81 }
82 82
83 DEFINE_TRACE(ServiceWorkerWindowClient) 83 DEFINE_TRACE(ServiceWorkerWindowClient)
84 { 84 {
85 ServiceWorkerClient::trace(visitor); 85 ServiceWorkerClient::trace(visitor);
86 } 86 }
87 87
88 } // namespace blink 88 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/serviceworkers/ServiceWorkerWindowClient.h ('k') | public/platform/WebCallbacks.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698