| Index: Source/bindings/v8/V8Binding.cpp
|
| diff --git a/Source/bindings/v8/V8Binding.cpp b/Source/bindings/v8/V8Binding.cpp
|
| index 93f7167a1fcdd3619a403b4c7d001d730da3efa0..fff76b945dd1343e25aedae47087a11eb7fc7452 100644
|
| --- a/Source/bindings/v8/V8Binding.cpp
|
| +++ b/Source/bindings/v8/V8Binding.cpp
|
| @@ -311,6 +311,10 @@ DOMWindow* toDOMWindow(v8::Handle<v8::Context> context)
|
| if (!window.IsEmpty())
|
| return V8DOMWindow::toNative(window);
|
| window = global->FindInstanceInPrototypeChain(V8DOMWindow::GetTemplate(context->GetIsolate(), IsolatedWorld));
|
| + if (window.IsEmpty()) {
|
| + // TODO(jacobr): find a better solution.
|
| + return toDOMWindow(v8::Context::GetEntered());
|
| + }
|
| ASSERT(!window.IsEmpty());
|
| return V8DOMWindow::toNative(window);
|
| }
|
|
|