summaryrefslogtreecommitdiffstats
path: root/content/gpu
diff options
context:
space:
mode:
authorkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-16 16:41:06 +0000
committerkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-16 16:41:06 +0000
commitbccf36e8456b9aa402bcd99d9eba988bc810961b (patch)
tree4588b60fdb995137b97a43a158da1a0812b4d0c8 /content/gpu
parent655db91a979efbcd270ae6c05c3c99693dedbdd4 (diff)
downloadchromium_src-bccf36e8456b9aa402bcd99d9eba988bc810961b.zip
chromium_src-bccf36e8456b9aa402bcd99d9eba988bc810961b.tar.gz
chromium_src-bccf36e8456b9aa402bcd99d9eba988bc810961b.tar.bz2
Move initialization of COM earlier in GPU process startup to
work around problems doing so after installing the sandbox. BUG=91452 TEST=none Review URL: http://codereview.chromium.org/7659004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96964 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu')
-rw-r--r--content/gpu/gpu_main.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 398bb6d..79ca7c4 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -60,6 +60,8 @@ int GpuMain(const MainFunctionParams& parameters) {
dead_on_arrival = true;
}
+ base::win::ScopedCOMInitializer com_initializer;
+
#if defined(OS_WIN)
sandbox::TargetServices* target_services =
parameters.sandbox_info_.TargetServices();
@@ -103,8 +105,6 @@ int GpuMain(const MainFunctionParams& parameters) {
#endif
}
- base::win::ScopedCOMInitializer com_initializer;
-
GpuProcess gpu_process;
GpuChildThread* child_thread = new GpuChildThread(dead_on_arrival);