diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-25 23:20:34 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-25 23:20:34 +0000 |
| commit | 4a2a4d2400b936075e577cca740964cb8e7fa7aa (patch) | |
| tree | 33d88c884141f0f7bb5ab0ae70e9bbcab5b2f4bb /content/gpu | |
| parent | 88a446f99abb47a61d0b6a3d4015ebd1da7f60f0 (diff) | |
| download | chromium_src-4a2a4d2400b936075e577cca740964cb8e7fa7aa.zip chromium_src-4a2a4d2400b936075e577cca740964cb8e7fa7aa.tar.gz chromium_src-4a2a4d2400b936075e577cca740964cb8e7fa7aa.tar.bz2 | |
Initialize the GL bindings before sandboxing the GPU process on Windows.
This is an attempt to fix a regression. Unfortunately, the problem does not
manifest with a local Chromium Release build, only those coming from the
waterfall, so this fix has not yet been verified.
BUG=90457
TEST=none
Review URL: http://codereview.chromium.org/7471055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93991 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu')
| -rw-r--r-- | content/gpu/gpu_main.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index 1b0f58b..68aff9b 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -51,6 +51,14 @@ int GpuMain(const MainFunctionParams& parameters) { // GpuMsg_Initialize message from the browser. bool dead_on_arrival = false; + // Load the GL implementation and locate the bindings before starting the GPU + // watchdog because this can take a lot of time and the GPU watchdog might + // terminate the GPU process. + if (!gfx::GLSurface::InitializeOneOff()) { + LOG(INFO) << "GLContext::InitializeOneOff failed"; + dead_on_arrival = true; + } + #if defined(OS_WIN) sandbox::TargetServices* target_services = parameters.sandbox_info_.TargetServices(); @@ -61,14 +69,6 @@ int GpuMain(const MainFunctionParams& parameters) { target_services->LowerToken(); #endif - // Load the GL implementation and locate the bindings before starting the GPU - // watchdog because this can take a lot of time and the GPU watchdog might - // terminate the GPU process. - if (!gfx::GLSurface::InitializeOneOff()) { - LOG(INFO) << "GLContext::InitializeOneOff failed"; - dead_on_arrival = true; - } - #if defined(OS_MACOSX) chrome_application_mac::RegisterCrApp(); #endif |