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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.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/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 5623df08703de7d5b766f1edca9a398e92bcbe10..bff589ea76073db9eb9a09d5c04ae09ffdb90176 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
@@ -1311,11 +1311,12 @@ public class Tab
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);
}
}
@@ -1967,7 +1968,8 @@ public class Tab
if (mPendingLoadParams != null) {
assert isFrozen();
- initContentViewCore(WebContentsFactory.createWebContents(isIncognito(), isHidden()));
+ initContentViewCore(WebContentsFactory.createWebContents(
+ mDelegateFactory.getChildProcessParamId(), isIncognito(), isHidden()));
loadUrl(mPendingLoadParams);
mPendingLoadParams = null;
return true;
@@ -2038,7 +2040,8 @@ public class Tab
// 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;
}

Powered by Google App Engine
This is Rietveld 408576698