webapk: Avoid overwriting default CreationParams

chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser;
 
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.StrictMode;
 import android.view.ContextThemeWrapper;
 import android.view.InflateException;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewStub;
 import android.widget.FrameLayout;
 
 import org.chromium.base.Log;
 import org.chromium.base.SysUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.TraceEvent;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.widget.ControlContainer;
+import org.chromium.content.browser.ChildProcessCreationParams;
 import org.chromium.content_public.browser.WebContents;
 
 import java.net.InetAddress;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ skipping 177 matching lines @@
     /**
      * Creates and initializes a spare WebContents, to be used in a subsequent navigation.
      *
      * This creates a renderer that is suitable for any navigation. It can be picked up by any tab.
      * Can be called multiple times, and must be called from the UI thread.
      * Note that this is a no-op on low-end devices.
      */
     public void createSpareWebContents() {
         ThreadUtils.assertOnUiThread();
         if (mSpareWebContents != null || SysUtils.isLowEndDevice()) return;
-        mSpareWebContents = WebContentsFactory.createWebContentsWithWarmRenderer(false, false);
+        mSpareWebContents = WebContentsFactory.createWebContentsWithWarmRenderer(
+                ChildProcessCreationParams.DEFAULT_ID, false, false);
     }
 
     /**
      * Destroys the spare WebContents if there is one.
      */
     public void destroySpareWebContents() {
         ThreadUtils.assertOnUiThread();
         if (mSpareWebContents == null) return;
         mSpareWebContents.destroy();
         mSpareWebContents = null;
     }
 
     /**
      * Returns a spare WebContents or null, depending on the availability of one.
      *
      * The parameters are the same as for {@link WebContentsFactory#createWebContents()}.
      *
      * @return a WebContents, or null.
      */
-    public WebContents takeSpareWebContents(boolean incognito, boolean initiallyHidden) {
+    public WebContents takeSpareWebContents(
+            boolean incognito, boolean initiallyHidden, int childProcessParamId) {

[boliu, 2017/02/23 00:51:30]

so this s a general pattern I followed here. All warmup/prerender all use the
default params (because in general there's no corresponding activity when they
are created). I hope this forces the caller to make a choice about what the
childProcessParamId is.

         ThreadUtils.assertOnUiThread();
-        if (incognito || initiallyHidden) return null;
+        if (incognito || initiallyHidden
+                || childProcessParamId != ChildProcessCreationParams.DEFAULT_ID) {
+            return null;
+        }
         WebContents result = mSpareWebContents;
         mSpareWebContents = null;
         return result;
     }
 
     /**
      * @return Whether a spare renderer is available.
      */
     public boolean hasSpareWebContents() {
         return mSpareWebContents != null;
     }
 
     private static native void nativePreconnectUrlAndSubresources(Profile profile, String url);
 }