mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: RFH->ExecuteJavascript now requires a callback

Browse source 
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1492042
This commit is contained in:
Samuel Attard 2019-03-21 20:04:24 -07:00
parent 2bf740d2fe
commit f95de3d6f3
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/ui/inspectable_web_contents_impl.cc
View file

@ -429,7 +429,7 @@ void InspectableWebContentsImpl::CallClientFunction(
} }
javascript.append(");"); javascript.append(");");
GetDevToolsWebContents()->GetMainFrame()->ExecuteJavaScript( GetDevToolsWebContents()->GetMainFrame()->ExecuteJavaScript(
base::UTF8ToUTF16(javascript)); base::UTF8ToUTF16(javascript), base::NullCallback());
} }
gfx::Rect InspectableWebContentsImpl::GetDevToolsBounds() const { gfx::Rect InspectableWebContentsImpl::GetDevToolsBounds() const {
@ -476,7 +476,8 @@ void InspectableWebContentsImpl::LoadCompleted() {
} }
base::string16 javascript = base::UTF8ToUTF16( base::string16 javascript = base::UTF8ToUTF16(
"Components.dockController.setDockSide(\"" + dock_state_ + "\");"); "Components.dockController.setDockSide(\"" + dock_state_ + "\");");
GetDevToolsWebContents()->GetMainFrame()->ExecuteJavaScript(javascript); GetDevToolsWebContents()->GetMainFrame()->ExecuteJavaScript(
javascript, base::NullCallback());
} }
if (view_->GetDelegate()) if (view_->GetDelegate())
@ -738,7 +739,8 @@ void InspectableWebContentsImpl::DispatchProtocolMessage(
if (message.length() < kMaxMessageChunkSize) { if (message.length() < kMaxMessageChunkSize) {
base::string16 javascript = base::string16 javascript =
base::UTF8ToUTF16("DevToolsAPI.dispatchMessage(" + message + ");"); base::UTF8ToUTF16("DevToolsAPI.dispatchMessage(" + message + ");");
GetDevToolsWebContents()->GetMainFrame()->ExecuteJavaScript(javascript); GetDevToolsWebContents()->GetMainFrame()->ExecuteJavaScript(
javascript, base::NullCallback());
return; return;
} }