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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.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/WarmupManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
index 4bda45bf4a703bcb7f2c3d1486bd1856026e6cb9..21d0bcce8cc4bb4652940b4a14b2882662bd7492 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
@@ -19,6 +19,7 @@ import org.chromium.base.Log;
import org.chromium.base.SysUtils;
import org.chromium.base.ThreadUtils;
import org.chromium.base.TraceEvent;
+import org.chromium.base.process_launcher.ChildProcessCreationParams;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
import org.chromium.chrome.browser.profiles.Profile;
@@ -220,7 +221,8 @@ public final class WarmupManager {
public void createSpareWebContents() {
ThreadUtils.assertOnUiThread();
if (mSpareWebContents != null || SysUtils.isLowEndDevice()) return;
- mSpareWebContents = WebContentsFactory.createWebContentsWithWarmRenderer(false, false);
+ mSpareWebContents = WebContentsFactory.createWebContentsWithWarmRenderer(
+ ChildProcessCreationParams.DEFAULT_ID, false, false);
}
/**
@@ -240,9 +242,13 @@ public final class WarmupManager {
*
* @return a WebContents, or null.
*/
- public WebContents takeSpareWebContents(boolean incognito, boolean initiallyHidden) {
+ public WebContents takeSpareWebContents(
+ boolean incognito, boolean initiallyHidden, int childProcessParamId) {
ThreadUtils.assertOnUiThread();
- if (incognito || initiallyHidden) return null;
+ if (incognito || initiallyHidden
+ || childProcessParamId != ChildProcessCreationParams.DEFAULT_ID) {
+ return null;
+ }
WebContents result = mSpareWebContents;
mSpareWebContents = null;
return result;

Powered by Google App Engine
This is Rietveld 408576698