Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(750)

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 518583003: Don't take a fake UGI every time we execute Javascript. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 54ba0cf2a32d6da8b6b6874d701b9a2023e6153d..c2ee02b2330c360bef458076e881eec2850ff8b8 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -255,7 +255,7 @@ void RenderFrameHostImpl::ExecuteJavaScript(
const base::string16& javascript) {
Send(new FrameMsg_JavaScriptExecuteRequest(routing_id_,
javascript,
- 0, false));
+ 0, false, false));
}
void RenderFrameHostImpl::ExecuteJavaScript(
@@ -265,10 +265,17 @@ void RenderFrameHostImpl::ExecuteJavaScript(
int key = next_id++;
Send(new FrameMsg_JavaScriptExecuteRequest(routing_id_,
javascript,
- key, true));
+ key, true, false));
javascript_callbacks_.insert(std::make_pair(key, callback));
}
+void RenderFrameHostImpl::ExecuteJavaScriptForTests(
+ const base::string16& javascript) {
+ Send(new FrameMsg_JavaScriptExecuteRequest(routing_id_,
+ javascript,
+ 0, false, true));
+}
+
RenderViewHost* RenderFrameHostImpl::GetRenderViewHost() {
return render_view_host_;
}

Powered by Google App Engine
This is Rietveld 408576698