chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java - Issue 2254063003: Reland of Android: Make the spare renderer accessible to all Chrome tabs.

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

Issue 2254063003: Reland of Android: Make the spare renderer accessible to all Chrome tabs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Pass the WebContents to the observer (for proper destruction). Created 4 years, 4 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

index 51342d04329845413dc98b1eebab098352de40f8..3b4e539fb38528656d05faa2e7d218024eb778d0 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

@@ -40,6 +40,7 @@ import org.chromium.chrome.browser.ChromeTabbedActivity;

import org.chromium.chrome.browser.IntentHandler;

import org.chromium.chrome.browser.IntentHandler.ExternalAppId;

import org.chromium.chrome.browser.KeyboardShortcuts;

+import org.chromium.chrome.browser.WarmupManager;

import org.chromium.chrome.browser.WebContentsFactory;

import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegate;

import org.chromium.chrome.browser.compositor.layouts.LayoutManagerDocument;

@@ -95,10 +96,12 @@ public class CustomTabActivity extends ChromeActivity {

private boolean mHasCreatedTabEarly;

private boolean mIsInitialStart = true;

+ // Whether there is any prerender associated with the session.

private boolean mHasPrerender;

private CustomTabObserver mTabObserver;

private String mPrerenderedUrl;

+ // Whether a prerender is being used.

private boolean mHasPrerendered;

private static class PageLoadMetricsObserver implements PageLoadMetrics.Observer {

@@ -252,7 +255,8 @@ public class CustomTabActivity extends ChromeActivity {

@Override

public boolean shouldAllocateChildConnection() {

- return !mHasCreatedTabEarly && !mHasPrerender;

+ return !mHasCreatedTabEarly && !mHasPrerender

+ && !WarmupManager.getInstance().hasSpareWebContents();

}

@Override

@@ -419,7 +423,9 @@ public class CustomTabActivity extends ChromeActivity {

WebContents webContents =

customTabsConnection.takePrerenderedUrl(mSession, url, referrerUrl);

mHasPrerendered = webContents != null;

- if (webContents == null) webContents = customTabsConnection.takeSpareWebContents();

+ if (!mHasPrerendered) {

+ webContents = WarmupManager.getInstance().takeSpareWebContents(false, false);

+ }

if (webContents == null) webContents = WebContentsFactory.createWebContents(false, false);

tab.initialize(webContents, getTabContentManager(),

new CustomTabDelegateFactory(mIntentDataProvider.shouldEnableUrlBarHiding()), false,