Make Notification override hasPendingActivity() to prolong its lifetime while async op is running

Source/modules/notifications/Notification.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009, 2011, 2012 Apple 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.
@@ skipping 129 matching lines @@
     // prevent double-showing
     if (m_state == Idle) {
         if (!toDocument(executionContext())->page())
             return;
         if (NotificationController::from(toDocument(executionContext())->page())->client()->checkPermission(executionContext()) != NotificationClient::PermissionAllowed) {
             dispatchErrorEvent();
             return;
         }
         if (m_notificationClient->show(this)) {
             m_state = Showing;
-            setPendingActivity(this);
         }
     }
 }
 
 void Notification::close()
 {
     switch (m_state) {
     case Idle:
         break;
     case Showing:
         m_notificationClient->cancel(this);
         break;
     case Closed:
         break;
     }
 }
 
+bool Notification::hasPendingActivity() const
+{
+    return m_state == Showing || (m_asyncRunner && m_asyncRunner->isActive());
+}
+
 void Notification::stop()
 {
     if (m_notificationClient)
         m_notificationClient->notificationObjectDestroyed(this);
     m_notificationClient = 0;
 
-    finalize();
-
-    // Ensure m_notificationClient == 0 only when in Closed state.
-    ASSERT(m_state == Closed);
-}
-
-void Notification::finalize()
-{
-    if (m_state == Closed)
-        return;
-
-    // To call unsetPendingActivity() at the end.
-    NotificationState lastState = m_state;
     m_state = Closed;

[abarth-chromium, 2013/11/15 16:02:55]

Do we need to tell the m_asyncRunner to stop, or does that happen automatically
somehow?

[tyoshino (SeeGerritForStatus), 2013/11/18 10:53:13]

Good catch. Since
- if m_state is set to non Idle, show() does nothing
- when this object dies, m_asyncRunner is cleared so, there's not worry about
UAF
it's fine. But to avoid such a useless invocation, added code to call stop() on
it.

-
-    // setPendingActivity() is called only when show() was successful, and only
-    // in that case, m_state is set to Showing. So, if it's not Showing, do
-    // nothing here.
-    if (lastState != Showing)
-        return;
-
-    unsetPendingActivity(this);
 }
 
 void Notification::dispatchShowEvent()
 {
 #if ENABLE(LEGACY_NOTIFICATIONS)
     dispatchEvent(Event::create(EventTypeNames::display));
 #endif
     dispatchEvent(Event::create(EventTypeNames::show));
 }
 
 void Notification::dispatchClickEvent()
 {
     UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
     WindowFocusAllowedIndicator windowFocusAllowed;
     dispatchEvent(Event::create(EventTypeNames::click));
 }
 
 void Notification::dispatchCloseEvent()
 {
     dispatchEvent(Event::create(EventTypeNames::close));
-    finalize();
+    m_state = Closed;
 }
 
 void Notification::dispatchErrorEvent()
 {
     dispatchEvent(Event::create(EventTypeNames::error));
 }
 
 void Notification::showSoon()
 {
     ASSERT(executionContext()->isDocument());
@@ skipping 34 matching lines @@
     return deniedPermission;
 }
 
 void Notification::requestPermission(ExecutionContext* context, PassRefPtr<NotificationPermissionCallback> callback)
 {
     ASSERT(toDocument(context)->page());
     NotificationController::from(toDocument(context)->page())->client()->requestPermission(context, callback);
 }
 
 } // namespace WebCore