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

Side by Side Diff: Source/modules/push_messaging/PushSubscription.cpp

Issue 1237673002: Introduce the PushSubscription.curve25519dh attribute (3/3) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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/push_messaging/PushSubscription.h" 6 #include "modules/push_messaging/PushSubscription.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 "bindings/core/v8/V8ObjectBuilder.h" 10 #include "bindings/core/v8/V8ObjectBuilder.h"
11 #include "modules/push_messaging/PushError.h" 11 #include "modules/push_messaging/PushError.h"
12 #include "modules/serviceworkers/ServiceWorkerRegistration.h" 12 #include "modules/serviceworkers/ServiceWorkerRegistration.h"
13 #include "public/platform/Platform.h" 13 #include "public/platform/Platform.h"
14 #include "public/platform/modules/push_messaging/WebPushProvider.h" 14 #include "public/platform/modules/push_messaging/WebPushProvider.h"
15 #include "public/platform/modules/push_messaging/WebPushSubscription.h" 15 #include "public/platform/modules/push_messaging/WebPushSubscription.h"
16 #include "wtf/OwnPtr.h" 16 #include "wtf/OwnPtr.h"
17 17
18 namespace blink { 18 namespace blink {
19 19
20 PushSubscription* PushSubscription::take(ScriptPromiseResolver*, WebPushSubscrip tion* pushSubscription, ServiceWorkerRegistration* serviceWorkerRegistration) 20 PushSubscription* PushSubscription::take(ScriptPromiseResolver*, WebPushSubscrip tion* pushSubscription, ServiceWorkerRegistration* serviceWorkerRegistration)
21 { 21 {
22 OwnPtr<WebPushSubscription> subscription = adoptPtr(pushSubscription); 22 OwnPtr<WebPushSubscription> subscription = adoptPtr(pushSubscription);
23 return new PushSubscription(subscription->endpoint, serviceWorkerRegistratio n); 23 return new PushSubscription(*subscription, serviceWorkerRegistration);
24 } 24 }
25 25
26 void PushSubscription::dispose(WebPushSubscription* pushSubscription) 26 void PushSubscription::dispose(WebPushSubscription* pushSubscription)
27 { 27 {
28 if (pushSubscription) 28 if (pushSubscription)
29 delete pushSubscription; 29 delete pushSubscription;
30 } 30 }
31 31
32 PushSubscription::PushSubscription(const KURL& endpoint, ServiceWorkerRegistrati on* serviceWorkerRegistration) 32 PushSubscription::PushSubscription(const WebPushSubscription& subscription, Serv iceWorkerRegistration* serviceWorkerRegistration)
33 : m_endpoint(endpoint) 33 : m_endpoint(subscription.endpoint)
34 , m_curve25519dh(DOMArrayBuffer::create(subscription.curve25519dh.data(), su bscription.curve25519dh.size()))
34 , m_serviceWorkerRegistration(serviceWorkerRegistration) 35 , m_serviceWorkerRegistration(serviceWorkerRegistration)
35 { 36 {
36 } 37 }
37 38
38 PushSubscription::~PushSubscription() 39 PushSubscription::~PushSubscription()
39 { 40 {
40 } 41 }
41 42
42 KURL PushSubscription::endpoint() const 43 KURL PushSubscription::endpoint() const
43 { 44 {
44 return m_endpoint; 45 return m_endpoint;
45 } 46 }
46 47
48 PassRefPtr<DOMArrayBuffer> PushSubscription::curve25519dh() const
49 {
50 return m_curve25519dh;
51 }
52
47 ScriptPromise PushSubscription::unsubscribe(ScriptState* scriptState) 53 ScriptPromise PushSubscription::unsubscribe(ScriptState* scriptState)
48 { 54 {
49 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver:: create(scriptState); 55 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver:: create(scriptState);
50 ScriptPromise promise = resolver->promise(); 56 ScriptPromise promise = resolver->promise();
51 57
52 WebPushProvider* webPushProvider = Platform::current()->pushProvider(); 58 WebPushProvider* webPushProvider = Platform::current()->pushProvider();
53 ASSERT(webPushProvider); 59 ASSERT(webPushProvider);
54 60
55 webPushProvider->unsubscribe(m_serviceWorkerRegistration->webRegistration(), new CallbackPromiseAdapter<bool, PushError>(resolver)); 61 webPushProvider->unsubscribe(m_serviceWorkerRegistration->webRegistration(), new CallbackPromiseAdapter<bool, PushError>(resolver));
56 return promise; 62 return promise;
57 } 63 }
58 64
59 ScriptValue PushSubscription::toJSONForBinding(ScriptState* scriptState) 65 ScriptValue PushSubscription::toJSONForBinding(ScriptState* scriptState)
60 { 66 {
61 V8ObjectBuilder result(scriptState); 67 V8ObjectBuilder result(scriptState);
62 result.addString("endpoint", endpoint()); 68 result.addString("endpoint", endpoint());
63 69
70 // TODO(peter): Include |curve25519dh| in the serialized JSON blob if the in tended
71 // serialization behavior gets defined in the spec.
72
64 return result.scriptValue(); 73 return result.scriptValue();
65 } 74 }
66 75
67 DEFINE_TRACE(PushSubscription) 76 DEFINE_TRACE(PushSubscription)
68 { 77 {
69 visitor->trace(m_serviceWorkerRegistration); 78 visitor->trace(m_serviceWorkerRegistration);
70 } 79 }
71 80
72 } // namespace blink 81 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698