Push API: Implement and ship PushSubscription.options

third_party/WebKit/Source/modules/push_messaging/PushSubscription.cpp

 // Copyright 2014 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 "modules/push_messaging/PushSubscription.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/V8ObjectBuilder.h"
 #include "modules/push_messaging/PushError.h"
+#include "modules/push_messaging/PushSubscriptionOptions.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 "wtf/Assertions.h"
 #include "wtf/text/Base64.h"
 #include <memory>
 
 namespace blink {
 
 PushSubscription* PushSubscription::take(ScriptPromiseResolver*, std::unique_ptr<WebPushSubscription> pushSubscription, ServiceWorkerRegistration* serviceWorkerRegistration)
 {
     if (!pushSubscription)
         return nullptr;
     return new PushSubscription(*pushSubscription, serviceWorkerRegistration);
 }
 
 void PushSubscription::dispose(WebPushSubscription* pushSubscription)
 {
     if (pushSubscription)
         delete pushSubscription;
 }
 
 PushSubscription::PushSubscription(const WebPushSubscription& subscription, ServiceWorkerRegistration* serviceWorkerRegistration)
     : m_endpoint(subscription.endpoint)
+    , m_options(PushSubscriptionOptions::create(subscription.options))
     , m_p256dh(DOMArrayBuffer::create(subscription.p256dh.data(), subscription.p256dh.size()))
     , m_auth(DOMArrayBuffer::create(subscription.auth.data(), subscription.auth.size()))
     , m_serviceWorkerRegistration(serviceWorkerRegistration)
 {
 }
 
 PushSubscription::~PushSubscription()
 {
 }
 
-KURL PushSubscription::endpoint() const
-{
-    return m_endpoint;
-}
-
 DOMArrayBuffer* PushSubscription::getKey(const AtomicString& name) const
 {
     if (name == "p256dh")
         return m_p256dh;
     if (name == "auth")
         return m_auth;
 
     return nullptr;
 }
 
@@ skipping 19 matching lines @@
     V8ObjectBuilder keys(scriptState);
     keys.add("p256dh", WTF::base64URLEncode(static_cast<const char*>(m_p256dh->data()), m_p256dh->byteLength()));
     keys.add("auth", WTF::base64URLEncode(static_cast<const char*>(m_auth->data()), m_auth->byteLength()));
     result.add("keys", keys);
 
     return result.scriptValue();
 }
 
 DEFINE_TRACE(PushSubscription)
 {
+    visitor->trace(m_options);
     visitor->trace(m_p256dh);
     visitor->trace(m_auth);
     visitor->trace(m_serviceWorkerRegistration);
 }
 
 } // namespace blink