Add NotificationOptions.actions so websites can provide buttons (blink)

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 74 matching lines @@
         return nullptr;
     }
 
     RefPtr<SerializedScriptValue> data;
     if (options.hasData()) {
         data = SerializedScriptValueFactory::instance().create(options.data().isolate(), options.data(), nullptr, exceptionState);
         if (exceptionState.hadException())
             return nullptr;
     }
 
+    for (NotificationAction action : options.actions()) {
+        if (action.title().isEmpty()) {
+            exceptionState.throwTypeError("Notification action titles must not be empty.");
+            return nullptr;
+        }
+    }
+
     Notification* notification = new Notification(title, context);
 
     notification->setBody(options.body());
     notification->setTag(options.tag());
     notification->setLang(options.lang());
     notification->setDir(options.dir());
     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(notificationManager()->maxActions(), options.actions().size()));

[Peter Beverloo, 2015/07/31 15:38:49]

nit: you can just write |maxActions()| rather than
|notificationManager()->maxActions()|.

[johnme, 2015/07/31 16:08:52]

Done.

+    notification->setActions(actions);
 
     String insecureOriginMessage;
     UseCounter::Feature feature = context->isPrivilegedContext(insecureOriginMessage)
         ? UseCounter::NotificationSecureOrigin
         : UseCounter::NotificationInsecureOrigin;
     UseCounter::count(context, feature);
 
     notification->scheduleShow();
     notification->suspendIfNeeded();
     return notification;
@@ skipping 18 matching lines @@
         pattern.appendRange(data.vibrate.begin(), data.vibrate.end());
         notification->setVibrate(pattern);
     }
 
     const WebVector<char>& dataBytes = data.data;
     if (!dataBytes.isEmpty()) {
         notification->setSerializedData(SerializedScriptValueFactory::instance().createFromWireBytes(dataBytes.data(), dataBytes.size()));
         notification->serializedData()->registerMemoryAllocatedWithCurrentScriptContext();
     }
 
+    HeapVector<NotificationAction> actions;
+    webActionsToActions(data.actions, &actions);
+    notification->setActions(actions);
+
     notification->setState(NotificationStateShowing);
     notification->suspendIfNeeded();
     return notification;
 }
 
 Notification::Notification(const String& title, ExecutionContext* context)
     : ActiveDOMObject(context)
     , m_title(title)
     , m_dir("auto")
     , m_silent(false)
@@ skipping 27 matching lines @@
     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;
 
     // 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;
 
-    WebNotificationData notificationData(m_title, dir, m_lang, m_body, m_tag, m_iconUrl, m_vibrate, m_silent, 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);
     notificationManager()->show(WebSecurityOrigin(origin), notificationData, this);
 
     m_state = NotificationStateShowing;
 }
 
 void Notification::close()
 {
     if (m_state != NotificationStateShowing)
         return;
 
@@ skipping 34 matching lines @@
 {
     // The notification will be showing when the user initiated the close, or it will be
     // closing if the developer initiated the close.
     if (m_state != NotificationStateShowing && m_state != NotificationStateClosing)
         return;
 
     m_state = NotificationStateClosed;
     dispatchEvent(Event::create(EventTypeNames::close));
 }
 
-NavigatorVibration::VibrationPattern Notification::vibrate(bool& isNull) const
+const NavigatorVibration::VibrationPattern& Notification::vibrate(bool& isNull) const
 {
     isNull = m_vibrate.isEmpty();
     return m_vibrate;
 }
 
 TextDirection Notification::direction() const
 {
     // FIXME: Resolve dir()=="auto" against the document.
     return dir() == "rtl" ? RTL : LTR;
 }
@@ skipping 32 matching lines @@
     // when Blink supports [Exposed] annotations on class members in IDL definitions.
     if (NotificationPermissionClient* permissionClient = NotificationPermissionClient::from(context))
         permissionClient->requestPermission(context, callback);
 }
 
 unsigned Notification::maxActions()
 {
     return notificationManager()->maxActions();
 }
 
+void Notification::actionsToWebActions(const HeapVector<NotificationAction>& actions, WebVector<WebNotificationAction>* webActions)
+{
+    size_t count = std::min(notificationManager()->maxActions(), actions.size());

[Peter Beverloo, 2015/07/31 15:38:49]

dito

[johnme, 2015/07/31 16:08:52]

Done.

+    WebVector<WebNotificationAction> clearedAndResized(count);
+    webActions->swap(clearedAndResized);
+    for (size_t i = 0; i < count; ++i) {

[Peter Beverloo, 2015/07/31 15:38:49]

nit: no need for {} in one-line if statements

[johnme, 2015/07/31 16:08:52]

Done (but this becomes 2-line in https://codereview.chromium.org/1263043003).

+        (*webActions)[i].title = actions[i].title();
+    }
+}
+
+void Notification::webActionsToActions(const WebVector<WebNotificationAction>& webActions, HeapVector<NotificationAction>* actions)
+{
+    actions->clear();
+    actions->grow(webActions.size());
+    for (size_t i = 0; i < webActions.size(); ++i) {
+        (*actions)[i].setTitle(webActions[i].title);

[Peter Beverloo, 2015/07/31 15:38:49]

dito

[johnme, 2015/07/31 16:08:52]

Done (but this becomes 2-line in https://codereview.chromium.org/1263043003).

+    }
+}
+
 bool Notification::dispatchEventInternal(PassRefPtrWillBeRawPtr<Event> event)
 {
     ASSERT(executionContext()->isContextThread());
     return EventTarget::dispatchEventInternal(event);
 }
 
 const AtomicString& Notification::interfaceName() const
 {
     return EventTargetNames::Notification;
 }
@@ skipping 15 matching lines @@
 ScriptValue Notification::data(ScriptState* scriptState) const
 {
     if (!m_serializedData)
         return ScriptValue::createNull(scriptState);
 
     return ScriptValue(scriptState, m_serializedData->deserialize(scriptState->isolate()));
 }
 
 DEFINE_TRACE(Notification)
 {
+    visitor->trace(m_actions);
     RefCountedGarbageCollectedEventTargetWithInlineData<Notification>::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink