Reduce ActiveDOMObjects from core/

third_party/WebKit/Source/core/page/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 43 matching lines @@
 #include "platform/network/ResourceResponse.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/WebURLRequest.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 const unsigned long long EventSource::defaultReconnectDelay = 3000;
 
 inline EventSource::EventSource(ExecutionContext* context, const KURL& url, const EventSourceInit& eventSourceInit)
-    : ActiveDOMObject(context)
+    : ContextLifecycleObserver(context)
     , m_url(url)
     , m_withCredentials(eventSourceInit.withCredentials())
     , m_state(CONNECTING)
     , m_connectTimer(this, &EventSource::connectTimerFired)
     , m_reconnectDelay(defaultReconnectDelay)
 {
 }
 
 EventSource* EventSource::create(ExecutionContext* context, const String& url, const EventSourceInit& eventSourceInit, ExceptionState& exceptionState)
 {
     if (url.isEmpty()) {
         exceptionState.throwDOMException(SyntaxError, "Cannot open an EventSource to an empty URL.");
         return nullptr;
     }
 
     KURL fullURL = context->completeURL(url);
     if (!fullURL.isValid()) {
         exceptionState.throwDOMException(SyntaxError, "Cannot open an EventSource to '" + url + "'. The URL is invalid.");
         return nullptr;
     }
 
     // FIXME: Convert this to check the isolated world's Content Security Policy once webkit.org/b/104520 is solved.
     if (!ContentSecurityPolicy::shouldBypassMainWorld(context) && !context->contentSecurityPolicy()->allowConnectToSource(fullURL)) {
         // We can safely expose the URL to JavaScript, as this exception is generate 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()
 {
     ASSERT(m_state == CLOSED);
     ASSERT(!m_loader);
 }
 
 void EventSource::scheduleInitialConnect()
@@ skipping 81 matching lines @@
 
 void EventSource::close()
 {
     if (m_state == CLOSED) {
         ASSERT(!m_loader);
         return;
     }
     if (m_parser)
         m_parser->stop();
 
-    // Stop trying to reconnect if EventSource was explicitly closed or if ActiveDOMObject::stop() was called.
+    // Stop trying to reconnect if EventSource was explicitly closed
+    // or if ContextLifecycleObserver::stop() was called.
     if (m_connectTimer.isActive()) {
         m_connectTimer.stop();
     }
 
     if (m_loader) {
         m_loader->cancel();
         m_loader = nullptr;
     }
 
     m_state = CLOSED;
 }
 
 const AtomicString& EventSource::interfaceName() const
 {
     return EventTargetNames::EventSource;
 }
 
 ExecutionContext* EventSource::executionContext() const
 {
-    return ActiveDOMObject::executionContext();
+    return ContextLifecycleObserver::executionContext();
 }
 
 void EventSource::didReceiveResponse(unsigned long, const ResourceResponse& response, PassOwnPtr<WebDataConsumerHandle> handle)
 {
     ASSERT_UNUSED(handle, !handle);
     ASSERT(m_state == CONNECTING);
     ASSERT(m_loader);
 
     m_eventStreamOrigin = SecurityOrigin::create(response.url())->toString();
     int statusCode = response.httpStatusCode();
@@ skipping 100 matching lines @@
 {
     ASSERT(m_state == CONNECTING);
 
     m_loader = nullptr;
     m_state = CLOSED;
     networkRequestEnded();
 
     dispatchEvent(Event::create(EventTypeNames::error));
 }
 
-void EventSource::stop()
+void EventSource::contextDestroyed()
 {
     close();
 }
 
 bool EventSource::hasPendingActivity() const
 {
     return m_state != CLOSED;
 }
 
 DEFINE_TRACE(EventSource)
 {
     visitor->trace(m_parser);
     RefCountedGarbageCollectedEventTargetWithInlineData::trace(visitor);
-    ActiveDOMObject::trace(visitor);
+    ContextLifecycleObserver::trace(visitor);
     EventSourceParser::Client::trace(visitor);
 }
 
 } // namespace blink