| Index: Source/modules/background_sync/SyncRegistration.cpp
|
| diff --git a/Source/modules/push_messaging/PushSubscription.cpp b/Source/modules/background_sync/SyncRegistration.cpp
|
| similarity index 32%
|
| copy from Source/modules/push_messaging/PushSubscription.cpp
|
| copy to Source/modules/background_sync/SyncRegistration.cpp
|
| index 1f020633285fbc96a8ff867444cf357d206d3eb9..a2904df48ce5a2521720640ad6c4f5c9fe388859 100644
|
| --- a/Source/modules/push_messaging/PushSubscription.cpp
|
| +++ b/Source/modules/background_sync/SyncRegistration.cpp
|
| @@ -1,58 +1,62 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| +// Copyright 2015 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| #include "config.h"
|
| -#include "modules/push_messaging/PushSubscription.h"
|
| +#include "modules/background_sync/SyncRegistration.h"
|
|
|
| #include "bindings/core/v8/CallbackPromiseAdapter.h"
|
| #include "bindings/core/v8/ScriptPromiseResolver.h"
|
| -#include "modules/push_messaging/PushError.h"
|
| +#include "modules/background_sync/SyncError.h"
|
| +#include "modules/background_sync/SyncRegistrationCallbacks.h"
|
| +#include "modules/background_sync/SyncRegistrationOptions.h"
|
| #include "modules/serviceworkers/ServiceWorkerRegistration.h"
|
| #include "public/platform/Platform.h"
|
| -#include "public/platform/modules/push_messaging/WebPushProvider.h"
|
| -#include "public/platform/modules/push_messaging/WebPushSubscription.h"
|
| +#include "public/platform/modules/background_sync/WebSyncProvider.h"
|
| +#include "public/platform/modules/background_sync/WebSyncRegistration.h"
|
| #include "wtf/OwnPtr.h"
|
|
|
| namespace blink {
|
|
|
| -PushSubscription* PushSubscription::take(ScriptPromiseResolver*, WebPushSubscription* pushSubscription, ServiceWorkerRegistration* serviceWorkerRegistration)
|
| +SyncRegistration* SyncRegistration::take(ScriptPromiseResolver*, WebSyncRegistration* syncRegistration, ServiceWorkerRegistration* serviceWorkerRegistration)
|
| {
|
| - OwnPtr<WebPushSubscription> subscription = adoptPtr(pushSubscription);
|
| - return new PushSubscription(subscription->endpoint, subscription->subscriptionId, serviceWorkerRegistration);
|
| + OwnPtr<WebSyncRegistration> registration = adoptPtr(syncRegistration);
|
| + return new SyncRegistration(registration->id, SyncRegistrationOptions(), serviceWorkerRegistration);
|
| }
|
|
|
| -void PushSubscription::dispose(WebPushSubscription* pushSubscription)
|
| +void SyncRegistration::dispose(WebSyncRegistration* syncRegistration)
|
| {
|
| - if (pushSubscription)
|
| - delete pushSubscription;
|
| + if (syncRegistration)
|
| + delete syncRegistration;
|
| }
|
|
|
| -PushSubscription::PushSubscription(const String& endpoint, const String& subscriptionId, ServiceWorkerRegistration* serviceWorkerRegistration)
|
| - : m_endpoint(endpoint)
|
| - , m_subscriptionId(subscriptionId)
|
| +SyncRegistration::SyncRegistration(const String& registrationId, const SyncRegistrationOptions& options, ServiceWorkerRegistration* serviceWorkerRegistration)
|
| + : m_registrationId(registrationId)
|
| + , m_syncRegistrationOptions(options)
|
| , m_serviceWorkerRegistration(serviceWorkerRegistration)
|
| {
|
| }
|
|
|
| -PushSubscription::~PushSubscription()
|
| +SyncRegistration::~SyncRegistration()
|
| {
|
| }
|
|
|
| -ScriptPromise PushSubscription::unsubscribe(ScriptState* scriptState)
|
| +ScriptPromise SyncRegistration::unregister(ScriptState* scriptState)
|
| {
|
| RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
|
| ScriptPromise promise = resolver->promise();
|
|
|
| - WebPushProvider* webPushProvider = Platform::current()->pushProvider();
|
| - ASSERT(webPushProvider);
|
| + WebSyncProvider* webSyncProvider = Platform::current()->backgroundSyncProvider();
|
| + ASSERT(webSyncProvider);
|
| +
|
| + webSyncProvider->unregisterBackgroundSync(m_registrationId, new SyncUnregistrationCallbacks(resolver, m_serviceWorkerRegistration));
|
|
|
| - webPushProvider->unregister(m_serviceWorkerRegistration->webRegistration(), new CallbackPromiseAdapter<bool, PushError>(resolver));
|
| return promise;
|
| }
|
|
|
| -DEFINE_TRACE(PushSubscription)
|
| +void SyncRegistration::trace(Visitor* visitor)
|
| {
|
| + visitor->trace(m_syncRegistrationOptions);
|
| visitor->trace(m_serviceWorkerRegistration);
|
| }
|
|
|
|
|