Index: third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp |
diff --git a/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp b/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp |
index 2511fed997fea08cadb67a20585b8969ea65230d..c0a1eec1c2cf606b81721fc6d5303e1cf9a5b3e0 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp |
+++ b/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp |
@@ -852,7 +852,9 @@ v8::Local<v8::Context> toV8Context(Frame* frame, DOMWrapperWorld& world) { |
v8::Local<v8::Context> toV8ContextEvenIfDetached(Frame* frame, |
DOMWrapperWorld& world) { |
ASSERT(frame); |
- return frame->windowProxy(world)->contextIfInitialized(); |
+ // Note: despite the name of this function, it's not actually safe to call |
+ // this on a detached frame. |
+ return frame->getWindowProxyManager()->context(world); |
} |
void crashIfIsolateIsDead(v8::Isolate* isolate) { |