Remove ActiveDOMObject::willStop, and introduce WorkerGlobalScope::TerminationObserver.

Source/core/workers/WorkerGlobalScope.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009, 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 66 matching lines @@
 WorkerGlobalScope::WorkerGlobalScope(const KURL& url, const String& userAgent, WorkerThread* thread, double timeOrigin, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients)
     : m_url(url)
     , m_userAgent(userAgent)
     , m_script(adoptPtr(new WorkerScriptController(*this)))
     , m_thread(thread)
     , m_workerInspectorController(adoptPtr(new WorkerInspectorController(this)))
     , m_closing(false)
     , m_eventQueue(WorkerEventQueue::create(this))
     , m_workerClients(workerClients)
     , m_timeOrigin(timeOrigin)
+    , m_terminationObserver(nullptr)
 {
     ScriptWrappable::init(this);
     setClient(this);
     setSecurityOrigin(SecurityOrigin::create(url));
     m_workerClients->reattachThread();
 }
 
 WorkerGlobalScope::~WorkerGlobalScope()
 {
 }
@@ skipping 80 matching lines @@
 void WorkerGlobalScope::postTask(PassOwnPtr<ExecutionContextTask> task)
 {
     thread()->runLoop().postTask(task);
 }
 
 void WorkerGlobalScope::clearInspector()
 {
     m_workerInspectorController.clear();
 }
 
-void WorkerGlobalScope::willStopActiveDOMObjects()
+void WorkerGlobalScope::registerTerminationObserver(TerminationObserver* observer)
 {
-    lifecycleNotifier().notifyWillStopActiveDOMObjects();
+    ASSERT(!m_terminationObserver);
+    ASSERT(observer);
+    m_terminationObserver = observer;
+}
+
+void WorkerGlobalScope::unregisterTerminationObserver(TerminationObserver* observer)
+{
+    ASSERT(observer);
+    ASSERT(m_terminationObserver == observer);
+    m_terminationObserver = nullptr;
+}
+
+void WorkerGlobalScope::wasRequestedToTerminate()
+{

[haraken, 2014/04/23 08:53:55]

Shall we add ASSERT(isMainThread()) ?

[tkent, 2014/04/23 09:13:35]

I'm not 100% sure this is always in the main thread.

+    if (m_terminationObserver)
+        m_terminationObserver->wasRequestedToTerminate();
 }
 
 void WorkerGlobalScope::dispose()
 {
     ASSERT(thread()->isCurrentThread());
 
     clearScript();
     clearInspector();
     setClient(0);
 
@@ skipping 107 matching lines @@
 void WorkerGlobalScope::trace(Visitor* visitor)
 {
     visitor->trace(m_console);
     visitor->trace(m_location);
     visitor->trace(m_navigator);
     visitor->trace(m_workerClients);
     WillBeHeapSupplementable<WorkerGlobalScope>::trace(visitor);
 }
 
 } // namespace WebCore