Add priority to Notification & NotificationOptions.

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 88 matching lines @@
             return nullptr;
         }
         if (action.title().isEmpty()) {
             exceptionState.throwTypeError("NotificationAction title must not be empty.");
             return nullptr;
         }
     }
 
     Notification* notification = new Notification(title, context);
 
+    notification->setDir(options.dir());
+    notification->setLang(options.lang());
     notification->setBody(options.body());
     notification->setTag(options.tag());
-    notification->setLang(options.lang());
-    notification->setDir(options.dir());
+    notification->setPriority(options.priority());
     notification->setVibrate(NavigatorVibration::sanitizeVibrationPattern(options.vibrate()));
     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);
     }
     HeapVector<NotificationAction> actions;
     actions.appendRange(options.actions().begin(), options.actions().begin() + std::min(maxActions(), options.actions().size()));
@@ skipping 12 matching lines @@
 
 Notification* Notification::create(ExecutionContext* context, int64_t persistentId, const WebNotificationData& data)
 {
     Notification* notification = new Notification(data.title, context);
 
     notification->setPersistentId(persistentId);
     notification->setDir(data.direction == WebNotificationData::DirectionLeftToRight ? "ltr" : "rtl");
     notification->setLang(data.lang);
     notification->setBody(data.body);
     notification->setTag(data.tag);
+    notification->setPriority(priorityString(data.priority));
     notification->setSilent(data.silent);
 
     if (!data.icon.isEmpty())
         notification->setIconUrl(data.icon);
 
     if (!data.vibrate.isEmpty()) {
         NavigatorVibration::VibrationPattern pattern;
         pattern.appendRange(data.vibrate.begin(), data.vibrate.end());
         notification->setVibrate(pattern);
     }
@@ skipping 10 matching lines @@
 
     notification->setState(NotificationStateShowing);
     notification->suspendIfNeeded();
     return notification;
 }
 
 Notification::Notification(const String& title, ExecutionContext* context)
     : ActiveDOMObject(context)
     , m_title(title)
     , m_dir("auto")
+    , m_priority("normal")
     , m_silent(false)
     , m_persistentId(kInvalidPersistentId)
     , m_state(NotificationStateIdle)
     , m_asyncRunner(this, &Notification::show)
 {
     ASSERT(notificationManager());
 }
 
 Notification::~Notification()
 {
@@ skipping 13 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::Priority priority = priorityEnum(m_priority);
 
     // The lifetime and availability of non-persistent notifications is tied to the page
     // they were created by, and thus the data doesn't have to be known to the embedder.
     Vector<char> emptyDataWireBytes;
 
     WebVector<WebNotificationAction> webActions;
     actionsToWebActions(m_actions, &webActions);
 
-    WebNotificationData notificationData(m_title, dir, m_lang, m_body, m_tag, m_iconUrl, m_vibrate, m_silent, emptyDataWireBytes, webActions);
+    WebNotificationData notificationData(m_title, dir, m_lang, m_body, m_tag, priority, m_iconUrl, m_vibrate, m_silent, emptyDataWireBytes, webActions);
     notificationManager()->show(WebSecurityOrigin(origin), notificationData, this);
 
     m_state = NotificationStateShowing;
 }
 
 void Notification::close()
 {
     if (m_state != NotificationStateShowing)
         return;
 
@@ skipping 87 matching lines @@
     NotificationPermissionClient* permissionClient = NotificationPermissionClient::from(context);
     if (!permissionClient) {
         // TODO(peter): Assert that this code-path will only be reached for Document environments when Blink
         // supports [Exposed] annotations on class members in IDL definitions. See https://crbug.com/442139.
         return ScriptPromise::cast(scriptState, v8String(scriptState->isolate(), permission(context)));
     }
 
     return permissionClient->requestPermission(scriptState, deprecatedCallback);
 }
 
+WebNotificationData::Priority Notification::priorityEnum(const String& priority)
+{
+    if (priority == "lowest")
+        return WebNotificationData::PriorityLowest;
+    if (priority == "low")
+        return WebNotificationData::PriorityLow;
+    if (priority == "normal")
+        return WebNotificationData::PriorityNormal;
+    if (priority == "high")
+        return WebNotificationData::PriorityHigh;
+    if (priority == "highest")
+        return WebNotificationData::PriorityHighest;
+
+    ASSERT_NOT_REACHED();
+    return WebNotificationData::PriorityNormal;
+}
+
+String Notification::priorityString(WebNotificationData::Priority priority)
+{
+    switch (priority) {
+    case WebNotificationData::PriorityLowest:
+        return "lowest";
+    case WebNotificationData::PriorityLow:
+        return "low";
+    case WebNotificationData::PriorityNormal:
+        return "normal";
+    case WebNotificationData::PriorityHigh:
+        return "high";
+    case WebNotificationData::PriorityHighest:
+        return "highest";
+    }
+
+    ASSERT_NOT_REACHED();
+    return "normal";
+}
+
 size_t Notification::maxActions()
 {
     return notificationManager()->maxActions();
 }
 
 void Notification::actionsToWebActions(const HeapVector<NotificationAction>& actions, WebVector<WebNotificationAction>* webActions)
 {
     size_t count = std::min(maxActions(), actions.size());
     WebVector<WebNotificationAction> clearedAndResized(count);
     webActions->swap(clearedAndResized);
@@ skipping 47 matching lines @@
 }
 
 DEFINE_TRACE(Notification)
 {
     visitor->trace(m_actions);
     RefCountedGarbageCollectedEventTargetWithInlineData<Notification>::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink