OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/push_messaging/PushSubscription.h" | 6 #include "modules/background_sync/SyncRegistration.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 "modules/push_messaging/PushError.h" | 10 #include "modules/background_sync/SyncError.h" |
| 11 #include "modules/background_sync/SyncRegistrationCallbacks.h" |
| 12 #include "modules/background_sync/SyncRegistrationOptions.h" |
11 #include "modules/serviceworkers/ServiceWorkerRegistration.h" | 13 #include "modules/serviceworkers/ServiceWorkerRegistration.h" |
12 #include "public/platform/Platform.h" | 14 #include "public/platform/Platform.h" |
13 #include "public/platform/modules/push_messaging/WebPushProvider.h" | 15 #include "public/platform/modules/background_sync/WebSyncProvider.h" |
14 #include "public/platform/modules/push_messaging/WebPushSubscription.h" | 16 #include "public/platform/modules/background_sync/WebSyncRegistration.h" |
15 #include "wtf/OwnPtr.h" | 17 #include "wtf/OwnPtr.h" |
16 | 18 |
17 namespace blink { | 19 namespace blink { |
18 | 20 |
19 PushSubscription* PushSubscription::take(ScriptPromiseResolver*, WebPushSubscrip
tion* pushSubscription, ServiceWorkerRegistration* serviceWorkerRegistration) | 21 SyncRegistration* SyncRegistration::take(ScriptPromiseResolver*, WebSyncRegistra
tion* syncRegistration, ServiceWorkerRegistration* serviceWorkerRegistration) |
20 { | 22 { |
21 OwnPtr<WebPushSubscription> subscription = adoptPtr(pushSubscription); | 23 OwnPtr<WebSyncRegistration> registration = adoptPtr(syncRegistration); |
22 return new PushSubscription(subscription->endpoint, subscription->subscripti
onId, serviceWorkerRegistration); | 24 return new SyncRegistration(registration->id, SyncRegistrationOptions(), ser
viceWorkerRegistration); |
23 } | 25 } |
24 | 26 |
25 void PushSubscription::dispose(WebPushSubscription* pushSubscription) | 27 void SyncRegistration::dispose(WebSyncRegistration* syncRegistration) |
26 { | 28 { |
27 if (pushSubscription) | 29 if (syncRegistration) |
28 delete pushSubscription; | 30 delete syncRegistration; |
29 } | 31 } |
30 | 32 |
31 PushSubscription::PushSubscription(const String& endpoint, const String& subscri
ptionId, ServiceWorkerRegistration* serviceWorkerRegistration) | 33 SyncRegistration::SyncRegistration(const String& registrationId, const SyncRegis
trationOptions& options, ServiceWorkerRegistration* serviceWorkerRegistration) |
32 : m_endpoint(endpoint) | 34 : m_registrationId(registrationId) |
33 , m_subscriptionId(subscriptionId) | 35 , m_syncRegistrationOptions(options) |
34 , m_serviceWorkerRegistration(serviceWorkerRegistration) | 36 , m_serviceWorkerRegistration(serviceWorkerRegistration) |
35 { | 37 { |
36 } | 38 } |
37 | 39 |
38 PushSubscription::~PushSubscription() | 40 SyncRegistration::~SyncRegistration() |
39 { | 41 { |
40 } | 42 } |
41 | 43 |
42 ScriptPromise PushSubscription::unsubscribe(ScriptState* scriptState) | 44 ScriptPromise SyncRegistration::unregister(ScriptState* scriptState) |
43 { | 45 { |
44 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::
create(scriptState); | 46 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::
create(scriptState); |
45 ScriptPromise promise = resolver->promise(); | 47 ScriptPromise promise = resolver->promise(); |
46 | 48 |
47 WebPushProvider* webPushProvider = Platform::current()->pushProvider(); | 49 WebSyncProvider* webSyncProvider = Platform::current()->backgroundSyncProvid
er(); |
48 ASSERT(webPushProvider); | 50 ASSERT(webSyncProvider); |
49 | 51 |
50 webPushProvider->unregister(m_serviceWorkerRegistration->webRegistration(),
new CallbackPromiseAdapter<bool, PushError>(resolver)); | 52 webSyncProvider->unregisterBackgroundSync(m_registrationId, new SyncUnregist
rationCallbacks(resolver, m_serviceWorkerRegistration)); |
| 53 |
51 return promise; | 54 return promise; |
52 } | 55 } |
53 | 56 |
54 DEFINE_TRACE(PushSubscription) | 57 void SyncRegistration::trace(Visitor* visitor) |
55 { | 58 { |
| 59 visitor->trace(m_syncRegistrationOptions); |
56 visitor->trace(m_serviceWorkerRegistration); | 60 visitor->trace(m_serviceWorkerRegistration); |
57 } | 61 } |
58 | 62 |
59 } // namespace blink | 63 } // namespace blink |
OLD | NEW |