| Index: Source/core/dom/ContextDestructionObserver.cpp
|
| diff --git a/Source/core/dom/ContextDestructionObserver.cpp b/Source/core/dom/ContextDestructionObserver.cpp
|
| index db2b38bd240465385f936fe5f231e1e579a780e1..6750d80d7c92f2aedfd11e791863f624b66bbc14 100644
|
| --- a/Source/core/dom/ContextDestructionObserver.cpp
|
| +++ b/Source/core/dom/ContextDestructionObserver.cpp
|
| @@ -31,30 +31,29 @@
|
|
|
| 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);
|
| }
|
| }
|
|
|
|
|