[Android] Add support for a hung renderer dialog

chrome/browser/android/tab_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/tab_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/metrics/histogram.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/layers/layer.h"
 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
 #include "chrome/browser/android/compositor/tab_content_manager.h"
+#include "chrome/browser/android/hung_renderer_infobar_delegate.h"
 #include "chrome/browser/android/metrics/uma_utils.h"
 #include "chrome/browser/android/offline_pages/offline_page_bridge.h"
 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/prerender/prerender_contents.h"
@@ skipping 23 matching lines @@
 #include "chrome/browser/ui/tab_helpers.h"
 #include "chrome/common/instant_types.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_node.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/managed/managed_bookmark_service.h"
 #include "components/dom_distiller/core/url_utils.h"
 #include "components/favicon/content/content_favicon_driver.h"
+#include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_container.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "components/navigation_interception/navigation_params.h"
 #include "components/offline_pages/offline_page_feature.h"
 #include "components/offline_pages/offline_page_item.h"
 #include "components/offline_pages/offline_page_model.h"
 #include "components/url_formatter/url_fixer.h"
 #include "content/public/browser/android/compositor.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 26 matching lines @@
 using content::WebContents;
 using navigation_interception::InterceptNavigationDelegate;
 using navigation_interception::NavigationParams;
 
 namespace {
 
 const int kImageSearchThumbnailMinSize = 300 * 300;
 const int kImageSearchThumbnailMaxWidth = 600;
 const int kImageSearchThumbnailMaxHeight = 600;
 
+infobars::InfoBar* FindHungRendererInfoBar(InfoBarService* infobar_service) {
+  for (size_t i = 0; i < infobar_service->infobar_count(); ++i) {
+    infobars::InfoBar* infobar = infobar_service->infobar_at(i);
+    if (!infobar || !infobar->delegate())

[Peter Kasting, 2015/09/01 22:24:05]

These cannot be null.

[jdduke (slow), 2015/09/02 00:04:01]

Done.

+      continue;
+
+    if (!infobar->delegate()->AsHungRendererInfoBarDelegate())

[Peter Kasting, 2015/09/01 22:24:05]

Nit: Simpler:

    if (infobar->delegate()->AsHungRendererInfoBarDelegate())
      return infobar;

[jdduke (slow), 2015/09/02 00:04:01]

Done.

+      continue;
+
+    return infobar;
+  }
+  return nullptr;
+}
+
 }  // namespace
 
 TabAndroid* TabAndroid::FromWebContents(content::WebContents* web_contents) {
   CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(web_contents);
   if (!core_tab_helper)
     return NULL;
 
   CoreTabHelperDelegate* core_delegate = core_tab_helper->delegate();
   if (!core_delegate)
     return NULL;
@@ skipping 721 matching lines @@
       offline_pages::OfflinePageModelFactory::GetForBrowserContext(
           GetProfile());
   return offline_page_model->GetPageByOfflineURL(url);
 }
 
 bool TabAndroid::HasPrerenderedUrl(JNIEnv* env, jobject obj, jstring url) {
   GURL gurl(base::android::ConvertJavaStringToUTF8(env, url));
   return HasPrerenderedUrl(gurl);
 }
 
+void TabAndroid::OnRendererUnresponsive(JNIEnv* env, jobject obj) {
+  InfoBarService* infobar_service =
+      InfoBarService::FromWebContents(web_contents());
+  if (!infobar_service)

[Peter Kasting, 2015/09/01 22:24:05]

When will this be null?  Either you shouldn't be checking it or it should have a
comment giving specific examples of when it's null.

[jdduke (slow), 2015/09/02 00:04:01]

I don't think it can be, I looked at some other code that has the check but I
think the lifetimes are pretty clear here.

+    return;
+
+  DCHECK(!FindHungRendererInfoBar(infobar_service));
+
+  scoped_ptr<ConfirmInfoBarDelegate> delegate(
+      new HungRendererInfoBarDelegate(web_contents()));
+  infobar_service->AddInfoBar(
+      infobar_service->CreateConfirmInfoBar(delegate.Pass()));
+}
+
+void TabAndroid::OnRendererResponsive(JNIEnv* env, jobject obj) {
+  InfoBarService* infobar_service =
+      InfoBarService::FromWebContents(web_contents());
+  if (!infobar_service)
+    return;
+
+  infobars::InfoBar* hung_renderer_infobar =
+      FindHungRendererInfoBar(infobar_service);
+  if (!hung_renderer_infobar)
+    return;
+
+  hung_renderer_infobar->delegate()
+      ->AsHungRendererInfoBarDelegate()
+      ->OnRendererResponsive();
+  infobar_service->RemoveInfoBar(hung_renderer_infobar);
+}
+
 namespace {
 
 class ChromeInterceptNavigationDelegate : public InterceptNavigationDelegate {
  public:
   ChromeInterceptNavigationDelegate(JNIEnv* env, jobject jdelegate)
       : InterceptNavigationDelegate(env, jdelegate) {}
 
   bool ShouldIgnoreNavigation(
       const NavigationParams& navigation_params) override {
     NavigationParams chrome_navigation_params(navigation_params);
@@ skipping 73 matching lines @@
   //   s^{n+1} / s^{n} = 2100 / 2000
   //   s = 1.05
   //   s^b = 60000
   //   b = ln(60000) / ln(1.05) ~= 225
   UMA_HISTOGRAM_CUSTOM_TIMES("Startup.FirstCommitNavigationTime",
       base::Time::Now() - chrome::android::GetMainEntryPointTime(),
       base::TimeDelta::FromMilliseconds(1),
       base::TimeDelta::FromMinutes(1),
       225);
 }