| Index: Source/bindings/v8/ActiveDOMCallback.cpp
|
| diff --git a/Source/bindings/v8/ActiveDOMCallback.cpp b/Source/bindings/v8/ActiveDOMCallback.cpp
|
| index 19d908ad1b622b376ecafda7b281bed6a99d5c78..fcf0f36151d794fdbff7fbc4cc076bd502f6186b 100644
|
| --- a/Source/bindings/v8/ActiveDOMCallback.cpp
|
| +++ b/Source/bindings/v8/ActiveDOMCallback.cpp
|
| @@ -33,7 +33,7 @@
|
|
|
| #include "core/dom/ActiveDOMObject.h"
|
| #include "core/dom/ScriptExecutionContext.h"
|
| -#include "core/workers/WorkerContext.h"
|
| +#include "core/workers/WorkerGlobalScope.h"
|
|
|
| namespace WebCore {
|
|
|
| @@ -55,8 +55,8 @@ bool ActiveDOMCallback::canInvokeCallback() const
|
| bool ActiveDOMCallback::isScriptControllerTerminating() const
|
| {
|
| ScriptExecutionContext* context = scriptExecutionContext();
|
| - if (context && context->isWorkerContext()) {
|
| - WorkerScriptController* scriptController = static_cast<WorkerContext*>(context)->script();
|
| + if (context && context->isWorkerGlobalScope()) {
|
| + WorkerScriptController* scriptController = static_cast<WorkerGlobalScope*>(context)->script();
|
| if (!scriptController || scriptController->isExecutionForbidden() || scriptController->isExecutionTerminating())
|
| return true;
|
| }
|
|
|