summaryrefslogtreecommitdiffstats
path: root/content/gpu/gpu_child_thread.h
diff options
context:
space:
mode:
authorkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-22 18:13:28 +0000
committerkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-22 18:13:28 +0000
commit0b2cec69a613d94f2ee72743ba53f539843e85e3 (patch)
tree8ed8627b2fd91716f11b16a5b8174b611f6b33c3 /content/gpu/gpu_child_thread.h
parent638b1808f8c609dbf58c319837a78f1c316f82cd (diff)
downloadchromium_src-0b2cec69a613d94f2ee72743ba53f539843e85e3.zip
chromium_src-0b2cec69a613d94f2ee72743ba53f539843e85e3.tar.gz
chromium_src-0b2cec69a613d94f2ee72743ba53f539843e85e3.tar.bz2
Initialize the sandbox earlier in GPU process bringup, deferring any
errors until receipt of the first IPC message. Tested by running WebGL content with this patch on Mac and Windows. BUG=84650 TEST=none Review URL: http://codereview.chromium.org/7458009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93676 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu/gpu_child_thread.h')
-rw-r--r--content/gpu/gpu_child_thread.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h
index 6fc8fbd..06643dc 100644
--- a/content/gpu/gpu_child_thread.h
+++ b/content/gpu/gpu_child_thread.h
@@ -38,11 +38,7 @@ class GpuWatchdogThread;
// commands to the GPU.
class GpuChildThread : public ChildThread {
public:
-#if defined(OS_WIN)
- explicit GpuChildThread(sandbox::TargetServices* target_services);
-#else
- GpuChildThread();
-#endif
+ explicit GpuChildThread(bool dead_on_arrival);
// For single-process mode.
explicit GpuChildThread(const std::string& channel_id);
@@ -69,6 +65,9 @@ class GpuChildThread : public ChildThread {
static void SetDxDiagnostics(GpuChildThread* thread, const DxDiagNode& node);
#endif
+ // Set this flag to true if a fatal error occurred before we receive the
+ // OnInitialize message, in which case we just declare ourselves DOA.
+ bool dead_on_arrival_;
base::Time process_start_time_;
scoped_refptr<GpuWatchdogThread> watchdog_thread_;