diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-06 01:37:21 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-06 01:37:21 +0000 |
| commit | 89e0b1411dd48c431ec76e98df0a164c23b3e47c (patch) | |
| tree | 033c9e7dc8c1e63cde7503f9370bf34ad4537b81 | |
| parent | f2e52becd77c14f20ecf396b6a70e134f20f6254 (diff) | |
| download | chromium_src-89e0b1411dd48c431ec76e98df0a164c23b3e47c.zip chromium_src-89e0b1411dd48c431ec76e98df0a164c23b3e47c.tar.gz chromium_src-89e0b1411dd48c431ec76e98df0a164c23b3e47c.tar.bz2 | |
Merge 125059 - Increasing plugin JIT spike cap and removing lifetime cap in response to user crash reports.
BUG=115658
TBR=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9554008
TBR=jschuh@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9614008
git-svn-id: svn://svn.chromium.org/chrome/branches/1025/src@125067 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/plugins/npapi/webplugin_delegate_impl_win.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc index 690578b..99fcb73 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc +++ b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc @@ -148,8 +148,7 @@ static scoped_ptr<base::Lock> g_exec_mem_lock; bool UpdateExecMemSize(intptr_t size) { base::AutoLock locked(*g_exec_mem_lock); - const intptr_t kMaxPluginExecMemSize = 192 * 1024 * 1024; // 192mb. - const intptr_t kMaxPluginExecMemSizeSpike = 64 * 1024 * 1024; // 64mb. + const intptr_t kMaxPluginExecMemSizeSpike = 80 * 1024 * 1024; // 80mb. const DWORD kTimeLimit = 6; // 6 minute timeout. static intptr_t s_exec_mem_size = 0; @@ -194,8 +193,6 @@ bool UpdateExecMemSize(intptr_t size) { g_max_exec_mem_size = s_exec_mem_size; - if (s_exec_mem_size > kMaxPluginExecMemSize) - return false; if ((s_exec_mem_size - s_exec_mem_size_old) > kMaxPluginExecMemSizeSpike) return false; |