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

Side by Side Diff: content/common/gpu/gpu_channel.h

Issue 7870008: Wait properly for renderer crashes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 9 years, 3 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
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 #ifndef CONTENT_COMMON_GPU_GPU_CHANNEL_H_ 5 #ifndef CONTENT_COMMON_GPU_GPU_CHANNEL_H_
6 #define CONTENT_COMMON_GPU_GPU_CHANNEL_H_ 6 #define CONTENT_COMMON_GPU_GPU_CHANNEL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <queue> 9 #include <queue>
10 #include <set> 10 #include <set>
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 // Get the GpuChannelManager that owns this channel. 56 // Get the GpuChannelManager that owns this channel.
57 GpuChannelManager* gpu_channel_manager() const { 57 GpuChannelManager* gpu_channel_manager() const {
58 return gpu_channel_manager_; 58 return gpu_channel_manager_;
59 } 59 }
60 60
61 // Returns the name of the associated IPC channel. 61 // Returns the name of the associated IPC channel.
62 std::string GetChannelName(); 62 std::string GetChannelName();
63 63
64 #if defined(OS_POSIX) 64 #if defined(OS_POSIX)
65 int GetRendererFileDescriptor(); 65 int TakeRendererFileDescriptor();
66 #endif // defined(OS_POSIX) 66 #endif // defined(OS_POSIX)
67 67
68 base::ProcessHandle renderer_process() const { 68 base::ProcessHandle renderer_process() const {
69 return renderer_process_; 69 return renderer_process_;
70 } 70 }
71 71
72 // IPC::Channel::Listener implementation: 72 // IPC::Channel::Listener implementation:
73 virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; 73 virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
74 virtual void OnChannelError() OVERRIDE; 74 virtual void OnChannelError() OVERRIDE;
75 virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; 75 virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 gpu::gles2::DisallowedExtensions disallowed_extensions_; 180 gpu::gles2::DisallowedExtensions disallowed_extensions_;
181 GpuWatchdog* watchdog_; 181 GpuWatchdog* watchdog_;
182 bool software_; 182 bool software_;
183 183
184 ScopedRunnableMethodFactory<GpuChannel> task_factory_; 184 ScopedRunnableMethodFactory<GpuChannel> task_factory_;
185 185
186 DISALLOW_COPY_AND_ASSIGN(GpuChannel); 186 DISALLOW_COPY_AND_ASSIGN(GpuChannel);
187 }; 187 };
188 188
189 #endif // CONTENT_COMMON_GPU_GPU_CHANNEL_H_ 189 #endif // CONTENT_COMMON_GPU_GPU_CHANNEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698