Add the data attribute to the Notification object

Source/modules/notifications/Notification.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/notifications/Notification.h"
 
+#include "bindings/core/v8/ExceptionState.h"
+#include "bindings/core/v8/ScriptState.h"
+#include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/ScriptWrappable.h"
+#include "bindings/core/v8/SerializedScriptValueFactory.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/dom/ScopedWindowFocusAllowedIndicator.h"
 #include "core/events/Event.h"
 #include "core/frame/UseCounter.h"
 #include "modules/notifications/NotificationOptions.h"
 #include "modules/notifications/NotificationPermissionClient.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/UserGestureIndicator.h"
@@ skipping 20 matching lines @@
         exceptionState.throwTypeError("Illegal constructor. Use ServiceWorkerRegistration.showNotification() instead.");
         return nullptr;
     }
 
     // The Web Notification constructor may not be used in Service Worker contexts.
     if (context->isServiceWorkerGlobalScope()) {
         exceptionState.throwTypeError("Illegal constructor.");
         return nullptr;
     }
 
+    RefPtr<SerializedScriptValue> data;
+    if (options.hasData()) {
+        data = SerializedScriptValueFactory::instance().create(options.data(), nullptr, exceptionState, options.data().isolate());
+        if (exceptionState.hadException())
+            return nullptr;
+    }
+
     Notification* notification = new Notification(title, context);
 
     notification->setBody(options.body());
     notification->setTag(options.tag());
     notification->setLang(options.lang());
     notification->setDir(options.dir());
     notification->setSilent(options.silent());
+    notification->setSerializedData(data.release());
     if (options.hasIcon()) {
         KURL iconUrl = options.icon().isEmpty() ? KURL() : context->completeURL(options.icon());
         if (!iconUrl.isEmpty() && iconUrl.isValid())
             notification->setIconUrl(iconUrl);
     }
 
     String insecureOriginMessage;
     UseCounter::Feature feature = context->securityOrigin()->canAccessFeatureRequiringSecureOrigin(insecureOriginMessage)
         ? UseCounter::NotificationSecureOrigin : UseCounter::NotificationInsecureOrigin;
     UseCounter::count(context, feature);
@@ skipping 10 matching lines @@
     notification->setPersistentId(persistentId);
     notification->setDir(data.direction == WebNotificationData::DirectionLeftToRight ? "ltr" : "rtl");
     notification->setLang(data.lang);
     notification->setBody(data.body);
     notification->setTag(data.tag);
     notification->setSilent(data.silent);
 
     if (!data.icon.isEmpty())
         notification->setIconUrl(data.icon);
 
+    if (!data.data.isNull()) {
+        notification->setSerializedData(data.data);
+        notification->serializedData()->registerMemoryAllocatedWithCurrentScriptContext();
+    }
+
     notification->setState(NotificationStateShowing);
     notification->suspendIfNeeded();
     return notification;
 }
 
 Notification::Notification(const String& title, ExecutionContext* context)
     : ActiveDOMObject(context)
     , m_title(title)
     , m_dir("auto")
     , m_silent(false)
@@ skipping 21 matching lines @@
     if (Notification::checkPermission(executionContext()) != WebNotificationPermissionAllowed) {
         dispatchErrorEvent();
         return;
     }
 
     SecurityOrigin* origin = executionContext()->securityOrigin();
     ASSERT(origin);
 
     // FIXME: Do CSP checks on the associated notification icon.
     WebNotificationData::Direction dir = m_dir == "rtl" ? WebNotificationData::DirectionRightToLeft : WebNotificationData::DirectionLeftToRight;
-    WebNotificationData notificationData(m_title, dir, m_lang, m_body, m_tag, m_iconUrl, m_silent);
+
+    // No send data property in non-persistent notification.

[Peter Beverloo, 2015/03/12 20:30:46]

No -> Don't.

[Sanghyun Park, 2015/03/13 02:57:07]

Okay, I'll fix

+    WebNotificationData notificationData(m_title, dir, m_lang, m_body, m_tag, m_iconUrl, m_silent, PassRefPtr<SerializedScriptValue>(nullptr));

[Peter Beverloo, 2015/03/12 20:30:45]

The reason that this doesn't work is that the WebNotificationData constructor
takes a *Web*SerializedScriptValue, not a SerializedScriptValue.

It would be clearer if you'd write this like:

WebSerializedScriptValue emptySerializedScriptValue;
WebNotificationData notificationData(..., emptySerializedScriptValue);

[Sanghyun Park, 2015/03/13 02:57:07]

Okay, I'll fix this also.:)

     notificationManager()->show(WebSerializedOrigin(*origin), notificationData, this);
 
     m_state = NotificationStateShowing;
 }
 
 void Notification::close()
 {
     if (m_state != NotificationStateShowing)
         return;
 
@@ skipping 97 matching lines @@
     m_state = NotificationStateClosed;
 
     m_asyncRunner.stop();
 }
 
 bool Notification::hasPendingActivity() const
 {
     return m_state == NotificationStateShowing || m_asyncRunner.isActive();
 }
 
+ScriptValue Notification::data(ScriptState* scriptState)
+{
+    if (!m_dataAsSerializedScriptValue)
+        return ScriptValue::createNull(scriptState);
+
+    return ScriptValue(scriptState, m_dataAsSerializedScriptValue->deserialize(scriptState->isolate()));
+}
+
 DEFINE_TRACE(Notification)
 {
     RefCountedGarbageCollectedEventTargetWithInlineData<Notification>::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink