diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 19:55:20 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 19:55:20 +0000 |
| commit | e0e8b4c00c6d24bfa9ead6421f5100572d190ef1 (patch) | |
| tree | 4cd1d506eaf4387234baf6904c0243b4e1b38648 /content/gpu | |
| parent | 170c7d2151075d0a752ec5edae0439559c752f5e (diff) | |
| download | chromium_src-e0e8b4c00c6d24bfa9ead6421f5100572d190ef1.zip chromium_src-e0e8b4c00c6d24bfa9ead6421f5100572d190ef1.tar.gz chromium_src-e0e8b4c00c6d24bfa9ead6421f5100572d190ef1.tar.bz2 | |
Stop watchdog thread before sandbox initialization.
Then Start it again after sandbox is up.
BUG=132893
TEST=no sandbox error message
Review URL: https://codereview.chromium.org/11275337
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167995 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu')
| -rw-r--r-- | content/gpu/gpu_main.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index 4629242..96473c0 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -232,7 +232,11 @@ int GpuMain(const MainFunctionParams& parameters) { #endif if (do_init_sandbox) { + if (watchdog_thread.get()) + watchdog_thread->Stop(); gpu_info.sandboxed = InitializeSandbox(); + if (watchdog_thread.get()) + watchdog_thread->Start(); } } #endif |