Reduce SuspendableObjects

third_party/WebKit/Source/modules/eventsource/EventSource.cpp

 /*
  * Copyright (C) 2009, 2012 Ericsson AB. All rights reserved.
  * Copyright (C) 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011, Code Aurora Forum. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 47 matching lines @@
 #include "wtf/text/StringBuilder.h"
 #include <memory>
 
 namespace blink {
 
 const unsigned long long EventSource::defaultReconnectDelay = 3000;
 
 inline EventSource::EventSource(ExecutionContext* context,
                                 const KURL& url,
                                 const EventSourceInit& eventSourceInit)
-    : SuspendableObject(context),
+    : ContextLifecycleObserver(context),
       m_url(url),
       m_currentURL(url),
       m_withCredentials(eventSourceInit.withCredentials()),
       m_state(kConnecting),
       m_connectTimer(this, &EventSource::connectTimerFired),
       m_reconnectDelay(defaultReconnectDelay) {}
 
 EventSource* EventSource::create(ExecutionContext* context,
                                  const String& url,
                                  const EventSourceInit& eventSourceInit,
@@ skipping 25 matching lines @@
     // synchronously before any redirects take place.
     exceptionState.throwSecurityError(
         "Refused to connect to '" + fullURL.elidedString() +
         "' because it violates the document's Content Security Policy.");
     return nullptr;
   }
 
   EventSource* source = new EventSource(context, fullURL, eventSourceInit);
 
   source->scheduleInitialConnect();
-  source->suspendIfNeeded();
   return source;
 }
 
 EventSource::~EventSource() {
   DCHECK_EQ(kClosed, m_state);
   DCHECK(!m_loader);
 }
 
 void EventSource::scheduleInitialConnect() {
   DCHECK_EQ(kConnecting, m_state);
@@ skipping 90 matching lines @@
 
 void EventSource::close() {
   if (m_state == kClosed) {
     DCHECK(!m_loader);
     return;
   }
   if (m_parser)
     m_parser->stop();
 
   // Stop trying to reconnect if EventSource was explicitly closed or if
-  // SuspendableObject::stop() was called.
+  // contextDestroyed() was called.
   if (m_connectTimer.isActive()) {
     m_connectTimer.stop();
   }
 
   if (m_loader) {
     m_loader->cancel();
     m_loader = nullptr;
   }
 
   m_state = kClosed;
 }
 
 const AtomicString& EventSource::interfaceName() const {
   return EventTargetNames::EventSource;
 }
 
 ExecutionContext* EventSource::getExecutionContext() const {
-  return SuspendableObject::getExecutionContext();
+  return ContextLifecycleObserver::getExecutionContext();
 }
 
 void EventSource::didReceiveResponse(
     unsigned long,
     const ResourceResponse& response,
     std::unique_ptr<WebDataConsumerHandle> handle) {
   DCHECK(!handle);
   DCHECK_EQ(kConnecting, m_state);
   DCHECK(m_loader);
 
@@ skipping 118 matching lines @@
 }
 
 bool EventSource::hasPendingActivity() const {
   return m_state != kClosed;
 }
 
 DEFINE_TRACE(EventSource) {
   visitor->trace(m_parser);
   visitor->trace(m_loader);
   EventTargetWithInlineData::trace(visitor);
-  SuspendableObject::trace(visitor);
+  ContextLifecycleObserver::trace(visitor);
   EventSourceParser::Client::trace(visitor);
 }
 
 }  // namespace blink