Update the Notification Blink API to use integral persistent ids.

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 37 matching lines @@
 #include "platform/UserGestureIndicator.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebSerializedOrigin.h"
 #include "public/platform/WebString.h"
 #include "public/platform/modules/notifications/WebNotificationData.h"
 #include "public/platform/modules/notifications/WebNotificationManager.h"
 
 namespace blink {
 namespace {
 
+const int64_t kInvalidPersistentId = -1;
+
 WebNotificationManager* notificationManager()
 {
     return Platform::current()->notificationManager();
 }
 
 } // namespace
 
 Notification* Notification::create(ExecutionContext* context, const String& title, const NotificationOptions& options, ExceptionState& exceptionState)
 {
     // The Web Notification constructor may be disabled through a runtime feature. The
@@ skipping 33 matching lines @@
     String insecureOriginMessage;
     UseCounter::Feature feature = context->securityOrigin()->canAccessFeatureRequiringSecureOrigin(insecureOriginMessage)
         ? UseCounter::NotificationSecureOrigin : UseCounter::NotificationInsecureOrigin;
     UseCounter::count(context, feature);
 
     notification->scheduleShow();
     notification->suspendIfNeeded();
     return notification;
 }
 
-Notification* Notification::create(ExecutionContext* context, const String& persistentId, const WebNotificationData& data)
+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->setSilent(data.silent);
 
     if (!data.icon.isEmpty())
         notification->setIconUrl(data.icon);
 
     const WebVector<char>& dataBytes = data.data;
     if (!dataBytes.isEmpty()) {
         notification->setSerializedData(SerializedScriptValueFactory::instance().createFromWireBytes(dataBytes.data(), dataBytes.size()));
         notification->serializedData()->registerMemoryAllocatedWithCurrentScriptContext();
     }
 
     notification->setState(NotificationStateShowing);
     notification->suspendIfNeeded();
     return notification;
 }
 
+Notification* Notification::create(ExecutionContext* context, const String& persistentId, const WebNotificationData& data)
+{
+    Notification* notification = new Notification(data.title, context);
+
+    notification->setPersistentIdString(persistentId);
+    notification->setDir(data.direction == WebNotificationData::DirectionLeftToRight ? "ltr" : "rtl");
+    notification->setLang(data.lang);
+    notification->setBody(data.body);
+    notification->setTag(data.tag);
+    notification->setSilent(data.silent);
+
+    if (!data.icon.isEmpty())
+        notification->setIconUrl(data.icon);
+
+    const WebVector<char>& dataBytes = data.data;
+    if (!dataBytes.isEmpty()) {
+        notification->setSerializedData(SerializedScriptValueFactory::instance().createFromWireBytes(dataBytes.data(), dataBytes.size()));
+        notification->serializedData()->registerMemoryAllocatedWithCurrentScriptContext();
+    }
+
+    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)
+    , m_persistentId(kInvalidPersistentId)
     , m_state(NotificationStateIdle)
     , m_asyncRunner(this, &Notification::show)
 {
     ASSERT(notificationManager());
 }
 
 Notification::~Notification()
 {
 }
 
@@ skipping 27 matching lines @@
     notificationManager()->show(WebSerializedOrigin(*origin), notificationData, this);
 
     m_state = NotificationStateShowing;
 }
 
 void Notification::close()
 {
     if (m_state != NotificationStateShowing)
         return;
 
-    if (m_persistentId.isEmpty()) {
+    if (m_persistentIdString.isEmpty() && m_persistentId == kInvalidPersistentId) {
         // Fire the close event asynchronously.
         executionContext()->postTask(FROM_HERE, createSameThreadTask(&Notification::dispatchCloseEvent, this));
 
         m_state = NotificationStateClosing;
         notificationManager()->close(this);
     } else {
         m_state = NotificationStateClosed;
 
         SecurityOrigin* origin = executionContext()->securityOrigin();
         ASSERT(origin);
 
-        notificationManager()->closePersistent(WebSerializedOrigin(*origin), m_persistentId);
+        if (!m_persistentIdString.isEmpty())
+            notificationManager()->closePersistent(WebSerializedOrigin(*origin), m_persistentIdString);
+        else
+            notificationManager()->closePersistent(WebSerializedOrigin(*origin), m_persistentId);
     }
 }
 
 void Notification::dispatchShowEvent()
 {
     dispatchEvent(Event::create(EventTypeNames::show));
 }
 
 void Notification::dispatchClickEvent()
 {
@@ skipping 93 matching lines @@
     return ScriptValue(scriptState, m_serializedData->deserialize(scriptState->isolate()));
 }
 
 DEFINE_TRACE(Notification)
 {
     RefCountedGarbageCollectedEventTargetWithInlineData<Notification>::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink