| 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 1311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1322 media_thread_->Start(); | 1322 media_thread_->Start(); |
| 1323 | 1323 |
| 1324 #if defined(OS_ANDROID) | 1324 #if defined(OS_ANDROID) |
| 1325 renderer_demuxer_ = new RendererDemuxerAndroid(); | 1325 renderer_demuxer_ = new RendererDemuxerAndroid(); |
| 1326 AddFilter(renderer_demuxer_.get()); | 1326 AddFilter(renderer_demuxer_.get()); |
| 1327 #endif | 1327 #endif |
| 1328 } | 1328 } |
| 1329 return media_thread_->message_loop_proxy(); | 1329 return media_thread_->message_loop_proxy(); |
| 1330 } | 1330 } |
| 1331 | 1331 |
| 1332 void RenderThreadImpl::SetFlingCurveParameters( | |
| 1333 const std::vector<float>& new_touchpad, | |
| 1334 const std::vector<float>& new_touchscreen) { | |
| 1335 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | |
| 1336 new_touchscreen); | |
| 1337 | |
| 1338 } | |
| 1339 | |
| 1340 void RenderThreadImpl::SampleGamepads(WebKit::WebGamepads* data) { | 1332 void RenderThreadImpl::SampleGamepads(WebKit::WebGamepads* data) { |
| 1341 if (!gamepad_shared_memory_reader_) | 1333 if (!gamepad_shared_memory_reader_) |
| 1342 gamepad_shared_memory_reader_.reset(new GamepadSharedMemoryReader); | 1334 gamepad_shared_memory_reader_.reset(new GamepadSharedMemoryReader); |
| 1343 gamepad_shared_memory_reader_->SampleGamepads(*data); | 1335 gamepad_shared_memory_reader_->SampleGamepads(*data); |
| 1344 } | 1336 } |
| 1345 | 1337 |
| 1346 base::ProcessId RenderThreadImpl::renderer_process_id() const { | 1338 base::ProcessId RenderThreadImpl::renderer_process_id() const { |
| 1347 return renderer_process_id_; | 1339 return renderer_process_id_; |
| 1348 } | 1340 } |
| 1349 | 1341 |
| 1350 } // namespace content | 1342 } // namespace content |
| OLD | NEW |