| OLD | NEW |
| 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 <vector> | 10 #include <vector> |
| (...skipping 1194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1205 gpu_channel_->state() == GpuChannelHost::kConnected) | 1205 gpu_channel_->state() == GpuChannelHost::kConnected) |
| 1206 return GetGpuChannel(); | 1206 return GetGpuChannel(); |
| 1207 | 1207 |
| 1208 // Recreate the channel if it has been lost. | 1208 // Recreate the channel if it has been lost. |
| 1209 gpu_channel_ = NULL; | 1209 gpu_channel_ = NULL; |
| 1210 } | 1210 } |
| 1211 | 1211 |
| 1212 // Ask the browser for the channel name. | 1212 // Ask the browser for the channel name. |
| 1213 int client_id = 0; | 1213 int client_id = 0; |
| 1214 IPC::ChannelHandle channel_handle; | 1214 IPC::ChannelHandle channel_handle; |
| 1215 GPUInfo gpu_info; | 1215 gpu::GPUInfo gpu_info; |
| 1216 if (!Send(new GpuHostMsg_EstablishGpuChannel(cause_for_gpu_launch, | 1216 if (!Send(new GpuHostMsg_EstablishGpuChannel(cause_for_gpu_launch, |
| 1217 &client_id, | 1217 &client_id, |
| 1218 &channel_handle, | 1218 &channel_handle, |
| 1219 &gpu_info)) || | 1219 &gpu_info)) || |
| 1220 #if defined(OS_POSIX) | 1220 #if defined(OS_POSIX) |
| 1221 channel_handle.socket.fd == -1 || | 1221 channel_handle.socket.fd == -1 || |
| 1222 #endif | 1222 #endif |
| 1223 channel_handle.name.empty()) { | 1223 channel_handle.name.empty()) { |
| 1224 // Otherwise cancel the connection. | 1224 // Otherwise cancel the connection. |
| 1225 gpu_channel_ = NULL; | 1225 gpu_channel_ = NULL; |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1317 | 1317 |
| 1318 void RenderThreadImpl::SetFlingCurveParameters( | 1318 void RenderThreadImpl::SetFlingCurveParameters( |
| 1319 const std::vector<float>& new_touchpad, | 1319 const std::vector<float>& new_touchpad, |
| 1320 const std::vector<float>& new_touchscreen) { | 1320 const std::vector<float>& new_touchscreen) { |
| 1321 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1321 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
| 1322 new_touchscreen); | 1322 new_touchscreen); |
| 1323 | 1323 |
| 1324 } | 1324 } |
| 1325 | 1325 |
| 1326 } // namespace content | 1326 } // namespace content |
| OLD | NEW |