| 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 e34a8b21e095d66fdae733400edb334962736de8..70d382e8d2c4c4986632a381a9311a53b18a1184 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp
|
| @@ -831,7 +831,7 @@ v8::Local<v8::Context> toV8Context(ExecutionContext* context,
|
| return v8::Local<v8::Context>();
|
| }
|
|
|
| -v8::Local<v8::Context> toV8Context(Frame* frame, DOMWrapperWorld& world) {
|
| +v8::Local<v8::Context> toV8Context(LocalFrame* frame, DOMWrapperWorld& world) {
|
| if (!frame)
|
| return v8::Local<v8::Context>();
|
| v8::Local<v8::Context> context = toV8ContextEvenIfDetached(frame, world);
|
| @@ -845,10 +845,10 @@ v8::Local<v8::Context> toV8Context(Frame* frame, DOMWrapperWorld& world) {
|
| return v8::Local<v8::Context>();
|
| }
|
|
|
| -v8::Local<v8::Context> toV8ContextEvenIfDetached(Frame* frame,
|
| +v8::Local<v8::Context> toV8ContextEvenIfDetached(LocalFrame* frame,
|
| DOMWrapperWorld& world) {
|
| ASSERT(frame);
|
| - return frame->windowProxy(world)->contextIfInitialized();
|
| + return frame->script().windowProxy(world)->contextIfInitialized();
|
| }
|
|
|
| void crashIfIsolateIsDead(v8::Isolate* isolate) {
|
|
|