Index: Source/bindings/v8/custom/V8WindowCustom.cpp |
diff --git a/Source/bindings/v8/custom/V8WindowCustom.cpp b/Source/bindings/v8/custom/V8WindowCustom.cpp |
index e36bc71907d048ae02a82166b234da39d572089b..599490105e5f12c3447d4e6c3113d0b633a84456 100644 |
--- a/Source/bindings/v8/custom/V8WindowCustom.cpp |
+++ b/Source/bindings/v8/custom/V8WindowCustom.cpp |
@@ -126,14 +126,14 @@ void WindowSetTimeoutImpl(const v8::FunctionCallbackInfo<v8::Value>& args, bool |
// params is passed to action, and released in action's destructor |
ASSERT(imp->frame()); |
- action = adoptPtr(new ScheduledAction(imp->frame()->script()->currentWorldContext(), v8::Handle<v8::Function>::Cast(function), paramCount, params.get(), args.GetIsolate())); |
+ action = adoptPtr(new ScheduledAction(imp->frame()->script().currentWorldContext(), v8::Handle<v8::Function>::Cast(function), paramCount, params.get(), args.GetIsolate())); |
} else { |
if (imp->document() && !imp->document()->contentSecurityPolicy()->allowEval()) { |
v8SetReturnValue(args, 0); |
return; |
} |
ASSERT(imp->frame()); |
- action = adoptPtr(new ScheduledAction(imp->frame()->script()->currentWorldContext(), functionString, KURL(), args.GetIsolate())); |
+ action = adoptPtr(new ScheduledAction(imp->frame()->script().currentWorldContext(), functionString, KURL(), args.GetIsolate())); |
} |
int32_t timeout = argumentCount >= 2 ? args[1]->Int32Value() : 0; |
@@ -167,7 +167,7 @@ void V8Window::eventAttributeGetterCustom(v8::Local<v8::String> name, const v8:: |
} |
ASSERT(frame); |
- v8::Local<v8::Context> context = frame->script()->currentWorldContext(); |
+ v8::Local<v8::Context> context = frame->script().currentWorldContext(); |
if (context.IsEmpty()) |
return; |
@@ -192,7 +192,7 @@ void V8Window::eventAttributeSetterCustom(v8::Local<v8::String> name, v8::Local< |
} |
ASSERT(frame); |
- v8::Local<v8::Context> context = frame->script()->currentWorldContext(); |
+ v8::Local<v8::Context> context = frame->script().currentWorldContext(); |
if (context.IsEmpty()) |
return; |
@@ -309,7 +309,7 @@ private: |
inline void DialogHandler::dialogCreated(DOMWindow* dialogFrame) |
{ |
- m_dialogContext = dialogFrame->frame() ? dialogFrame->frame()->script()->currentWorldContext() : v8::Local<v8::Context>(); |
+ m_dialogContext = dialogFrame->frame() ? dialogFrame->frame()->script().currentWorldContext() : v8::Local<v8::Context>(); |
if (m_dialogContext.IsEmpty()) |
return; |
if (m_dialogArguments.IsEmpty()) |
@@ -535,7 +535,7 @@ v8::Handle<v8::Value> toV8(DOMWindow* window, v8::Handle<v8::Object> creationCon |
} |
// Otherwise, return the global object associated with this frame. |
- v8::Handle<v8::Context> context = frame->script()->currentWorldContext(); |
+ v8::Handle<v8::Context> context = frame->script().currentWorldContext(); |
if (context.IsEmpty()) |
return v8Undefined(); |