Revert of Remove support for legacy WebKit Notifications

Source/modules/notifications/Notification.cpp

 /*
- * Copyright (C) 2013 Google Inc. All rights reserved.
+ * 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.
  *     * Redistributions in binary form must reproduce the above
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
@@ skipping 14 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/notifications/Notification.h"
 
 #include "bindings/v8/Dictionary.h"
 #include "bindings/v8/ScriptWrappable.h"
 #include "core/dom/Document.h"
-#include "core/page/WindowFocusAllowedIndicator.h"
-#include "modules/notifications/NotificationClient.h"
+#include "core/dom/ExecutionContext.h"
 #include "modules/notifications/NotificationController.h"
 
 namespace WebCore {
 
 PassRefPtrWillBeRawPtr<Notification> Notification::create(ExecutionContext* context, const String& title, const Dictionary& options)
 {
     NotificationClient* client = NotificationController::clientFrom(toDocument(context)->page());
-    RefPtrWillBeRawPtr<Notification> notification = adoptRefWillBeRefCountedGarbageCollected(new Notification(title, context, client));
+    RefPtrWillBeRawPtr<Notification> notification = adoptRefWillBeRefCountedGarbageCollected(new Notification(context, title, client));
 
     String argument;
     if (options.get("body", argument))
         notification->setBody(argument);
     if (options.get("tag", argument))
         notification->setTag(argument);
     if (options.get("lang", argument))
         notification->setLang(argument);
     if (options.get("dir", argument))
         notification->setDir(argument);
     if (options.get("icon", argument)) {
         KURL iconUrl = argument.isEmpty() ? KURL() : context->completeURL(argument);
         if (!iconUrl.isEmpty() && iconUrl.isValid())
             notification->setIconUrl(iconUrl);
     }
 
     notification->suspendIfNeeded();
     return notification.release();
 }
 
-Notification::Notification(const String& title, ExecutionContext* context, NotificationClient* client)
-    : ActiveDOMObject(context)
-    , m_title(title)
-    , m_dir("auto")
-    , m_state(Idle)
-    , m_client(client)
+Notification::Notification(ExecutionContext* context, const String& title, NotificationClient* client)
+    : NotificationBase(title, context, client)
     , m_asyncRunner(adoptPtr(new AsyncMethodRunner<Notification>(this, &Notification::showSoon)))
 {
-    ASSERT(m_client);
     ScriptWrappable::init(this);
 
     m_asyncRunner->runAsync();
 }
 
 Notification::~Notification()
 {
 }
 
-void Notification::show()
-{
-    // 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_client->show(this)) {
-            m_state = Showing;
-        }
-    }
-}
-
-void Notification::close()
-{
-    switch (m_state) {
-    case Idle:
-        break;
-    case Showing:
-        m_client->cancel(this);
-        break;
-    case Closed:
-        break;
-    }
-}
-
-void Notification::dispatchShowEvent()
-{
-    dispatchEvent(Event::create(EventTypeNames::show));
-}
-
-void Notification::dispatchClickEvent()
-{
-    UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
-    WindowFocusAllowedIndicator windowFocusAllowed;
-    dispatchEvent(Event::create(EventTypeNames::click));
-}
-
-void Notification::dispatchErrorEvent()
-{
-    dispatchEvent(Event::create(EventTypeNames::error));
-}
-
-void Notification::dispatchCloseEvent()
-{
-    dispatchEvent(Event::create(EventTypeNames::close));
-    m_state = Closed;
-}
-
-TextDirection Notification::direction() const
-{
-    // FIXME: Resolve dir()=="auto" against the document.
-    return dir() == "rtl" ? RTL : LTR;
-}
-
-const String& Notification::permissionString(NotificationClient::Permission permission)
-{
-    DEFINE_STATIC_LOCAL(const String, allowedPermission, ("granted"));
-    DEFINE_STATIC_LOCAL(const String, deniedPermission, ("denied"));
-    DEFINE_STATIC_LOCAL(const String, defaultPermission, ("default"));
-
-    switch (permission) {
-    case NotificationClient::PermissionAllowed:
-        return allowedPermission;
-    case NotificationClient::PermissionDenied:
-        return deniedPermission;
-    case NotificationClient::PermissionNotAllowed:
-        return defaultPermission;
-    }
-
-    ASSERT_NOT_REACHED();
-    return deniedPermission;
-}
-
 const String& Notification::permission(ExecutionContext* context)
 {
     ASSERT(toDocument(context)->page());
     return permissionString(NotificationController::from(toDocument(context)->page())->client()->checkPermission(context));
 }
 
 void Notification::requestPermission(ExecutionContext* context, PassOwnPtr<NotificationPermissionCallback> callback)
 {
     ASSERT(toDocument(context)->page());
     NotificationController::from(toDocument(context)->page())->client()->requestPermission(context, callback);
 }
 
-bool Notification::dispatchEvent(PassRefPtr<Event> event)
-{
-    // Do not dispatch if the context is gone.
-    if (!executionContext())
-        return false;
-
-    return EventTarget::dispatchEvent(event);
-}
-
 const AtomicString& Notification::interfaceName() const
 {
     return EventTargetNames::Notification;
 }
 
 void Notification::stop()
 {
-    if (m_client)
-        m_client->notificationObjectDestroyed(this);
-
+    NotificationBase::stop();
     if (m_asyncRunner)
         m_asyncRunner->stop();
-
-    m_client = 0;
-    m_state = Closed;
 }
 
 bool Notification::hasPendingActivity() const
 {
-    return m_state == Showing || (m_asyncRunner && m_asyncRunner->isActive());
+    return NotificationBase::hasPendingActivity() || (m_asyncRunner && m_asyncRunner->isActive());
 }
 
 void Notification::showSoon()
 {
     ASSERT(executionContext()->isDocument());
     show();
 }
 
 } // namespace WebCore