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

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

Issue 1636483002: Update the PushEvent to have a nullable PushMessageData (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code review comments and include Created 4 years, 10 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
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 "modules/push_messaging/PushMessageData.h" 5 #include "modules/push_messaging/PushMessageData.h"
6 6
7 #include "bindings/core/v8/ExceptionState.h" 7 #include "bindings/core/v8/ExceptionState.h"
8 #include "bindings/core/v8/ScriptState.h" 8 #include "bindings/core/v8/ScriptState.h"
9 #include "bindings/core/v8/V8Binding.h" 9 #include "bindings/core/v8/V8Binding.h"
10 #include "bindings/modules/v8/UnionTypesModules.h" 10 #include "bindings/modules/v8/UnionTypesModules.h"
11 #include "core/dom/DOMArrayBuffer.h" 11 #include "core/dom/DOMArrayBuffer.h"
12 #include "core/fileapi/Blob.h" 12 #include "core/fileapi/Blob.h"
13 #include "platform/blob/BlobData.h" 13 #include "platform/blob/BlobData.h"
14 #include "wtf/text/TextEncoding.h" 14 #include "wtf/text/TextEncoding.h"
15 #include <v8.h> 15 #include <v8.h>
16 16
17 namespace blink { 17 namespace blink {
18 18
19 PushMessageData* PushMessageData::create(const String& messageString) 19 PushMessageData* PushMessageData::create(const String& messageString)
20 { 20 {
21 // The standard supports both an empty but valid message and a null message.
22 // In case the message is explicitly null, return a null pointer which will
23 // be set in the PushEvent.
24 if (messageString.isNull())
25 return nullptr;
21 return PushMessageData::create(ArrayBufferOrArrayBufferViewOrUSVString::from USVString(messageString)); 26 return PushMessageData::create(ArrayBufferOrArrayBufferViewOrUSVString::from USVString(messageString));
22 } 27 }
23 28
24 PushMessageData* PushMessageData::create(const ArrayBufferOrArrayBufferViewOrUSV String& messageData) 29 PushMessageData* PushMessageData::create(const ArrayBufferOrArrayBufferViewOrUSV String& messageData)
25 { 30 {
26 if (messageData.isArrayBuffer() || messageData.isArrayBufferView()) { 31 if (messageData.isArrayBuffer() || messageData.isArrayBufferView()) {
27 RefPtr<DOMArrayBuffer> buffer = messageData.isArrayBufferView() 32 RefPtr<DOMArrayBuffer> buffer = messageData.isArrayBufferView()
28 ? messageData.getAsArrayBufferView()->buffer() 33 ? messageData.getAsArrayBufferView()->buffer()
29 : messageData.getAsArrayBuffer(); 34 : messageData.getAsArrayBuffer();
30 35
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 String PushMessageData::text() const 95 String PushMessageData::text() const
91 { 96 {
92 return UTF8Encoding().decode(m_data.data(), m_data.size()); 97 return UTF8Encoding().decode(m_data.data(), m_data.size());
93 } 98 }
94 99
95 DEFINE_TRACE(PushMessageData) 100 DEFINE_TRACE(PushMessageData)
96 { 101 {
97 } 102 }
98 103
99 } // namespace blink 104 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698