Revert "Extract ContextLifecycleNotifier from ScriptExecutionContext."

Source/core/dom/ContextDestructionObserver.cpp

 /*
  * Copyright (C) 2008 Apple 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 13 matching lines @@
  *
  */
 
 #include "config.h"
 #include "core/dom/ContextDestructionObserver.h"
 
 #include "core/dom/ScriptExecutionContext.h"
 
 namespace WebCore {
 
-ContextDestructionObserver::ContextDestructionObserver(ScriptExecutionContext* scriptExecutionContext, Type type)
+ContextDestructionObserver::ContextDestructionObserver(ScriptExecutionContext* scriptExecutionContext)
     : m_scriptExecutionContext(0)
 {
-    observeContext(scriptExecutionContext, type);
+    observeContext(scriptExecutionContext);
 }
 
 ContextDestructionObserver::~ContextDestructionObserver()
 {
-    if (m_scriptExecutionContext)
-        observeContext(0, GenericType);
+    observeContext(0);
 }
 
-void ContextDestructionObserver::observeContext(ScriptExecutionContext* scriptExecutionContext, Type as)
+void ContextDestructionObserver::observeContext(ScriptExecutionContext* scriptExecutionContext)
 {
     if (m_scriptExecutionContext) {
         ASSERT(m_scriptExecutionContext->isContextThread());
-        m_scriptExecutionContext->wasUnobservedBy(this, as);
+        m_scriptExecutionContext->willDestroyDestructionObserver(this);
     }
 
     m_scriptExecutionContext = scriptExecutionContext;
 
     if (m_scriptExecutionContext) {
         ASSERT(m_scriptExecutionContext->isContextThread());
-        m_scriptExecutionContext->wasObservedBy(this, as);
+        m_scriptExecutionContext->didCreateDestructionObserver(this);
     }
 }
 
 void ContextDestructionObserver::contextDestroyed()
 {
     m_scriptExecutionContext = 0;
 }
 
 } // namespace WebCore