Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Side by Side Diff: content/gpu/gpu_main.cc

Issue 8343006: Fixed log messages about failed initialization of GLSurface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/gpu/gpu_info_collector_linux.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stdlib.h> 5 #include <stdlib.h>
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #endif 9 #endif
10 10
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 // browser and GPU process, and the GPU process crashes or exits 62 // browser and GPU process, and the GPU process crashes or exits
63 // early, the browser process will never detect it. For this reason 63 // early, the browser process will never detect it. For this reason
64 // we defer tearing down the GPU process until receiving the 64 // we defer tearing down the GPU process until receiving the
65 // GpuMsg_Initialize message from the browser. 65 // GpuMsg_Initialize message from the browser.
66 bool dead_on_arrival = false; 66 bool dead_on_arrival = false;
67 67
68 // Load the GL implementation and locate the bindings before starting the GPU 68 // Load the GL implementation and locate the bindings before starting the GPU
69 // watchdog because this can take a lot of time and the GPU watchdog might 69 // watchdog because this can take a lot of time and the GPU watchdog might
70 // terminate the GPU process. 70 // terminate the GPU process.
71 if (!gfx::GLSurface::InitializeOneOff()) { 71 if (!gfx::GLSurface::InitializeOneOff()) {
72 LOG(INFO) << "GLContext::InitializeOneOff failed"; 72 LOG(INFO) << "gfx::GLSurface::InitializeOneOff failed";
73 dead_on_arrival = true; 73 dead_on_arrival = true;
74 } 74 }
75 75
76 base::win::ScopedCOMInitializer com_initializer; 76 base::win::ScopedCOMInitializer com_initializer;
77 77
78 #if defined(OS_WIN) 78 #if defined(OS_WIN)
79 sandbox::TargetServices* target_services = 79 sandbox::TargetServices* target_services =
80 parameters.sandbox_info_.TargetServices(); 80 parameters.sandbox_info_.TargetServices();
81 // For windows, if the target_services interface is not zero, the process 81 // For windows, if the target_services interface is not zero, the process
82 // is sandboxed and we must call LowerToken() before rendering untrusted 82 // is sandboxed and we must call LowerToken() before rendering untrusted
(...skipping 29 matching lines...) Expand all
112 child_thread->Init(start_time); 112 child_thread->Init(start_time);
113 113
114 gpu_process.set_main_thread(child_thread); 114 gpu_process.set_main_thread(child_thread);
115 115
116 main_message_loop.Run(); 116 main_message_loop.Run();
117 117
118 child_thread->StopWatchdog(); 118 child_thread->StopWatchdog();
119 119
120 return 0; 120 return 0;
121 } 121 }
OLDNEW
« no previous file with comments | « content/gpu/gpu_info_collector_linux.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698