diff options
author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 20:09:49 +0000 |
---|---|---|
committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 20:09:49 +0000 |
commit | 6b889fb5d046cdecc27c2b2d56e2400dd7c10270 (patch) | |
tree | c779e93c795d927ebc2e6f68017792a0ac797abd /chrome/renderer | |
parent | b31db6c5e7d3f42f1de7d7095c609c18f6fd4d08 (diff) | |
download | chromium_src-6b889fb5d046cdecc27c2b2d56e2400dd7c10270.zip chromium_src-6b889fb5d046cdecc27c2b2d56e2400dd7c10270.tar.gz chromium_src-6b889fb5d046cdecc27c2b2d56e2400dd7c10270.tar.bz2 |
Fixed bugs in GPU process startup on POSIX platforms. Added
--gpu-startup-dialog command line option to allow debugging of GPU
process.
BUG=none
TEST=none (tested manually in development workspace)
Review URL: http://codereview.chromium.org/1095005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42375 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r-- | chrome/renderer/render_widget.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc index 5872150..def6e47 100644 --- a/chrome/renderer/render_widget.cc +++ b/chrome/renderer/render_widget.cc @@ -27,6 +27,7 @@ #include "webkit/glue/webkit_glue.h" #if defined(OS_POSIX) +#include "ipc/ipc_channel_posix.h" #include "third_party/skia/include/core/SkPixelRef.h" #include "third_party/skia/include/core/SkMallocPixelRef.h" #endif // defined(OS_POSIX) @@ -733,6 +734,12 @@ void RenderWidget::OnSetTextDirection(WebTextDirection direction) { void RenderWidget::OnGpuChannelEstablished( const IPC::ChannelHandle& channel_handle) { +#if defined(OS_POSIX) + // If we received a ChannelHandle, register it now. + if (channel_handle.socket.fd >= 0) + IPC::AddChannelSocket(channel_handle.name, channel_handle.socket.fd); +#endif + if (channel_handle.name.size() != 0) { // Connect to the GPU process if a channel name was received. gpu_channel_->Connect(channel_handle.name); |