From f949bc20830e28c1a781b5ce60f89d0be3c811a6 Mon Sep 17 00:00:00 2001 From: Roger Wang Date: Fri, 22 Jul 2016 13:20:36 +0800 Subject: [PATCH] fixup! Fix #5061: crash in win.showDevTools() with string id --- src/nw_custom_bindings.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nw_custom_bindings.cc b/src/nw_custom_bindings.cc index 621b4a2c6b..570a36b6bb 100644 --- a/src/nw_custom_bindings.cc +++ b/src/nw_custom_bindings.cc @@ -293,15 +293,15 @@ void NWCustomBindings::SetDevToolsJail(const v8::FunctionCallbackInfo v8::Isolate* isolate = args.GetIsolate(); if (!args.Length()) return; - v8::Handle frm = v8::Handle::Cast(args[0]); content::RenderFrame* render_frame = context()->GetRenderFrame(); if (!render_frame) return; WebFrame* main_frame = render_frame->GetWebFrame(); - if (frm->IsNull() || frm->IsUndefined()) { + if (args[0]->IsNull() || args[0]->IsUndefined()) { main_frame->setDevtoolsJail(NULL); }else{ - blink::HTMLIFrameElement* iframe = blink::V8HTMLIFrameElement::toImpl(frm); + v8::Handle frm = v8::Handle::Cast(args[0]); + blink::HTMLIFrameElement* iframe = blink::V8HTMLIFrameElement::toImpl(frm); main_frame->setDevtoolsJail(blink::WebFrame::fromFrame(iframe->contentFrame())); } args.GetReturnValue().Set(v8::Undefined(isolate));