Index: Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp |
diff --git a/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp b/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp |
index 0c794f1ad1e6e7285ee136107d920ff342b95d53..9ffb4b4636d081ecfe54ce7b95d32903abf4e302 100644 |
--- a/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp |
+++ b/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp |
@@ -17,6 +17,7 @@ |
#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" |
@@ -66,6 +67,9 @@ ScriptPromise ServiceWorkerRegistrationNotifications::showNotification(ScriptSta |
if (Notification::checkPermission(executionContext) != WebNotificationPermissionAllowed) |
return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "No notification permission has been granted for this origin.")); |
+ if (options.hasVibrate() && options.silent()) |
+ return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "Silent notification must not specify vibration patterns.")); |
Peter Beverloo
2015/04/13 15:05:18
nit: notification -> notifications
Sanghyun Park
2015/04/13 17:27:23
Done.
|
+ |
// FIXME: Unify the code path here with the Notification.create() function. |
Vector<char> dataAsWireBytes; |
if (options.hasData()) { |
@@ -89,7 +93,7 @@ ScriptPromise ServiceWorkerRegistrationNotifications::showNotification(ScriptSta |
} |
WebNotificationData::Direction dir = options.dir() == "rtl" ? WebNotificationData::DirectionRightToLeft : WebNotificationData::DirectionLeftToRight; |
- WebNotificationData notification(title, dir, options.lang(), options.body(), options.tag(), iconUrl, options.silent(), dataAsWireBytes); |
+ WebNotificationData notification(title, dir, options.lang(), options.body(), options.tag(), iconUrl, NavigatorVibration::sanitizeVibrationPattern(options.vibrate()), options.silent(), dataAsWireBytes); |
Peter Beverloo
2015/04/13 15:05:18
nit: Please extract this into a variable to improv
Sanghyun Park
2015/04/13 17:27:23
Okay I'll make variable about vibrate.
|
WebNotificationShowCallbacks* callbacks = new CallbackPromiseAdapter<void, void>(resolver); |
SecurityOrigin* origin = executionContext->securityOrigin(); |