diff options
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_message_filter.cc | 5 | ||||
| -rw-r--r-- | content/common/gpu/gpu_channel_manager.cc | 4 | ||||
| -rw-r--r-- | content/ppapi_plugin/ppapi_thread.cc | 6 | ||||
| -rw-r--r-- | content/renderer/pepper_plugin_delegate_impl.cc | 5 | ||||
| -rw-r--r-- | content/renderer/render_thread_impl.cc | 9 |
5 files changed, 6 insertions, 23 deletions
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc index 6afda7b..6f1aa93 100644 --- a/content/browser/renderer_host/render_message_filter.cc +++ b/content/browser/renderer_host/render_message_filter.cc @@ -163,11 +163,6 @@ class OpenChannelToPpapiBrokerCallback virtual void OnChannelOpened(base::ProcessHandle broker_process_handle, const IPC::ChannelHandle& channel_handle) { -#if defined(OS_POSIX) - // Check the validity of fd for bug investigation. Remove after fixed. - // See for details: crbug.com/103957. - CHECK_NE(-1, channel_handle.socket.fd); -#endif filter_->Send(new ViewMsg_PpapiBrokerChannelCreated(routing_id_, request_id_, broker_process_handle, diff --git a/content/common/gpu/gpu_channel_manager.cc b/content/common/gpu/gpu_channel_manager.cc index 8122db1..16f0406 100644 --- a/content/common/gpu/gpu_channel_manager.cc +++ b/content/common/gpu/gpu_channel_manager.cc @@ -105,9 +105,7 @@ void GpuChannelManager::OnEstablishChannel(int client_id, int share_client_id) { // On POSIX, pass the renderer-side FD. Also mark it as auto-close so // that it gets closed after it has been sent. int renderer_fd = channel->TakeRendererFileDescriptor(); - // Check the validity of |renderer_fd| for bug investigation. Replace with - // normal error handling after bug fixed. See for details: crbug.com/95732. - CHECK_NE(-1, renderer_fd); + DCHECK_NE(-1, renderer_fd); channel_handle.socket = base::FileDescriptor(renderer_fd, true); #endif } diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc index 154826c..8ef6d6b 100644 --- a/content/ppapi_plugin/ppapi_thread.cc +++ b/content/ppapi_plugin/ppapi_thread.cc @@ -238,9 +238,6 @@ void PpapiThread::OnMsgCreateChannel(base::ProcessHandle host_process_handle, if (!library_.is_valid() || // Plugin couldn't be loaded. !SetupRendererChannel(host_process_handle, renderer_id, &channel_handle)) { - // TODO(xhwang): Add CHECK to investigate the root cause of - // crbug.com/103957. Will remove after the bug is fixed. - CHECK(!is_broker_ || library_.is_valid()); Send(new PpapiHostMsg_ChannelCreated(IPC::ChannelHandle())); return; } @@ -310,9 +307,6 @@ bool PpapiThread::SetupRendererChannel(base::ProcessHandle host_process_handle, // This ensures this process will be notified when it is closed even if a // connection is not established. handle->socket = base::FileDescriptor(dispatcher->TakeRendererFD(), true); - // Check the validity of fd for bug investigation. Remove after fixed. - // See for details: crbug.com/103957. - CHECK_NE(-1, handle->socket.fd); if (handle->socket.fd == -1) return false; #endif diff --git a/content/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc index 1f7ffc0..e4129d6 100644 --- a/content/renderer/pepper_plugin_delegate_impl.cc +++ b/content/renderer/pepper_plugin_delegate_impl.cc @@ -517,9 +517,7 @@ class HostDispatcherWrapper return false; #if defined(OS_POSIX) - // Check the validity of fd for bug investigation. Remove after fixed. - // See for details: crbug.com/103957. - CHECK_NE(-1, channel_handle.socket.fd); + DCHECK_NE(-1, channel_handle.socket.fd); if (channel_handle.socket.fd == -1) return false; #endif @@ -669,6 +667,7 @@ bool BrokerDispatcherWrapper::Init( return false; #if defined(OS_POSIX) + DCHECK_NE(-1, channel_handle.socket.fd); if (channel_handle.socket.fd == -1) return false; #endif diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index f4314a0..20649de 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -859,18 +859,15 @@ GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( &renderer_process_for_gpu, &gpu_info)) || channel_handle.name.empty() || +#if defined(OS_POSIX) + channel_handle.socket.fd == -1 || +#endif renderer_process_for_gpu == base::kNullProcessHandle) { // Otherwise cancel the connection. gpu_channel_ = NULL; return NULL; } -#if defined(OS_POSIX) - // Check the validity of fd for bug investigation. Replace with normal error - // handling (see above) after bug fixed. See for details: crbug.com/95732. - CHECK_NE(-1, channel_handle.socket.fd); -#endif - gpu_channel_->set_gpu_info(gpu_info); content::GetContentClient()->SetGpuInfo(gpu_info); |