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

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 1799713002: gpu_host_messages.h => content/gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed an unnecessary include Created 4 years, 9 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/renderer/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <utility> 10 #include <utility>
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 #include "content/child/thread_safe_sender.h" 67 #include "content/child/thread_safe_sender.h"
68 #include "content/child/web_database_observer_impl.h" 68 #include "content/child/web_database_observer_impl.h"
69 #include "content/child/worker_thread_registry.h" 69 #include "content/child/worker_thread_registry.h"
70 #include "content/common/child_process_messages.h" 70 #include "content/common/child_process_messages.h"
71 #include "content/common/content_constants_internal.h" 71 #include "content/common/content_constants_internal.h"
72 #include "content/common/database_messages.h" 72 #include "content/common/database_messages.h"
73 #include "content/common/dom_storage/dom_storage_messages.h" 73 #include "content/common/dom_storage/dom_storage_messages.h"
74 #include "content/common/frame_messages.h" 74 #include "content/common/frame_messages.h"
75 #include "content/common/gpu/client/context_provider_command_buffer.h" 75 #include "content/common/gpu/client/context_provider_command_buffer.h"
76 #include "content/common/gpu/client/gpu_channel_host.h" 76 #include "content/common/gpu/client/gpu_channel_host.h"
77 #include "content/common/gpu/gpu_host_messages.h"
78 #include "content/common/gpu/gpu_process_launch_causes.h" 77 #include "content/common/gpu/gpu_process_launch_causes.h"
79 #include "content/common/render_frame_setup.mojom.h" 78 #include "content/common/render_frame_setup.mojom.h"
80 #include "content/common/render_process_messages.h" 79 #include "content/common/render_process_messages.h"
81 #include "content/common/resource_messages.h" 80 #include "content/common/resource_messages.h"
82 #include "content/common/service_worker/embedded_worker_setup.mojom.h" 81 #include "content/common/service_worker/embedded_worker_setup.mojom.h"
83 #include "content/common/view_messages.h" 82 #include "content/common/view_messages.h"
84 #include "content/common/worker_messages.h" 83 #include "content/common/worker_messages.h"
85 #include "content/public/common/content_constants.h" 84 #include "content/public/common/content_constants.h"
86 #include "content/public/common/content_paths.h" 85 #include "content/public/common/content_paths.h"
87 #include "content/public/common/content_switches.h" 86 #include "content/public/common/content_switches.h"
(...skipping 1769 matching lines...) Expand 10 before | Expand all | Expand 10 after
1857 1856
1858 // Recreate the channel if it has been lost. 1857 // Recreate the channel if it has been lost.
1859 gpu_channel_->DestroyChannel(); 1858 gpu_channel_->DestroyChannel();
1860 gpu_channel_ = NULL; 1859 gpu_channel_ = NULL;
1861 } 1860 }
1862 1861
1863 // Ask the browser for the channel name. 1862 // Ask the browser for the channel name.
1864 int client_id = 0; 1863 int client_id = 0;
1865 IPC::ChannelHandle channel_handle; 1864 IPC::ChannelHandle channel_handle;
1866 gpu::GPUInfo gpu_info; 1865 gpu::GPUInfo gpu_info;
1867 if (!Send(new GpuHostMsg_EstablishGpuChannel(cause_for_gpu_launch, &client_id, 1866 if (!Send(new ChildProcessHostMsg_EstablishGpuChannel(
1868 &channel_handle, &gpu_info)) || 1867 cause_for_gpu_launch, &client_id, &channel_handle, &gpu_info)) ||
1869 #if defined(OS_POSIX) 1868 #if defined(OS_POSIX)
1870 channel_handle.socket.fd == -1 || 1869 channel_handle.socket.fd == -1 ||
1871 #endif 1870 #endif
1872 channel_handle.name.empty()) { 1871 channel_handle.name.empty()) {
1873 // Otherwise cancel the connection. 1872 // Otherwise cancel the connection.
1874 return NULL; 1873 return NULL;
1875 } 1874 }
1876 1875
1877 GetContentClient()->SetGpuInfo(gpu_info); 1876 GetContentClient()->SetGpuInfo(gpu_info);
1878 1877
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
2176 } 2175 }
2177 2176
2178 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { 2177 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
2179 size_t erased = 2178 size_t erased =
2180 RenderThreadImpl::current()->pending_render_frame_connects_.erase( 2179 RenderThreadImpl::current()->pending_render_frame_connects_.erase(
2181 routing_id_); 2180 routing_id_);
2182 DCHECK_EQ(1u, erased); 2181 DCHECK_EQ(1u, erased);
2183 } 2182 }
2184 2183
2185 } // namespace content 2184 } // namespace content
OLDNEW
« content/browser/DEPS ('K') | « content/renderer/gpu/gpu_benchmarking_extension.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698