Update Flash diagnostics page to output when GPU process is not allowed to run and to prevent han...

chrome/browser/ui/webui/flash_ui.cc

 // Copyright (c) 2011 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/ui/webui/flash_ui.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread_restrictions.h"
+#include "base/timer.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/crash_upload_list.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/crashes_ui.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/gpu/gpu_data_manager.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/user_metrics.h"
 #include "grit/generated_resources.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/plugins/npapi/webplugininfo.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 namespace {
 
+const int kTimeout = 8 * 1000;  // 8 seconds.
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 // FlashUIHTMLSource
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 class FlashUIHTMLSource : public ChromeURLDataManager::DataSource {
  public:
   FlashUIHTMLSource()
       : DataSource(chrome::kChromeUIFlashHost, MessageLoop::current()) {}
@@ skipping 62 matching lines @@
   void HandleRequestFlashInfo(const ListValue* args);
 
   // Callback for the GPU information update.
   void OnGpuInfoUpdate();
 
  private:
   // Called when we think we might have enough information to return data back
   // to the page.
   void MaybeRespondToPage();
 
+  // In certain cases we might not get called back from the GPU process so we
+  // set an upper limit on the time we wait. This function gets called when the
+  // time has passed. This actually doesn't prevent the rest of the information
+  // to appear later, the page will just reflow when more information becomes
+  // available.
+  void OnTimeout();
+
+  // A timer to keep track of when the data fetching times out.
+  base::OneShotTimer<FlashDOMHandler> timeout_;
+
   // GPU variables.
   GpuDataManager* gpu_data_manager_;
   Callback0::Type* gpu_info_update_callback_;
 
   // Crash list.
   scoped_refptr<CrashUploadList> upload_list_;
 
   // Whether the list of all crashes is available.
   bool crash_list_available_;
   // Whether the page has requested data.
@@ skipping 15 matching lines @@
   // Watch for changes in GPUInfo.
   gpu_data_manager_ = GpuDataManager::GetInstance();
   gpu_info_update_callback_ =
       NewCallback(this, &FlashDOMHandler::OnGpuInfoUpdate);
   gpu_data_manager_->AddGpuInfoUpdateCallback(gpu_info_update_callback_);
 
   // Tell GpuDataManager it should have full GpuInfo. If the
   // GPU process has not run yet, this will trigger its launch.
   gpu_data_manager_->RequestCompleteGpuInfoIfNeeded();
 
-  const GPUInfo& gpu_info = gpu_data_manager_->gpu_info();
-  if (gpu_info.finalized)
+  // GPU access might not be allowed at all, which will cause us not to get a
+  // call back.
+  if (!gpu_data_manager_->GpuAccessAllowed())
     OnGpuInfoUpdate();
+
+  // And lastly, we fire off a timer to make sure we never get stuck at the
+  // "Loading..." message.
+  timeout_.Start(base::TimeDelta::FromMilliseconds(kTimeout),
+                 this, &FlashDOMHandler::OnTimeout);
 }
 
 void FlashDOMHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("requestFlashInfo",
       NewCallback(this, &FlashDOMHandler::HandleRequestFlashInfo));
 }
 
 void FlashDOMHandler::OnCrashListAvailable() {
   crash_list_available_ = true;
   MaybeRespondToPage();
@@ skipping 13 matching lines @@
 void FlashDOMHandler::HandleRequestFlashInfo(const ListValue* args) {
   page_has_requested_data_ = true;
   MaybeRespondToPage();
 }
 
 void FlashDOMHandler::OnGpuInfoUpdate() {
   has_gpu_info_ = true;
   MaybeRespondToPage();
 }
 
+void FlashDOMHandler::OnTimeout() {
+  // We don't set page_has_requested_data_ because that is guaranteed to appear
+  // and we shouldn't be responding to the page before then.
+  has_gpu_info_ = true;
+  crash_list_available_ = true;
+  MaybeRespondToPage();
+}
+
 void FlashDOMHandler::MaybeRespondToPage() {
   // We don't reply until everything is ready. The page is showing a 'loading'
-  // message until then.
+  // message until then. If you add criteria to this list, please update the
+  // function OnTimeout() as well.
   if (!page_has_requested_data_ || !crash_list_available_ || !has_gpu_info_)
     return;
 
+  timeout_.Stop();
+
   // This is code that runs only when the user types in about:flash. We don't
   // need to jump through hoops to offload this to the IO thread.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 
   // Obtain the Chrome version info.
   chrome::VersionInfo version_info;
 
   ListValue* list = new ListValue();
 
   // Chrome version information.
@@ skipping 61 matching lines @@
     AddPair(list, ASCIIToUTF16("Crash Reporting"),
                   "Enable crash reporting to see crash IDs");
     AddPair(list, ASCIIToUTF16("For more details"),
                   chrome::kLearnMoreReportingURL);
   }
 
   // GPU information.
   AddPair(list, ASCIIToUTF16(""), "--- GPU information ---");
   const GPUInfo& gpu_info = gpu_data_manager_->gpu_info();
 
+  if (!gpu_data_manager_->GpuAccessAllowed())
+    AddPair(list, ASCIIToUTF16("WARNING:"), "GPU access is not allowed");
 #if defined(OS_WIN)
   const DxDiagNode& node = gpu_info.dx_diagnostics;
   for (std::map<std::string, DxDiagNode>::const_iterator it =
            node.children.begin();
        it != node.children.end();
        ++it) {
     for (std::map<std::string, std::string>::const_iterator it2 =
              it->second.values.begin();
          it2 != it->second.values.end();
          ++it2) {
@@ skipping 55 matching lines @@
 
   // Set up the about:flash source.
   contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
 }
 
 // static
 RefCountedMemory* FlashUI::GetFaviconResourceBytes() {
   // Use the default icon for now.
   return NULL;
 }