third_party/WebKit/Source/modules/push_messaging/PushMessageData.cpp - Issue 1636483002: Update the PushEvent to have a nullable PushMessageData

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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: Created 4 years, 11 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 side-by-side diff with in-line comments

Download patch

« content/renderer/service_worker/service_worker_context_client.cc ('K') | « third_party/WebKit/Source/modules/modules.gypi ('k') | third_party/WebKit/Source/modules/push_messaging/PushMessageDataTest.cpp » ('j') | third_party/WebKit/Source/modules/push_messaging/PushMessageDataTest.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/push_messaging/PushMessageData.cpp

diff --git a/third_party/WebKit/Source/modules/push_messaging/PushMessageData.cpp b/third_party/WebKit/Source/modules/push_messaging/PushMessageData.cpp

index f0842173fc71cdb32bcd0fcdc83ecbbb73922143..bb81a46588ee931a9cf652c06d367bbe43ba47f6 100644

--- a/third_party/WebKit/Source/modules/push_messaging/PushMessageData.cpp

+++ b/third_party/WebKit/Source/modules/push_messaging/PushMessageData.cpp

@@ -18,6 +18,12 @@ namespace blink {

PushMessageData* PushMessageData::create(const String& messageString)

{

+ // The standard supports both an empty but valid message and a null message.

+ // In case the message is explicitly null, return a null pointer which will

+ // be set in the PushEvent.

+ if (messageString.isNull()) {

Peter Beverloo 2016/01/25 17:39:07 micro nit: no curly brackets here either

harkness 2016/01/26 12:07:20 Done.

+ return nullptr;

+ }

return PushMessageData::create(ArrayBufferOrArrayBufferViewOrUSVString::fromUSVString(messageString));

}