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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java

Issue 1299513002: [Android] Add support for a hung renderer dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 3 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 f47c28577b6c05fcbf446f683d0d996bb0f88a24..9f2b7daf463b28f2dd3c1bee1982bbfc9d878fdc 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
@@ -475,6 +475,7 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
@Override
public void rendererUnresponsive() {
super.rendererUnresponsive();
+ if (mNativeTabAndroid != 0) nativeOnRendererUnresponsive(mNativeTabAndroid);
if (mFullscreenManager == null) return;
mFullscreenHungRendererToken =
mFullscreenManager.showControlsPersistentAndClearOldToken(
@@ -484,6 +485,7 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
@Override
public void rendererResponsive() {
super.rendererResponsive();
+ if (mNativeTabAndroid != 0) nativeOnRendererResponsive(mNativeTabAndroid);
if (mFullscreenManager == null) return;
mFullscreenManager.hideControlsPersistent(mFullscreenHungRendererToken);
mFullscreenHungRendererToken = FullscreenManager.INVALID_TOKEN;
@@ -2883,6 +2885,8 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
private native void nativeDetachOverlayContentViewCore(long nativeTabAndroid,
ContentViewCore content);
private native boolean nativeHasPrerenderedUrl(long nativeTabAndroid, String url);
+ private native void nativeOnRendererUnresponsive(long nativeTabAndroid);
+ private native void nativeOnRendererResponsive(long nativeTabAndroid);
private static native void nativeRecordStartupToCommitUma();
}

Powered by Google App Engine
This is Rietveld 408576698