| 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 606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 617 hidden_widget_count_--; | 617 hidden_widget_count_--; |
| 618 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { | 618 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
| 619 return; | 619 return; |
| 620 } | 620 } |
| 621 | 621 |
| 622 ScheduleIdleHandler(kLongIdleHandlerDelayMs); | 622 ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
| 623 } | 623 } |
| 624 | 624 |
| 625 static void AdjustRuntimeFeatureDefaultsForPlatform() { | 625 static void AdjustRuntimeFeatureDefaultsForPlatform() { |
| 626 #if defined(OS_ANDROID) && !defined(GOOGLE_TV) | 626 #if defined(OS_ANDROID) && !defined(GOOGLE_TV) |
| 627 WebRuntimeFeatures::enableMediaSource(false); | 627 WebRuntimeFeatures::enableWebKitMediaSource(false); |
| 628 #endif | 628 #endif |
| 629 | 629 |
| 630 #if defined(OS_ANDROID) | 630 #if defined(OS_ANDROID) |
| 631 WebRuntimeFeatures::enableWebAudio(false); | 631 WebRuntimeFeatures::enableWebAudio(false); |
| 632 // Web Speech API Speech recognition is not implemented on Android yet. | 632 // Web Speech API Speech recognition is not implemented on Android yet. |
| 633 WebRuntimeFeatures::enableScriptedSpeech(false); | 633 WebRuntimeFeatures::enableScriptedSpeech(false); |
| 634 // Android does not support the Gamepad API. | 634 // Android does not support the Gamepad API. |
| 635 WebRuntimeFeatures::enableGamepad(false); | 635 WebRuntimeFeatures::enableGamepad(false); |
| 636 // input[type=week] in Android is incomplete. crbug.com/135938 | 636 // input[type=week] in Android is incomplete. crbug.com/135938 |
| 637 WebRuntimeFeatures::enableInputTypeWeek(false); | 637 WebRuntimeFeatures::enableInputTypeWeek(false); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 651 if (command_line.HasSwitch(switches::kDisableLocalStorage)) | 651 if (command_line.HasSwitch(switches::kDisableLocalStorage)) |
| 652 WebRuntimeFeatures::enableLocalStorage(false); | 652 WebRuntimeFeatures::enableLocalStorage(false); |
| 653 | 653 |
| 654 if (command_line.HasSwitch(switches::kDisableSessionStorage)) | 654 if (command_line.HasSwitch(switches::kDisableSessionStorage)) |
| 655 WebRuntimeFeatures::enableSessionStorage(false); | 655 WebRuntimeFeatures::enableSessionStorage(false); |
| 656 | 656 |
| 657 if (command_line.HasSwitch(switches::kDisableGeolocation)) | 657 if (command_line.HasSwitch(switches::kDisableGeolocation)) |
| 658 WebRuntimeFeatures::enableGeolocation(false); | 658 WebRuntimeFeatures::enableGeolocation(false); |
| 659 | 659 |
| 660 #if !defined(OS_ANDROID) || defined(GOOGLE_TV) | 660 #if !defined(OS_ANDROID) || defined(GOOGLE_TV) |
| 661 if (command_line.HasSwitch(switches::kDisableMediaSource)) | 661 if (command_line.HasSwitch(switches::kDisableWebKitMediaSource)) |
| 662 WebRuntimeFeatures::enableMediaSource(false); | 662 WebRuntimeFeatures::enableWebKitMediaSource(false); |
| 663 #endif | 663 #endif |
| 664 | 664 |
| 665 #if defined(OS_ANDROID) | 665 #if defined(OS_ANDROID) |
| 666 if (command_line.HasSwitch(switches::kDisableWebRTC)) | 666 if (command_line.HasSwitch(switches::kDisableWebRTC)) |
| 667 WebRuntimeFeatures::enableMediaStream(false); | 667 WebRuntimeFeatures::enableMediaStream(false); |
| 668 #endif | 668 #endif |
| 669 | 669 |
| 670 #if defined(OS_ANDROID) | 670 #if defined(OS_ANDROID) |
| 671 if (command_line.HasSwitch(switches::kDisableWebRTC)) | 671 if (command_line.HasSwitch(switches::kDisableWebRTC)) |
| 672 WebRuntimeFeatures::enablePeerConnection(false); | 672 WebRuntimeFeatures::enablePeerConnection(false); |
| (...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1305 | 1305 |
| 1306 void RenderThreadImpl::SetFlingCurveParameters( | 1306 void RenderThreadImpl::SetFlingCurveParameters( |
| 1307 const std::vector<float>& new_touchpad, | 1307 const std::vector<float>& new_touchpad, |
| 1308 const std::vector<float>& new_touchscreen) { | 1308 const std::vector<float>& new_touchscreen) { |
| 1309 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, | 1309 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, |
| 1310 new_touchscreen); | 1310 new_touchscreen); |
| 1311 | 1311 |
| 1312 } | 1312 } |
| 1313 | 1313 |
| 1314 } // namespace content | 1314 } // namespace content |
| OLD | NEW |