Add the data attribute to the Notification object

Source/modules/notifications/ServiceWorkerRegistrationNotifications.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/notifications/ServiceWorkerRegistrationNotifications.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
+#include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
+#include "bindings/core/v8/ScriptValue.h"
+#include "bindings/core/v8/SerializedScriptValue.h"
+#include "bindings/core/v8/SerializedScriptValueFactory.h"
 #include "bindings/core/v8/V8ThrowException.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "modules/notifications/Notification.h"
 #include "modules/notifications/NotificationOptions.h"
 #include "platform/weborigin/KURL.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebSerializedOrigin.h"
 #include "public/platform/modules/notifications/WebNotificationData.h"
 #include "public/platform/modules/notifications/WebNotificationManager.h"
 
 namespace blink {
 
-ScriptPromise ServiceWorkerRegistrationNotifications::showNotification(ScriptState* scriptState, ServiceWorkerRegistration& serviceWorkerRegistration, const String& title, const NotificationOptions& options)
+ScriptPromise ServiceWorkerRegistrationNotifications::showNotification(ScriptState* scriptState, ServiceWorkerRegistration& serviceWorkerRegistration, const String& title, const NotificationOptions& options, ExceptionState& exceptionState)
 {
     ExecutionContext* executionContext = scriptState->executionContext();
 
     // If context object's active worker is null, reject promise with a TypeError exception.
     if (!serviceWorkerRegistration.active())
         return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "No active registration available on the ServiceWorkerRegistration."));
 
     // If permission for notification's origin is not "granted", reject promise with a TypeError exception, and terminate these substeps.
     if (Notification::checkPermission(executionContext) != WebNotificationPermissionAllowed)
         return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "No notification permission has been granted for this origin."));
 
     RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
 
+    // FIXME: Unifying these code paths at some point in the future

[Peter Beverloo, 2015/03/12 01:16:26]

micro nit: Unifying -> Unify. It would also be good to mention *which* code
paths. What about:

// FIXME: Unify the code path here with the Notification.create() function.

[Sanghyun Park, 2015/03/12 02:58:47]

I'll fix this. 

+    RefPtr<SerializedScriptValue> data;
+    if (options.hasData()) {
+        data = SerializedScriptValueFactory::instance().create(options.data(), 0, exceptionState, options.data().isolate());
+        if (exceptionState.hadException())
+            return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "No data property can be serialized"));

[Peter Beverloo, 2015/03/12 01:16:26]

Per the specification:
    "4. Set notification's data to a structured clone of options's data. Rethrow
any exceptions."

I don't agree with the specification here. I think it's a bit weird that we have
a function returning a promise that also throws exceptions, that's very
inconvenient.

I filed https://github.com/whatwg/notifications/issues/40 to track this.


Let's assume for a moment that the change gets accepted, and any exceptions
thrown by SerializedScriptValueFactory need to result in a rejected
ScriptPromise.

This means that the [RaisesException] annotation should be removed from the IDL
file. That means that you won't have an ExceptionState object anymore. I wonder
if TrackExceptionState is appropriate to use in this case?

[Peter Beverloo, 2015/03/12 02:28:50]

Scrap the above :-).

Right now you're throwing a TypeError of your own, where the specification
defines that we have to re-throw exceptions caused by serializing the |data|
property.

You could do this as follows:
==========
data = SerializedScriptValueFactory...
if (exceptionState.hadException())
  return exceptionState.reject(scriptState);
==========

[Sanghyun Park, 2015/03/12 02:58:47]

I see.
Thank you so much for finding solution.
I'll fix this.

+    }
+
     // FIXME: Do the appropriate CORS checks on the icon URL.
 
     KURL iconUrl;
     if (options.hasIcon() && !options.icon().isEmpty()) {
         iconUrl = executionContext->completeURL(options.icon());
         if (!iconUrl.isValid())
             iconUrl = KURL();
     }
 
     WebNotificationData::Direction dir = options.dir() == "rtl" ? WebNotificationData::DirectionRightToLeft : WebNotificationData::DirectionLeftToRight;
-    WebNotificationData notification(title, dir, options.lang(), options.body(), options.tag(), iconUrl, options.silent());
+    WebNotificationData notification(title, dir, options.lang(), options.body(), options.tag(), iconUrl, options.silent(), data.release());
     WebNotificationShowCallbacks* callbacks = new CallbackPromiseAdapter<void, void>(resolver);
 
     SecurityOrigin* origin = executionContext->securityOrigin();
     ASSERT(origin);
 
     WebNotificationManager* notificationManager = Platform::current()->notificationManager();
     ASSERT(notificationManager);
 
     notificationManager->showPersistent(WebSerializedOrigin(*origin), notification, serviceWorkerRegistration.webRegistration(), callbacks);
     return promise;
 }
 
 } // namespace blink