Make //content responsible for generating notification Ids

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 40 matching lines @@
 #include "public/platform/WebSecurityOrigin.h"
 #include "public/platform/modules/notifications/WebNotificationAction.h"
 #include "public/platform/modules/notifications/WebNotificationConstants.h"
 #include "public/platform/modules/notifications/WebNotificationManager.h"
 #include "wtf/Assertions.h"
 #include "wtf/Functional.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 29 matching lines @@
     if (exceptionState.hadException())
         return nullptr;
 
     Notification* notification = new Notification(context, data);
     notification->schedulePrepareShow();
     notification->suspendIfNeeded();
 
     return notification;
 }
 
-Notification* Notification::create(ExecutionContext* context, int64_t persistentId, const WebNotificationData& data, bool showing)
+Notification* Notification::create(ExecutionContext* context, const String& notificationId, const WebNotificationData& data, bool showing)
 {
     Notification* notification = new Notification(context, data);
-    notification->setPersistentId(persistentId);
+    notification->setNotificationId(notificationId);
     notification->setState(showing ? NotificationStateShowing : NotificationStateClosed);
     notification->suspendIfNeeded();
 
     return notification;
 }
 
 Notification::Notification(ExecutionContext* context, const WebNotificationData& data)
     : ActiveScriptWrappable(this)
     , ActiveDOMObject(context)
     , m_data(data)
-    , m_persistentId(kInvalidPersistentId)
     , m_state(NotificationStateIdle)
     , m_prepareShowMethodRunner(AsyncMethodRunner<Notification>::create(this, &Notification::prepareShow))
 {
     DCHECK(notificationManager());
 }
 
 Notification::~Notification()
 {
 }
 
@@ skipping 28 matching lines @@
     m_loader.clear();
 
     m_state = NotificationStateShowing;
 }
 
 void Notification::close()
 {
     if (m_state != NotificationStateShowing)
         return;
 
-    if (m_persistentId == kInvalidPersistentId) {
+    if (m_notificationId.isNull()) {
         // Fire the close event asynchronously.
         getExecutionContext()->postTask(BLINK_FROM_HERE, createSameThreadTask(&Notification::dispatchCloseEvent, wrapPersistent(this)));
 
         m_state = NotificationStateClosing;
         notificationManager()->close(this);
     } else {
         m_state = NotificationStateClosed;
 
         SecurityOrigin* origin = getExecutionContext()->getSecurityOrigin();
         DCHECK(origin);
 
-        notificationManager()->closePersistent(WebSecurityOrigin(origin), m_persistentId);
+        notificationManager()->closePersistent(WebSecurityOrigin(origin), m_data.tag, m_notificationId);
     }
 }
 
 void Notification::dispatchShowEvent()
 {
     dispatchEvent(Event::create(EventTypeNames::show));
 }
 
 void Notification::dispatchClickEvent()
 {
@@ skipping 196 matching lines @@
 
 DEFINE_TRACE(Notification)
 {
     visitor->trace(m_prepareShowMethodRunner);
     visitor->trace(m_loader);
     EventTargetWithInlineData::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink