Ship the Notification.action and Notification.vibration properties

third_party/WebKit/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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/notifications/Notification.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/SerializedScriptValueFactory.h"
+#include "bindings/modules/v8/V8NotificationAction.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/dom/ScopedWindowFocusAllowedIndicator.h"
 #include "core/events/Event.h"
 #include "core/frame/UseCounter.h"
 #include "modules/notifications/NotificationAction.h"
 #include "modules/notifications/NotificationData.h"
 #include "modules/notifications/NotificationOptions.h"
 #include "modules/notifications/NotificationPermissionClient.h"
@@ skipping 207 matching lines @@
 String Notification::icon() const
 {
     return m_data.icon.string();
 }
 
 String Notification::badge() const
 {
     return m_data.badge.string();
 }
 
-NavigatorVibration::VibrationPattern Notification::vibrate(bool& isNull) const
+NavigatorVibration::VibrationPattern Notification::vibrate() const
 {
     NavigatorVibration::VibrationPattern pattern;
     pattern.appendRange(m_data.vibrate.begin(), m_data.vibrate.end());
 
-    if (!pattern.size())
-        isNull = true;
-
     return pattern;
 }
 
 DOMTimeStamp Notification::timestamp() const
 {
     return m_data.timestamp;
 }
 
 bool Notification::renotify() const
 {
@@ skipping 14 matching lines @@
 {
     if (m_developerData.isEmpty()) {
         RefPtr<SerializedScriptValue> serializedValue;
 
         const WebVector<char>& serializedData = m_data.data;
         if (serializedData.size())
             serializedValue = SerializedScriptValueFactory::instance().createFromWireBytes(serializedData.data(), serializedData.size());
         else
             serializedValue = SerializedScriptValueFactory::instance().create();
 
-        m_developerData = ScriptValue(scriptState, serializedValue->deserialize(scriptState->isolate()));
+        m_developerData = ScriptValue::from(scriptState, serializedValue->deserialize(scriptState->isolate()));
     }
 
     return m_developerData;
 }
 
-HeapVector<NotificationAction> Notification::actions() const
+Vector<v8::Local<v8::Value>> Notification::actions(ScriptState* scriptState) const
 {
-    HeapVector<NotificationAction> actions;
+    Vector<v8::Local<v8::Value>> actions;
     actions.grow(m_data.actions.size());
 
     for (size_t i = 0; i < m_data.actions.size(); ++i) {
+        NotificationAction action;
+
         switch (m_data.actions[i].type) {
         case WebNotificationAction::Button:
-            actions[i].setType("button");
+            action.setType("button");
             break;
         case WebNotificationAction::Text:
-            actions[i].setType("text");
+            action.setType("text");
             break;
         default:
             NOTREACHED() << "Unknown action type: " << m_data.actions[i].type;
         }
-        actions[i].setAction(m_data.actions[i].action);
-        actions[i].setTitle(m_data.actions[i].title);
-        actions[i].setIcon(m_data.actions[i].icon.string());
-        actions[i].setPlaceholder(m_data.actions[i].placeholder);
+        action.setAction(m_data.actions[i].action);
+        action.setTitle(m_data.actions[i].title);
+        action.setIcon(m_data.actions[i].icon.string());
+        action.setPlaceholder(m_data.actions[i].placeholder);
+
+        // Not just the sequence of actions itself, but also the actions contained within the
+        // sequence should be frozen per the Web Notification specification.
+        actions[i] = freezeV8Object(toV8(action, scriptState), scriptState->isolate());

[bashi, 2016/05/17 02:42:12]

Not directly related to this CL but it seems that the notification spec depends
on ECMAScript. Generally speaking IDL doesn't (and shouldn't) depend on any
specific language so this requirement sounds like a layer violation to me.

We may want to file a bug to WebIDL to add a feature to freeze an object, e.g.
FrozenArray<Frozen<NotificationAction>>.

Just my 2 cents.

     }
 
     return actions;
 }
 
 String Notification::permissionString(mojom::PermissionStatus permission)
 {
     switch (permission) {
     case mojom::PermissionStatus::GRANTED:
         return "granted";
@@ skipping 66 matching lines @@
 
 DEFINE_TRACE(Notification)
 {
     visitor->trace(m_prepareShowMethodRunner);
     visitor->trace(m_loader);
     EventTargetWithInlineData::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink