summaryrefslogtreecommitdiff
path: root/chromium/content/ppapi_plugin/plugin_process_dispatcher.cc
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-03-18 13:16:26 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-03-20 15:55:39 +0100
commit3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch)
tree92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/content/ppapi_plugin/plugin_process_dispatcher.cc
parente90d7c4b152c56919d963987e2503f9909a666d2 (diff)
downloadqtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies needed on Windows. Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42 Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/content/ppapi_plugin/plugin_process_dispatcher.cc')
-rw-r--r--chromium/content/ppapi_plugin/plugin_process_dispatcher.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/chromium/content/ppapi_plugin/plugin_process_dispatcher.cc b/chromium/content/ppapi_plugin/plugin_process_dispatcher.cc
index b0574d4853c..3bfc46a3b8b 100644
--- a/chromium/content/ppapi_plugin/plugin_process_dispatcher.cc
+++ b/chromium/content/ppapi_plugin/plugin_process_dispatcher.cc
@@ -23,7 +23,6 @@ PluginProcessDispatcher::PluginProcessDispatcher(
: ppapi::proxy::PluginDispatcher(get_interface,
permissions,
incognito) {
- ChildProcess::current()->AddRefProcess();
}
PluginProcessDispatcher::~PluginProcessDispatcher() {
@@ -32,10 +31,7 @@ PluginProcessDispatcher::~PluginProcessDispatcher() {
// plugin. This is the case for common plugins where they may be used on a
// source and destination page of a navigation. We don't want to tear down
// and re-start processes each time in these cases.
- base::MessageLoop::current()->PostDelayedTask(
- FROM_HERE,
- base::Bind(&ChildProcess::ReleaseProcess,
- base::Unretained(ChildProcess::current())),
+ process_ref_.ReleaseWithDelay(
base::TimeDelta::FromSeconds(kPluginReleaseTimeSeconds));
}