Remove ActiveDOMObject::stop()

third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.cpp

 /*
  * Copyright (C) 2013 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 88 matching lines @@
   unsigned short code;
   String reason;
 };
 
 DocumentWebSocketChannel::BlobLoader::BlobLoader(
     PassRefPtr<BlobDataHandle> blobDataHandle,
     DocumentWebSocketChannel* channel)
     : m_channel(channel),
       m_loader(
           FileReaderLoader::create(FileReaderLoader::ReadAsArrayBuffer, this)) {
-  m_loader->start(channel->getExecutionContext(), std::move(blobDataHandle));
+  m_loader->start(channel->document(), std::move(blobDataHandle));
 }
 
 void DocumentWebSocketChannel::BlobLoader::cancel() {
   m_loader->cancel();
   // didFail will be called immediately.
   // |this| is deleted here.
 }
 
 void DocumentWebSocketChannel::BlobLoader::didFinishLoading() {
   m_channel->didFinishLoadingBlob(m_loader->arrayBufferResult());
   // |this| is deleted here.
 }
 
 void DocumentWebSocketChannel::BlobLoader::didFail(
     FileError::ErrorCode errorCode) {
   m_channel->didFailLoadingBlob(errorCode);
   // |this| is deleted here.
 }
 
 DocumentWebSocketChannel::DocumentWebSocketChannel(
     Document* document,
     WebSocketChannelClient* client,
     std::unique_ptr<SourceLocation> location,
     WebSocketHandle* handle)
-    : ContextLifecycleObserver(document),
-      m_handle(wrapUnique(handle ? handle : new WebSocketHandleImpl())),
+    : m_handle(wrapUnique(handle ? handle : new WebSocketHandleImpl())),
       m_client(client),
       m_identifier(createUniqueIdentifier()),
+      m_document(document),
       m_sendingQuota(0),
       m_receivedDataSizeForFlowControl(
           receivedDataSizeForFlowControlHighWaterMark * 2)  // initial quota
       ,
       m_sentSizeOfTopMessage(0),
       m_locationAtConstruction(std::move(location)) {}
 
 DocumentWebSocketChannel::~DocumentWebSocketChannel() {
   DCHECK(!m_blobLoader);
 }
@@ skipping 29 matching lines @@
 
   if (document()->frame()) {
     // Initialize the WebSocketHandle with the frame's InterfaceProvider to
     // provide the WebSocket implementation with context about this frame.
     // This is important so that the browser can show UI associated with
     // the WebSocket (e.g., for certificate errors).
     m_handle->initialize(document()->frame()->interfaceProvider());
   } else {
     m_handle->initialize(Platform::current()->interfaceProvider());
   }
-  m_handle->connect(url, protocols, getExecutionContext()->getSecurityOrigin(),
+  m_handle->connect(url, protocols, document()->getSecurityOrigin(),
                     document()->firstPartyForCookies(), document()->userAgent(),
                     this);
 
   flowControlIfNecessary();
   TRACE_EVENT_INSTANT1("devtools.timeline", "WebSocketCreate",
                        TRACE_EVENT_SCOPE_THREAD, "data",
                        InspectorWebSocketCreateEvent::data(
                            document(), m_identifier, url, protocol));
   InspectorInstrumentation::didCreateWebSocket(document(), m_identifier, url,
                                                protocol);
@@ skipping 85 matching lines @@
 void DocumentWebSocketChannel::fail(const String& reason,
                                     MessageLevel level,
                                     std::unique_ptr<SourceLocation> location) {
   NETWORK_DVLOG(1) << this << " fail(" << reason << ")";
   // m_handle and m_client can be null here.
 
   InspectorInstrumentation::didReceiveWebSocketFrameError(document(),
                                                           m_identifier, reason);
   const String message = "WebSocket connection to '" + m_url.elidedString() +
                          "' failed: " + reason;
-  getExecutionContext()->addConsoleMessage(ConsoleMessage::create(
+  document()->addConsoleMessage(ConsoleMessage::create(
       JSMessageSource, level, message, std::move(location)));
 
   if (m_client)
     m_client->didError();
   // |reason| is only for logging and should not be provided for scripts,
   // hence close reason must be empty.
   handleDidClose(false, CloseEventCodeAbnormalClosure, String());
   // handleDidClose may delete this object.
 }
 
@@ skipping 136 matching lines @@
   WebSocketChannelClient* client = m_client;
   m_client = nullptr;
   WebSocketChannelClient::ClosingHandshakeCompletionStatus status =
       wasClean ? WebSocketChannelClient::ClosingHandshakeComplete
                : WebSocketChannelClient::ClosingHandshakeIncomplete;
   client->didClose(status, code, reason);
   // client->didClose may delete this object.
 }
 
 Document* DocumentWebSocketChannel::document() {
-  // This context is always a Document. See the constructor.
-  ExecutionContext* context = getExecutionContext();
-  DCHECK(context->isDocument());
-  return toDocument(context);
+  return m_document;
 }
 
 void DocumentWebSocketChannel::didConnect(WebSocketHandle* handle,
                                           const String& selectedProtocol,
                                           const String& extensions) {
   NETWORK_DVLOG(1) << this << " didConnect(" << handle << ", "
                    << String(selectedProtocol) << ", " << String(extensions)
                    << ")";
 
   DCHECK(m_handle);
@@ skipping 182 matching lines @@
   }
   // FIXME: Generate human-friendly reason message.
   failAsError("Failed to load Blob: error code = " + String::number(errorCode));
   // |this| can be deleted here.
 }
 
 DEFINE_TRACE(DocumentWebSocketChannel) {
   visitor->trace(m_blobLoader);
   visitor->trace(m_messages);
   visitor->trace(m_client);
+  visitor->trace(m_document);
   WebSocketChannel::trace(visitor);
-  ContextLifecycleObserver::trace(visitor);
 }
 
 std::ostream& operator<<(std::ostream& ostream,
                          const DocumentWebSocketChannel* channel) {
   return ostream << "DocumentWebSocketChannel "
                  << static_cast<const void*>(channel);
 }
 
 }  // namespace blink