Add the vibrate 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"
 
+

[Peter Beverloo, 2015/04/01 14:26:29]

nit: no blank line

[Sanghyun Park, 2015/04/01 17:46:08]

Done.

 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.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/GetNotificationOptions.h"
 #include "modules/notifications/Notification.h"
 #include "modules/notifications/NotificationOptions.h"
+#include "modules/vibration/NavigatorVibration.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 {
 namespace {
 
 // Allows using a CallbackPromiseAdapter with a WebVector to resolve the
@@ skipping 30 matching lines @@
 
     // 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."));
 
     // FIXME: Unify the code path here with the Notification.create() function.
+    NavigatorVibration::VibrationPattern vibrate;

[Peter Beverloo, 2015/04/01 14:26:29]

Perhaps it makes sense to look into unifying the methods first? This is another
bunch of duplicated code :-(.

[Sanghyun Park, 2015/04/01 17:46:08]

I'll also your opinion.
But, if we'll support vibrate attribute of notification object, I think we
should not sanitize vibrate pattern in blink. 
Because, we need to keep the user's settings of vibrate for persistent
notification.

WDYT?

+    if (options.hasVibrate()) {
+        if (options.silent())
+            return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "If options's silent is true, options's vibrate should not be presented."));
+
+        NavigatorVibration::VibrationPattern pattern;
+        if (options.vibrate().isUnsignedLong())
+            pattern.append(options.vibrate().getAsUnsignedLong());
+        else
+            pattern = options.vibrate().getAsUnsignedLongSequence();
+        vibrate = NavigatorVibration::verifyVibrationPattern(pattern);
+    }
+
     String dataAsWireString;
     if (options.hasData()) {
         RefPtr<SerializedScriptValue> data = SerializedScriptValueFactory::instance().create(options.data(), nullptr, exceptionState, options.data().isolate());
         if (exceptionState.hadException())
             return exceptionState.reject(scriptState);
         dataAsWireString = data->toWireString();
     }
 
     RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
 
     // 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(), dataAsWireString);
+    WebNotificationData notification(title, dir, options.lang(), options.body(), options.tag(), iconUrl, vibrate, options.silent(), dataAsWireString);
     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;
 }
 
 ScriptPromise ServiceWorkerRegistrationNotifications::getNotifications(ScriptState* scriptState, ServiceWorkerRegistration& serviceWorkerRegistration, const GetNotificationOptions& options)
 {
     RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
 
     WebNotificationGetCallbacks* callbacks = new CallbackPromiseAdapter<NotificationArray, void>(resolver);
 
     WebNotificationManager* notificationManager = Platform::current()->notificationManager();
     ASSERT(notificationManager);
 
     notificationManager->getNotifications(options.tag(), serviceWorkerRegistration.webRegistration(), callbacks);
     return promise;
 }
 
 } // namespace blink