Index: Source/bindings/v8/custom/V8WindowCustom.cpp |
diff --git a/Source/bindings/v8/custom/V8WindowCustom.cpp b/Source/bindings/v8/custom/V8WindowCustom.cpp |
index 100a1bf779367ae0279fca3afd2e808ea81f4df8..415b0065d1585345b3244fda88211b8faca94981 100644 |
--- a/Source/bindings/v8/custom/V8WindowCustom.cpp |
+++ b/Source/bindings/v8/custom/V8WindowCustom.cpp |
@@ -317,7 +317,7 @@ public: |
} |
void dialogCreated(DOMWindow*); |
- v8::Handle<v8::Value> returnValue() const; |
+ v8::Handle<v8::Value> returnValue(v8::Isolate*) const; |
private: |
v8::Handle<v8::Value> m_dialogArguments; |
@@ -335,14 +335,14 @@ inline void DialogHandler::dialogCreated(DOMWindow* dialogFrame) |
m_dialogContext->Global()->Set(v8::String::NewSymbol("dialogArguments"), m_dialogArguments); |
} |
-inline v8::Handle<v8::Value> DialogHandler::returnValue() const |
+inline v8::Handle<v8::Value> DialogHandler::returnValue(v8::Isolate* isolate) const |
{ |
if (m_dialogContext.IsEmpty()) |
- return v8::Undefined(); |
+ return v8::Undefined(isolate); |
v8::Context::Scope scope(m_dialogContext); |
v8::Handle<v8::Value> returnValue = m_dialogContext->Global()->Get(v8::String::NewSymbol("returnValue")); |
if (returnValue.IsEmpty()) |
- return v8::Undefined(); |
+ return v8::Undefined(isolate); |
return returnValue; |
} |
@@ -367,7 +367,7 @@ void V8Window::showModalDialogMethodCustom(const v8::FunctionCallbackInfo<v8::Va |
impl->showModalDialog(urlString, dialogFeaturesString, activeDOMWindow(), firstDOMWindow(), setUpDialog, &handler); |
- v8SetReturnValue(args, handler.returnValue()); |
+ v8SetReturnValue(args, handler.returnValue(args.GetIsolate())); |
} |
void V8Window::openMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args) |