Replace Timers used in ActiveDOMObject with AsyncMethodRunner

Source/modules/notifications/Notification.cpp

+

[abarth-chromium, 2013/10/22 18:46:51]

supurious?

[tyoshino (SeeGerritForStatus), 2013/10/23 06:02:30]

oh, mistake. removed

 /*
  * 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 69 matching lines @@
         es.throwDOMException(SyntaxError, ExceptionMessages::failedToExecute("createNotification", "NotificationCenter", "'" + iconURI + "' is not a valid icon URL."));
         return;
     }
 }
 #endif
 
 Notification::Notification(ExecutionContext* context, const String& title)
     : ActiveDOMObject(context)
     , m_title(title)
     , m_state(Idle)
-    , m_taskTimer(adoptPtr(new Timer<Notification>(this, &Notification::taskTimerFired)))
+    , m_asyncRunner(adoptPtr(new AsyncMethodRunner<Notification>(this, &Notification::showSoon)))
 {
     ScriptWrappable::init(this);
 
     m_notificationClient = NotificationController::clientFrom(toDocument(context)->page());
     ASSERT(m_notificationClient);
 
-    m_taskTimer->startOneShot(0);
+    m_asyncRunner->runAsync();
 }
 
 Notification::~Notification()
 {
 }
 
 #if ENABLE(LEGACY_NOTIFICATIONS)
 PassRefPtr<Notification> Notification::create(const String& title, const String& body, const String& iconURI, ExecutionContext* context, ExceptionState& es, PassRefPtr<NotificationCenter> provider)
 {
     RefPtr<Notification> notification(adoptRef(new Notification(title, body, iconURI, context, es, provider)));
@@ skipping 92 matching lines @@
 {
     dispatchEvent(Event::create(EventTypeNames::close));
     finalize();
 }
 
 void Notification::dispatchErrorEvent()
 {
     dispatchEvent(Event::create(EventTypeNames::error));
 }
 
-void Notification::taskTimerFired(Timer<Notification>* timer)
+void Notification::showSoon()
 {
     ASSERT(executionContext()->isDocument());
-    ASSERT_UNUSED(timer, timer == m_taskTimer.get());
     show();
 }
 
 bool Notification::dispatchEvent(PassRefPtr<Event> event)
 {
     // Do not dispatch if the context is gone.
     if (!executionContext())
         return false;
 
     return EventTarget::dispatchEvent(event);
@@ skipping 24 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