| 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 717 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 728 #if defined(OS_ANDROID) | 728 #if defined(OS_ANDROID) |
| 729 WebRuntimeFeatures::enableWebAudio( | 729 WebRuntimeFeatures::enableWebAudio( |
| 730 command_line.HasSwitch(switches::kEnableWebAudio) && | 730 command_line.HasSwitch(switches::kEnableWebAudio) && |
| 731 media::IsMediaLibraryInitialized()); | 731 media::IsMediaLibraryInitialized()); |
| 732 #else | 732 #else |
| 733 WebRuntimeFeatures::enableWebAudio( | 733 WebRuntimeFeatures::enableWebAudio( |
| 734 !command_line.HasSwitch(switches::kDisableWebAudio) && | 734 !command_line.HasSwitch(switches::kDisableWebAudio) && |
| 735 media::IsMediaLibraryInitialized()); | 735 media::IsMediaLibraryInitialized()); |
| 736 #endif | 736 #endif |
| 737 | 737 |
| 738 WebRuntimeFeatures::enableWebMIDI( |
| 739 command_line.HasSwitch(switches::kEnableWebMIDI)); |
| 740 |
| 738 WebRuntimeFeatures::enableDeviceMotion( | 741 WebRuntimeFeatures::enableDeviceMotion( |
| 739 command_line.HasSwitch(switches::kEnableDeviceMotion)); | 742 command_line.HasSwitch(switches::kEnableDeviceMotion)); |
| 740 | 743 |
| 741 WebRuntimeFeatures::enableDeviceOrientation( | 744 WebRuntimeFeatures::enableDeviceOrientation( |
| 742 !command_line.HasSwitch(switches::kDisableDeviceOrientation)); | 745 !command_line.HasSwitch(switches::kDisableDeviceOrientation)); |
| 743 | 746 |
| 744 WebRuntimeFeatures::enableSpeechInput( | 747 WebRuntimeFeatures::enableSpeechInput( |
| 745 !command_line.HasSwitch(switches::kDisableSpeechInput)); | 748 !command_line.HasSwitch(switches::kDisableSpeechInput)); |
| 746 | 749 |
| 747 #if defined(OS_ANDROID) | 750 #if defined(OS_ANDROID) |
| (...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1305 | 1308 |
| 1306 void RenderThreadImpl::SetFlingCurveParameters( | 1309 void RenderThreadImpl::SetFlingCurveParameters( |
| 1307 const std::vector<float>& new_touchpad, | 1310 const std::vector<float>& new_touchpad, |
| 1308 const std::vector<float>& new_touchscreen) { | 1311 const std::vector<float>& new_touchscreen) { |
| 1309 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1312 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
| 1310 new_touchscreen); | 1313 new_touchscreen); |
| 1311 | 1314 |
| 1312 } | 1315 } |
| 1313 | 1316 |
| 1314 } // namespace content | 1317 } // namespace content |
| OLD | NEW |