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..ea2617457d935d15fdd69c48d2fe93243e51310c 100644 |
--- a/third_party/WebKit/Source/modules/push_messaging/PushMessageData.cpp |
+++ b/third_party/WebKit/Source/modules/push_messaging/PushMessageData.cpp |
@@ -18,6 +18,11 @@ 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()) |
+ return nullptr; |
return PushMessageData::create(ArrayBufferOrArrayBufferViewOrUSVString::fromUSVString(messageString)); |
} |