| 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 1113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1124 params.web_preferences, | 1124 params.web_preferences, |
| 1125 new SharedRenderViewCounter(0), | 1125 new SharedRenderViewCounter(0), |
| 1126 params.view_id, | 1126 params.view_id, |
| 1127 params.surface_id, | 1127 params.surface_id, |
| 1128 params.session_storage_namespace_id, | 1128 params.session_storage_namespace_id, |
| 1129 params.frame_name, | 1129 params.frame_name, |
| 1130 false, | 1130 false, |
| 1131 params.swapped_out, | 1131 params.swapped_out, |
| 1132 params.next_page_id, | 1132 params.next_page_id, |
| 1133 params.screen_info, | 1133 params.screen_info, |
| 1134 params.accessibility_mode); | 1134 params.accessibility_mode, |
| 1135 params.allow_partial_swap); |
| 1135 } | 1136 } |
| 1136 | 1137 |
| 1137 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( | 1138 GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync( |
| 1138 CauseForGpuLaunch cause_for_gpu_launch) { | 1139 CauseForGpuLaunch cause_for_gpu_launch) { |
| 1139 TRACE_EVENT0("gpu", "RenderThreadImpl::EstablishGpuChannelSync"); | 1140 TRACE_EVENT0("gpu", "RenderThreadImpl::EstablishGpuChannelSync"); |
| 1140 | 1141 |
| 1141 if (gpu_channel_.get()) { | 1142 if (gpu_channel_.get()) { |
| 1142 // Do nothing if we already have a GPU channel or are already | 1143 // Do nothing if we already have a GPU channel or are already |
| 1143 // establishing one. | 1144 // establishing one. |
| 1144 if (gpu_channel_->state() == GpuChannelHost::kUnconnected || | 1145 if (gpu_channel_->state() == GpuChannelHost::kUnconnected || |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1253 | 1254 |
| 1254 void RenderThreadImpl::SetFlingCurveParameters( | 1255 void RenderThreadImpl::SetFlingCurveParameters( |
| 1255 const std::vector<float>& new_touchpad, | 1256 const std::vector<float>& new_touchpad, |
| 1256 const std::vector<float>& new_touchscreen) { | 1257 const std::vector<float>& new_touchscreen) { |
| 1257 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1258 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
| 1258 new_touchscreen); | 1259 new_touchscreen); |
| 1259 | 1260 |
| 1260 } | 1261 } |
| 1261 | 1262 |
| 1262 } // namespace content | 1263 } // namespace content |
| OLD | NEW |