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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java

Issue 2706933003: webapk: Avoid overwriting default CreationParams
Patch Set: rebase 461342 Created 3 years, 9 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: chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java
index bdbec527b24b2f30f3950532037716a1059dc248..c330fc49b50823d326aa0e4b1631362e93f73e57 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java
@@ -14,6 +14,7 @@ import android.view.WindowManager;
import org.chromium.base.VisibleForTesting;
import org.chromium.base.annotations.JNINamespace;
+import org.chromium.base.process_launcher.ChildProcessCreationParams;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.WebContentsFactory;
import org.chromium.chrome.browser.profiles.Profile;
@@ -49,10 +50,11 @@ public class ExternalPrerenderHandler {
* {@code null} if unsuccessful.
*/
public Pair<WebContents, WebContents> addPrerender(Profile profile, String url, String referrer,
- Rect bounds, boolean prerenderOnCellular) {
- WebContents dummyWebContents = WebContentsFactory.createWebContents(false, false);
- WebContents prerenderingWebContents =
- addPrerender(profile, dummyWebContents, url, referrer, bounds, prerenderOnCellular);
+ Rect bounds, boolean prerenderOnCellular, int childProcessParamId) {
+ WebContents dummyWebContents =
+ WebContentsFactory.createWebContents(childProcessParamId, false, false);
+ WebContents prerenderingWebContents = addPrerender(profile, dummyWebContents, url, referrer,
+ bounds, prerenderOnCellular, childProcessParamId);
if (dummyWebContents == null) return null;
if (prerenderingWebContents != null) {
return Pair.create(dummyWebContents, prerenderingWebContents);
@@ -75,7 +77,8 @@ public class ExternalPrerenderHandler {
* @return The prerendering {@link WebContents} owned by PrerenderManager.
*/
public WebContents addPrerender(Profile profile, WebContents webContents, String url,
- String referrer, Rect bounds, boolean prerenderOnCellular) {
+ String referrer, Rect bounds, boolean prerenderOnCellular, int childProcessParamId) {
+ if (childProcessParamId != ChildProcessCreationParams.DEFAULT_ID) return null;
return nativeAddPrerender(mNativeExternalPrerenderHandler, profile, webContents, url,
referrer, bounds.top, bounds.left, bounds.bottom, bounds.right,
prerenderOnCellular);

Powered by Google App Engine
This is Rietveld 408576698