| Index: chrome/android/java/src/org/chromium/chrome/browser/Tab.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
|
| index 9b30843980adcd677c808d8e7c929fc3275bb41b..d41113b017076f2d26714253df39341ff676f4d6 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
|
| @@ -1211,7 +1211,13 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
|
| * on both cold and warm starts.
|
| */
|
| public void onActivityStart() {
|
| - show(TabSelectionType.FROM_USER);
|
| + if (isHidden()) {
|
| + show(TabSelectionType.FROM_USER);
|
| + } else {
|
| + // The visible Tab's renderer process may have died after the activity was paused.
|
| + // Ensure that it's restored appropriately.
|
| + loadIfNeeded();
|
| + }
|
|
|
| // When resuming the activity, force an update to the fullscreen state to ensure a
|
| // subactivity did not change the fullscreen configuration of this ChromeTab's renderer in
|
| @@ -1223,7 +1229,7 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
|
| * Called on the foreground tab when the Activity is stopped.
|
| */
|
| public void onActivityStop() {
|
| - hide();
|
| + // TODO(jdduke): Remove this method when all downstream callers have been removed.
|
| }
|
|
|
| /**
|
|
|