Replace Timers used in ActiveDOMObject with AsyncMethodRunner

Source/modules/websockets/WebSocket.cpp

 /*
  * Copyright (C) 2011 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 122 matching lines @@
 
 WebSocket::WebSocket(ExecutionContext* context)
     : ActiveDOMObject(context)
     , m_state(CONNECTING)
     , m_bufferedAmount(0)
     , m_bufferedAmountAfterClose(0)
     , m_binaryType(BinaryTypeBlob)
     , m_subprotocol("")
     , m_extensions("")
     , m_stopped(false)
-    , m_timerForDeferredDropProtection(this, &WebSocket::dropProtection)
+    , m_dropProtectionRunner(this, &WebSocket::dropProtection)
 {
     ScriptWrappable::init(this);
 }
 
 WebSocket::~WebSocket()
 {
     if (m_channel)
         m_channel->disconnect();
 }
 
@@ skipping 317 matching lines @@
     if (m_channel)
         m_channel->suspend();
 }
 
 void WebSocket::resume()
 {
     if (m_channel)
         m_channel->resume();
 }
 
-void WebSocket::dropProtection(Timer<WebSocket>*)
+void WebSocket::dropProtection()
 {
     unsetPendingActivity(this);
 }
 
 void WebSocket::stop()
 {
     m_stopped = true;
 
     if (!hasPendingActivity()) {
         ASSERT(!m_channel);
         ASSERT(m_state == CLOSED);
         return;
     }
     if (m_channel) {
         m_channel->close(WebSocketChannel::CloseEventCodeGoingAway, String());
         m_channel->disconnect();
         m_channel = 0;
     }
     m_state = CLOSED;
 
     ActiveDOMObject::stop();
 
     // ContextLifecycleNotifier is iterating over the set of ActiveDOMObject
     // instances. Deleting this WebSocket instance synchronously leads to
     // ContextLifecycleNotifier::removeObserver() call which is prohibited
     // to be called during iteration. Defer it.
-    if (m_timerForDeferredDropProtection.isActive())
-        return;
-    m_timerForDeferredDropProtection.startOneShot(0);
+    m_dropProtectionRunner.runAsync();
 }
 
 void WebSocket::didConnect()
 {
     LOG(Network, "WebSocket %p didConnect()", this);
     if (m_state != CONNECTING)
         return;
     m_state = OPEN;
     m_subprotocol = m_channel->subprotocol();
     m_extensions = m_channel->extensions();
@@ skipping 97 matching lines @@
     static const size_t minimumPayloadSizeWithEightByteExtendedPayloadLength = 0x10000;
     size_t overhead = hybiBaseFramingOverhead + hybiMaskingKeyLength;
     if (payloadSize >= minimumPayloadSizeWithEightByteExtendedPayloadLength)
         overhead += 8;
     else if (payloadSize >= minimumPayloadSizeWithTwoByteExtendedPayloadLength)
         overhead += 2;
     return overhead;
 }
 
 } // namespace WebCore