| Index: chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
|
| index cc4e168d3559141737b5d37bc5d52e824a5afece..eba926451ad17dec8c39f8d90c6847afdcd077ff 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
|
| @@ -1371,11 +1371,12 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
|
|
|
| boolean creatingWebContents = webContents == null;
|
| if (creatingWebContents) {
|
| + int childProcessParamId = mDelegateFactory.getChildProcessParamId();
|
| webContents = WarmupManager.getInstance().takeSpareWebContents(
|
| - isIncognito(), initiallyHidden);
|
| + isIncognito(), initiallyHidden, childProcessParamId);
|
| if (webContents == null) {
|
| - webContents =
|
| - WebContentsFactory.createWebContents(isIncognito(), initiallyHidden);
|
| + webContents = WebContentsFactory.createWebContents(
|
| + childProcessParamId, isIncognito(), initiallyHidden);
|
| }
|
| }
|
|
|
| @@ -2026,7 +2027,8 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
|
|
|
| if (mPendingLoadParams != null) {
|
| assert isFrozen();
|
| - initContentViewCore(WebContentsFactory.createWebContents(isIncognito(), isHidden()));
|
| + initContentViewCore(WebContentsFactory.createWebContents(
|
| + mDelegateFactory.getChildProcessParamId(), isIncognito(), isHidden()));
|
| loadUrl(mPendingLoadParams);
|
| mPendingLoadParams = null;
|
| return true;
|
| @@ -2097,7 +2099,8 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
|
| // State restore failed, just create a new empty web contents as that is the best
|
| // that can be done at this point. TODO(jcivelli) http://b/5910521 - we should show
|
| // an error page instead of a blank page in that case (and the last loaded URL).
|
| - webContents = WebContentsFactory.createWebContents(isIncognito(), isHidden());
|
| + webContents = WebContentsFactory.createWebContents(
|
| + mDelegateFactory.getChildProcessParamId(), isIncognito(), isHidden());
|
| mTabUma = new TabUma(TabCreationState.FROZEN_ON_RESTORE_FAILED);
|
| mFailedToRestore = true;
|
| }
|
|
|