Merge 140927

Source/WebCore/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 151 matching lines @@
 #endif
 
 const AtomicString& Notification::interfaceName() const
 {
     return eventNames().interfaceForNotification;
 }
 
 void Notification::show() 
 {
     // prevent double-showing
-    if (m_state == Idle && m_notificationCenter->client() && m_notificationCenter->client()->show(this)) {
-        m_state = Showing;
-        setPendingActivity(this);
+    if (m_state == Idle && m_notificationCenter->client()) {
+#if ENABLE(NOTIFICATIONS)
+        if (!static_cast<Document*>(scriptExecutionContext())->page())
+            return;
+        if (NotificationController::from(static_cast<Document*>(scriptExecutionContext())->page())->client()->checkPermission(scriptExecutionContext()) != NotificationClient::PermissionAllowed) {
+            dispatchErrorEvent();
+            return;
+        }
+#endif
+        if (m_notificationCenter->client()->show(this)) {
+            m_state = Showing;
+            setPendingActivity(this);
+        }
     }
 }
 
 void Notification::close()
 {
     switch (m_state) {
     case Idle:
         break;
     case Showing:
         if (m_notificationCenter->client())
@@ skipping 48 matching lines @@
 
 void Notification::dispatchErrorEvent()
 {
     dispatchEvent(Event::create(eventNames().errorEvent, false, false));
 }
 
 #if ENABLE(NOTIFICATIONS)
 void Notification::taskTimerFired(Timer<Notification>* timer)
 {
     ASSERT(scriptExecutionContext()->isDocument());
-    ASSERT(static_cast<Document*>(scriptExecutionContext())->page());
     ASSERT_UNUSED(timer, timer == m_taskTimer.get());
-    if (NotificationController::from(static_cast<Document*>(scriptExecutionContext())->page())->client()->checkPermission(scriptExecutionContext()) != NotificationClient::PermissionAllowed) {
-        dispatchErrorEvent();
-        return;
-    }
     show();
 }
 #endif
 
 
 #if ENABLE(NOTIFICATIONS)
 const String& Notification::permission(ScriptExecutionContext* context)
 {
     ASSERT(context->isDocument());
     ASSERT(static_cast<Document*>(context)->page());
@@ skipping 23 matching lines @@
 {
     ASSERT(context->isDocument());
     ASSERT(static_cast<Document*>(context)->page());
     NotificationController::from(static_cast<Document*>(context)->page())->client()->requestPermission(context, callback);
 }
 #endif
 
 } // namespace WebCore
 
 #endif // ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)