summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjabdelmalek@google.com <jabdelmalek@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-11 18:42:44 +0000
committerjabdelmalek@google.com <jabdelmalek@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-11 18:42:44 +0000
commitbafb959be73508825dabe5b9a022c97ad4dd4af2 (patch)
treea8bd17619700245da9390af5a263dfce6633b6fb
parentdc9a22ac2628693842ee88a3eadae83c470f398d (diff)
downloadchromium_src-bafb959be73508825dabe5b9a022c97ad4dd4af2.zip
chromium_src-bafb959be73508825dabe5b9a022c97ad4dd4af2.tar.gz
chromium_src-bafb959be73508825dabe5b9a022c97ad4dd4af2.tar.bz2
Set the hung renderer and plugin timeout to 10 seconds.
BUG=1314703 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@665 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/browser.cc2
-rw-r--r--chrome/browser/render_widget_host.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 3ebf41d..472fdd9 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -91,7 +91,7 @@ static const int kWindowTilePixels = 20;
static const int kDefaultHungPluginDetectFrequency = 2000;
// How long do we wait before we consider a window hung (in ms).
-static const int kDefaultPluginMessageResponseTimeout = 5000;
+static const int kDefaultPluginMessageResponseTimeout = 10000;
////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/render_widget_host.cc b/chrome/browser/render_widget_host.cc
index bb03775..70ac47b 100644
--- a/chrome/browser/render_widget_host.cc
+++ b/chrome/browser/render_widget_host.cc
@@ -47,8 +47,8 @@
// This timeout impacts the "choppiness" of our window resize perf.
static const int kPaintMsgTimeoutMS = 40;
-// Give the renderer at most 30 seconds to respond before we treat it as hung.
-static const int kHungRendererDelayMs = 30000;
+// How long to wait before we consider a renderer hung.
+static const int kHungRendererDelayMs = 10000;
///////////////////////////////////////////////////////////////////////////////
// RenderWidget::BackingStore