Update PushEvent and PushMessageData to match the spec.

Source/modules/push_messaging/PushMessageData.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/push_messaging/PushMessageData.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8Binding.h"
+#include "bindings/modules/v8/UnionTypesModules.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/fileapi/Blob.h"
 #include "platform/blob/BlobData.h"
+#include "wtf/text/TextEncoding.h"
 #include <v8.h>
 
 namespace blink {
 
+PushMessageData* PushMessageData::create(const String& messageString)
+{
+    return PushMessageData::create(ArrayBufferOrArrayBufferViewOrUSVString::fromUSVString(messageString));
+}
+
+PushMessageData* PushMessageData::create(const ArrayBufferOrArrayBufferViewOrUSVString& messageData)
+{
+    if (messageData.isArrayBuffer() || messageData.isArrayBufferView()) {
+        RefPtr<DOMArrayBuffer> buffer = messageData.isArrayBufferView()
+            ? messageData.getAsArrayBufferView()->buffer()
+            : messageData.getAsArrayBuffer();
+
+        return new PushMessageData(static_cast<const char*>(buffer->data()), buffer->byteLength());
+    }
+
+    if (messageData.isUSVString()) {
+        CString encodedString = UTF8Encoding().normalizeAndEncode(messageData.getAsUSVString(), WTF::EntitiesForUnencodables);
+        return new PushMessageData(encodedString.data(), encodedString.length());
+    }
+
+    ASSERT(messageData.isNull());
+    return new PushMessageData();
+}
+
 PushMessageData::PushMessageData()
 {
 }
 
-PushMessageData::PushMessageData(const String& messageData)
-    : m_messageData(messageData)
+PushMessageData::PushMessageData(const char* data, unsigned bytesSize)
 {
+    m_data.append(data, bytesSize);
 }
 
 PushMessageData::~PushMessageData()
 {
 }
 
 PassRefPtr<DOMArrayBuffer> PushMessageData::arrayBuffer() const
 {
-    return DOMArrayBuffer::create(m_messageData.characters8(), m_messageData.length());
+    return DOMArrayBuffer::create(m_data.data(), m_data.size());
 }
 
 Blob* PushMessageData::blob() const
 {
     OwnPtr<BlobData> blobData = BlobData::create();
-    blobData->appendText(m_messageData, false);
+    blobData->appendBytes(m_data.data(), m_data.size());
 
     // Note that the content type of the Blob object is deliberately not being
     // provided, following the specification.
 
-    const long long blobSize = blobData->length();
-    return Blob::create(BlobDataHandle::create(blobData.release(), blobSize));
+    const long long byteLength = blobData->length();
+    return Blob::create(BlobDataHandle::create(blobData.release(), byteLength));
 }
 
 ScriptValue PushMessageData::json(ScriptState* scriptState, ExceptionState& exceptionState) const
 {
     v8::Isolate* isolate = scriptState->isolate();
 
     ScriptState::Scope scope(scriptState);
-    v8::Local<v8::String> dataString = v8String(isolate, m_messageData);
+    v8::Local<v8::String> dataString = v8String(isolate, text());
 
     v8::TryCatch block;
     v8::Local<v8::Value> parsed;
     if (!v8Call(v8::JSON::Parse(isolate, dataString), parsed, block)) {
         exceptionState.rethrowV8Exception(block.Exception());
         return ScriptValue();
     }
 
     return ScriptValue(scriptState, parsed);
 }
 
-const String& PushMessageData::text() const
+String PushMessageData::text() const
 {
-    return m_messageData;
+    return UTF8Encoding().decode(m_data.data(), m_data.size());
 }
 
 DEFINE_TRACE(PushMessageData)
 {
 }
 
 } // namespace blink