content/browser/web_contents/web_contents_android.cc - Issue 570783002: Fix but that ignored startRenderer in WebContentsImpl.java

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/web_contents/web_contents_android.cc

Issue 570783002: Fix but that ignored startRenderer in WebContentsImpl.java (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove startRenderer Created 6 years, 3 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

« no previous file with comments | « content/browser/web_contents/web_contents_android.h ('k') | content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_android.cc

diff --git a/content/browser/web_contents/web_contents_android.cc b/content/browser/web_contents/web_contents_android.cc

index a007f21a7e59a138faf7cb73bbf950b468759164..db0cc588ba55d3afe54ddeb0217a6da68b5cc4de 100644

--- a/content/browser/web_contents/web_contents_android.cc

+++ b/content/browser/web_contents/web_contents_android.cc

@@ -343,12 +343,11 @@ void WebContentsAndroid::DidStartNavigationTransitionForFrame(int64 frame_id) {

void WebContentsAndroid::EvaluateJavaScript(JNIEnv* env,

jobject obj,

jstring script,

- jobject callback,

- jboolean start_renderer) {

+ jobject callback) {

RenderViewHost* rvh = web_contents_->GetRenderViewHost();

DCHECK(rvh);

- if (start_renderer && !rvh->IsRenderViewLive()) {

+ if (!rvh->IsRenderViewLive()) {

if (!static_cast<WebContentsImpl*>(web_contents_)->

CreateRenderViewForInitialEmptyDocument()) {

LOG(ERROR) << "Failed to create RenderView in EvaluateJavaScript";