Merge 88738 - [Chromium] WebNotification should check if ScriptExecutionContext is gone

Source/WebKit/chromium/src/WebNotification.cpp

 /*
  * Copyright (C) 2009 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 98 matching lines @@
     return m_private->replaceId();
 }
 
 void WebNotification::detachPresenter()
 {
     m_private->detachPresenter();
 }
 
 void WebNotification::dispatchDisplayEvent()
 {
-    RefPtr<Event> event = Event::create("display", false, true);
-    m_private->dispatchEvent(event.release());
+    dispatchEvent("display");
 }
 
 void WebNotification::dispatchErrorEvent(const WebKit::WebString& /* errorMessage */)
 {
     // FIXME: errorMessage not supported by WebCore yet
-    RefPtr<Event> event = Event::create(eventNames().errorEvent, false, true);
-    m_private->dispatchEvent(event.release());
+    dispatchEvent(eventNames().errorEvent);
 }
 
 void WebNotification::dispatchCloseEvent(bool /* byUser */)
 {
     // FIXME: byUser flag not supported by WebCore yet
-    RefPtr<Event> event = Event::create(eventNames().closeEvent, false, true);
-    m_private->dispatchEvent(event.release());
+    dispatchEvent(eventNames().closeEvent);
 }
 
 void WebNotification::dispatchClickEvent()
 {
     // Make sure clicks on notifications are treated as user gestures.
     UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
-    RefPtr<Event> event = Event::create(eventNames().clickEvent, false, true);
+    dispatchEvent(eventNames().clickEvent);
+}
+
+void WebNotification::dispatchEvent(const WTF::AtomicString& type)
+{
+    // Do not dispatch if the context is gone.
+    if (!m_private->scriptExecutionContext())
+        return;
+
+    RefPtr<Event> event = Event::create(type, false, true);
     m_private->dispatchEvent(event.release());
 }
 
 WebNotification::WebNotification(const WTF::PassRefPtr<Notification>& notification)
     : m_private(static_cast<WebNotificationPrivate*>(notification.releaseRef()))
 {
 }
 
 WebNotification& WebNotification::operator=(const WTF::PassRefPtr<Notification>& notification)
 {
@@ skipping 10 matching lines @@
 {
     // p is already ref'd for us by the caller
     if (m_private)
         m_private->deref();
     m_private = p;
 }
 
 } // namespace WebKit
 
 #endif // ENABLE(NOTIFICATIONS)