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

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

Issue 1414553002: Fix out-of-memory crashes related to ArrayBuffer allocation Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase+more tweaks Created 5 years, 1 month 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
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*, PassOwnPtr<WebP ushSubscription> pushSubscription, ServiceWorkerRegistration* serviceWorkerRegis tration) 20 PushSubscription* PushSubscription::take(ScriptPromiseResolver*, PassOwnPtr<WebP ushSubscription> pushSubscription, ServiceWorkerRegistration* serviceWorkerRegis tration)
21 { 21 {
22 if (!pushSubscription) 22 if (!pushSubscription)
23 return nullptr; 23 return nullptr;
24
24 return new PushSubscription(*pushSubscription, serviceWorkerRegistration); 25 return new PushSubscription(*pushSubscription, serviceWorkerRegistration);
25 } 26 }
26 27
27 void PushSubscription::dispose(WebPushSubscription* pushSubscription) 28 void PushSubscription::dispose(WebPushSubscription* pushSubscription)
28 { 29 {
29 if (pushSubscription) 30 if (pushSubscription)
30 delete pushSubscription; 31 delete pushSubscription;
31 } 32 }
32 33
33 PushSubscription::PushSubscription(const WebPushSubscription& subscription, Serv iceWorkerRegistration* serviceWorkerRegistration) 34 PushSubscription::PushSubscription(const WebPushSubscription& subscription, Serv iceWorkerRegistration* serviceWorkerRegistration)
34 : m_endpoint(subscription.endpoint) 35 : m_endpoint(subscription.endpoint)
35 , m_p256dh(DOMArrayBuffer::create(subscription.p256dh.data(), subscription.p 256dh.size())) 36 , m_p256dh(DOMArrayBuffer::deprecatedCreateOrCrash(subscription.p256dh.data( ), subscription.p256dh.size()))
36 , m_serviceWorkerRegistration(serviceWorkerRegistration) 37 , m_serviceWorkerRegistration(serviceWorkerRegistration)
37 { 38 {
38 } 39 }
39 40
40 PushSubscription::~PushSubscription() 41 PushSubscription::~PushSubscription()
41 { 42 {
42 } 43 }
43 44
44 KURL PushSubscription::endpoint() const 45 KURL PushSubscription::endpoint() const
45 { 46 {
(...skipping 30 matching lines...) Expand all
76 77
77 return result.scriptValue(); 78 return result.scriptValue();
78 } 79 }
79 80
80 DEFINE_TRACE(PushSubscription) 81 DEFINE_TRACE(PushSubscription)
81 { 82 {
82 visitor->trace(m_serviceWorkerRegistration); 83 visitor->trace(m_serviceWorkerRegistration);
83 } 84 }
84 85
85 } // namespace blink 86 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698