Remove ActiveDOMObject::stop()

third_party/WebKit/Source/modules/websockets/DOMWebSocket.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 55 matching lines @@
 static const int32_t kBucketCountForMessageSizeHistogram = 50;
 
 namespace blink {
 
 DOMWebSocket::EventQueue::EventQueue(EventTarget* target)
     : m_state(Active),
       m_target(target),
       m_resumeTimer(this, &EventQueue::resumeTimerFired) {}
 
 DOMWebSocket::EventQueue::~EventQueue() {
-  stop();
+  contextDestroyed();
 }
 
 void DOMWebSocket::EventQueue::dispatch(Event* event) {
   switch (m_state) {
     case Active:
       DCHECK(m_events.isEmpty());
       DCHECK(m_target->getExecutionContext());
       m_target->dispatchEvent(event);
       break;
     case Suspended:
@@ skipping 18 matching lines @@
   m_state = Suspended;
 }
 
 void DOMWebSocket::EventQueue::resume() {
   if (m_state != Suspended || m_resumeTimer.isActive())
     return;
 
   m_resumeTimer.startOneShot(0, BLINK_FROM_HERE);
 }
 
-void DOMWebSocket::EventQueue::stop() {
+void DOMWebSocket::EventQueue::contextDestroyed() {
   if (m_state == Stopped)
     return;
 
   m_state = Stopped;
   m_resumeTimer.stop();
   m_events.clear();
 }
 
 void DOMWebSocket::EventQueue::dispatchQueuedEvents() {
   if (m_state != Active)
@@ skipping 518 matching lines @@
 const AtomicString& DOMWebSocket::interfaceName() const {
   return EventTargetNames::DOMWebSocket;
 }
 
 ExecutionContext* DOMWebSocket::getExecutionContext() const {
   return ActiveDOMObject::getExecutionContext();
 }
 
 void DOMWebSocket::contextDestroyed() {
   NETWORK_DVLOG(1) << "WebSocket " << this << " contextDestroyed()";
-  DCHECK(!m_channel);
-  DCHECK_EQ(kClosed, m_state);
-  ActiveDOMObject::contextDestroyed();
+  m_eventQueue->contextDestroyed();
+  if (m_channel) {
+    m_channel->close(WebSocketChannel::CloseEventCodeGoingAway, String());
+    releaseChannel();
+  }
+  if (m_state != kClosed) {
+    m_state = kClosed;
+    logBinaryTypeChangesAfterOpen();
+  }
 }
 
 bool DOMWebSocket::hasPendingActivity() const {
   return m_channel || !m_eventQueue->isEmpty();
 }
 
 void DOMWebSocket::suspend() {
   m_eventQueue->suspend();
 }
 
 void DOMWebSocket::resume() {
   m_eventQueue->resume();
 }
 
-void DOMWebSocket::stop() {
-  m_eventQueue->stop();
-  if (m_channel) {
-    m_channel->close(WebSocketChannel::CloseEventCodeGoingAway, String());
-    releaseChannel();
-  }
-  if (m_state != kClosed) {
-    m_state = kClosed;
-    logBinaryTypeChangesAfterOpen();
-  }
-}
-
 void DOMWebSocket::didConnect(const String& subprotocol,
                               const String& extensions) {
   NETWORK_DVLOG(1) << "WebSocket " << this << " didConnect()";
   if (m_state != kConnecting)
     return;
   m_state = kOpen;
   m_subprotocol = subprotocol;
   m_extensions = extensions;
   m_eventQueue->dispatch(Event::create(EventTypeNames::open));
 }
@@ skipping 169 matching lines @@
 
 DEFINE_TRACE(DOMWebSocket) {
   visitor->trace(m_channel);
   visitor->trace(m_eventQueue);
   WebSocketChannelClient::trace(visitor);
   EventTargetWithInlineData::trace(visitor);
   ActiveDOMObject::trace(visitor);
 }
 
 }  // namespace blink