| Index: Source/bindings/core/v8/V8Binding.cpp
|
| diff --git a/Source/bindings/core/v8/V8Binding.cpp b/Source/bindings/core/v8/V8Binding.cpp
|
| index d88c13f1b036e7e0ce61c064dd3b4e3d61f806f0..ca29cd9da180b3628fadb832c29a575dea794fd6 100644
|
| --- a/Source/bindings/core/v8/V8Binding.cpp
|
| +++ b/Source/bindings/core/v8/V8Binding.cpp
|
| @@ -39,9 +39,9 @@
|
| #include "bindings/core/v8/V8NodeFilterCondition.h"
|
| #include "bindings/core/v8/V8ObjectConstructor.h"
|
| #include "bindings/core/v8/V8Window.h"
|
| -#include "bindings/core/v8/V8WindowShell.h"
|
| #include "bindings/core/v8/V8WorkerGlobalScope.h"
|
| #include "bindings/core/v8/V8XPathNSResolver.h"
|
| +#include "bindings/core/v8/WindowProxy.h"
|
| #include "bindings/core/v8/WorkerScriptController.h"
|
| #include "bindings/core/v8/custom/V8CustomXPathNSResolver.h"
|
| #include "core/dom/Document.h"
|
| @@ -732,7 +732,7 @@ v8::Local<v8::Context> toV8Context(ExecutionContext* context, DOMWrapperWorld& w
|
| ASSERT(context);
|
| if (context->isDocument()) {
|
| if (LocalFrame* frame = toDocument(context)->frame())
|
| - return frame->script().windowShell(world)->context();
|
| + return frame->script().windowProxy(world)->context();
|
| } else if (context->isWorkerGlobalScope()) {
|
| if (WorkerScriptController* script = toWorkerGlobalScope(context)->script())
|
| return script->context();
|
| @@ -744,7 +744,7 @@ v8::Local<v8::Context> toV8Context(LocalFrame* frame, DOMWrapperWorld& world)
|
| {
|
| if (!frame)
|
| return v8::Local<v8::Context>();
|
| - v8::Local<v8::Context> context = frame->script().windowShell(world)->context();
|
| + v8::Local<v8::Context> context = frame->script().windowProxy(world)->context();
|
| if (context.IsEmpty())
|
| return v8::Local<v8::Context>();
|
| LocalFrame* attachedFrame= toFrameIfNotDetached(context);
|
|
|