Implement and ship PushSubscription.expirationTime

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 <memory>
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/V8ObjectBuilder.h"
@@ skipping 28 matching lines @@
     : endpoint_(subscription.endpoint),
       options_(PushSubscriptionOptions::Create(subscription.options)),
       p256dh_(DOMArrayBuffer::Create(subscription.p256dh.Data(),
                                      subscription.p256dh.size())),
       auth_(DOMArrayBuffer::Create(subscription.auth.Data(),
                                    subscription.auth.size())),
       service_worker_registration_(service_worker_registration) {}
 
 PushSubscription::~PushSubscription() {}
 
+DOMTimeStamp PushSubscription::expirationTime(bool& is_null) const {

[jochen (gone - plz use gerrit), 2017/05/05 14:35:42]

why not bool*?

[Peter Beverloo, 2017/05/05 14:42:55]

WebKit was very much about references as opposed to pointers, so this is how I
implemented nullable values many many years ago. That seems to have survived the
various rewrites our bindings code has gone through over the years :).

+  // This attribute reflects the time at which the subscription will expire,
+  // which is not relevant to this implementation yet as subscription refreshes
+  // are not supported.
+  is_null = true;
+
+  return 0;
+}
+
 DOMArrayBuffer* PushSubscription::getKey(const AtomicString& name) const {
   if (name == "p256dh")
     return p256dh_;
   if (name == "auth")
     return auth_;
 
   return nullptr;
 }
 
 ScriptPromise PushSubscription::unsubscribe(ScriptState* script_state) {
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state);
   ScriptPromise promise = resolver->Promise();
 
   WebPushProvider* web_push_provider = Platform::Current()->PushProvider();
   DCHECK(web_push_provider);
 
   web_push_provider->Unsubscribe(
       service_worker_registration_->WebRegistration(),
       WTF::MakeUnique<CallbackPromiseAdapter<bool, PushError>>(resolver));
   return promise;
 }
 
 ScriptValue PushSubscription::toJSONForBinding(ScriptState* script_state) {
   DCHECK(p256dh_);
 
   V8ObjectBuilder result(script_state);
   result.AddString("endpoint", endpoint());
+  result.AddNull("expirationTime");
 
   V8ObjectBuilder keys(script_state);
   keys.Add("p256dh",
            WTF::Base64URLEncode(static_cast<const char*>(p256dh_->Data()),
                                 p256dh_->ByteLength()));
   keys.Add("auth", WTF::Base64URLEncode(static_cast<const char*>(auth_->Data()),
                                         auth_->ByteLength()));
   result.Add("keys", keys);
 
   return result.GetScriptValue();
 }
 
 DEFINE_TRACE(PushSubscription) {
   visitor->Trace(options_);
   visitor->Trace(p256dh_);
   visitor->Trace(auth_);
   visitor->Trace(service_worker_registration_);
 }
 
 }  // namespace blink