github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-02-07 05:35:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

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