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 724 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
735 media::IsMediaLibraryInitialized()); | 735 media::IsMediaLibraryInitialized()); |
736 #else | 736 #else |
737 WebRuntimeFeatures::enableWebAudio( | 737 WebRuntimeFeatures::enableWebAudio( |
738 !command_line.HasSwitch(switches::kDisableWebAudio) && | 738 !command_line.HasSwitch(switches::kDisableWebAudio) && |
739 media::IsMediaLibraryInitialized()); | 739 media::IsMediaLibraryInitialized()); |
740 #endif | 740 #endif |
741 | 741 |
742 WebRuntimeFeatures::enableWebMIDI( | 742 WebRuntimeFeatures::enableWebMIDI( |
743 command_line.HasSwitch(switches::kEnableWebMIDI)); | 743 command_line.HasSwitch(switches::kEnableWebMIDI)); |
744 | 744 |
745 WebRuntimeFeatures::enableDeviceMotion( | 745 WebRuntimeFeatures::enableDeviceMotion(true); |
746 command_line.HasSwitch(switches::kEnableDeviceMotion)); | 746 // command_line.HasSwitch(switches::kEnableDeviceMotion)); |
jamesr
2013/05/16 19:53:06
huh?
timvolodine
2013/05/20 18:18:48
Done.
| |
747 | 747 |
748 WebRuntimeFeatures::enableDeviceOrientation( | 748 WebRuntimeFeatures::enableDeviceOrientation( |
749 !command_line.HasSwitch(switches::kDisableDeviceOrientation)); | 749 !command_line.HasSwitch(switches::kDisableDeviceOrientation)); |
750 | 750 |
751 WebRuntimeFeatures::enableSpeechInput( | 751 WebRuntimeFeatures::enableSpeechInput( |
752 !command_line.HasSwitch(switches::kDisableSpeechInput)); | 752 !command_line.HasSwitch(switches::kDisableSpeechInput)); |
753 | 753 |
754 #if defined(OS_ANDROID) | 754 #if defined(OS_ANDROID) |
755 // Web Speech API Speech recognition is not implemented on Android yet. | 755 // Web Speech API Speech recognition is not implemented on Android yet. |
756 WebRuntimeFeatures::enableScriptedSpeech(false); | 756 WebRuntimeFeatures::enableScriptedSpeech(false); |
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1314 | 1314 |
1315 void RenderThreadImpl::SetFlingCurveParameters( | 1315 void RenderThreadImpl::SetFlingCurveParameters( |
1316 const std::vector<float>& new_touchpad, | 1316 const std::vector<float>& new_touchpad, |
1317 const std::vector<float>& new_touchscreen) { | 1317 const std::vector<float>& new_touchscreen) { |
1318 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1318 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
1319 new_touchscreen); | 1319 new_touchscreen); |
1320 | 1320 |
1321 } | 1321 } |
1322 | 1322 |
1323 } // namespace content | 1323 } // namespace content |
OLD | NEW |