Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2112)

Unified Diff: Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp

Issue 1042513002: Add the vibrate attribute to the Notification object (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp
diff --git a/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp b/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp
index 0c794f1ad1e6e7285ee136107d920ff342b95d53..3f23363b396c44840bf6869f0241f44b6fdfeccf 100644
--- a/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp
+++ b/Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp
@@ -66,6 +66,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(), "Slient notification must not specify vibration patterns"));
Peter Beverloo 2015/04/09 13:03:17 nit: Sentences end with a period.
Sanghyun Park 2015/04/09 13:48:05 Done.
+
// FIXME: Unify the code path here with the Notification.create() function.
Vector<char> dataAsWireBytes;
if (options.hasData()) {
@@ -89,7 +92,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, Notification::sanitizeVibrationPattern(options.vibrate()), options.silent(), dataAsWireBytes);
WebNotificationShowCallbacks* callbacks = new CallbackPromiseAdapter<void, void>(resolver);
SecurityOrigin* origin = executionContext->securityOrigin();

Powered by Google App Engine
This is Rietveld 408576698