Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 14582024: Change media source switch to refer to the prefixed API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 hidden_widget_count_--; 623 hidden_widget_count_--;
624 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { 624 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) {
625 return; 625 return;
626 } 626 }
627 627
628 ScheduleIdleHandler(kLongIdleHandlerDelayMs); 628 ScheduleIdleHandler(kLongIdleHandlerDelayMs);
629 } 629 }
630 630
631 static void AdjustRuntimeFeatureDefaultsForPlatform() { 631 static void AdjustRuntimeFeatureDefaultsForPlatform() {
632 #if defined(OS_ANDROID) && !defined(GOOGLE_TV) 632 #if defined(OS_ANDROID) && !defined(GOOGLE_TV)
633 WebRuntimeFeatures::enableMediaSource(false); 633 WebRuntimeFeatures::enableWebKitMediaSource(false);
634 #endif 634 #endif
635 635
636 #if defined(OS_ANDROID) 636 #if defined(OS_ANDROID)
637 WebRuntimeFeatures::enableWebAudio(false); 637 WebRuntimeFeatures::enableWebAudio(false);
638 // Web Speech API Speech recognition is not implemented on Android yet. 638 // Web Speech API Speech recognition is not implemented on Android yet.
639 WebRuntimeFeatures::enableScriptedSpeech(false); 639 WebRuntimeFeatures::enableScriptedSpeech(false);
640 // Android does not support the Gamepad API. 640 // Android does not support the Gamepad API.
641 WebRuntimeFeatures::enableGamepad(false); 641 WebRuntimeFeatures::enableGamepad(false);
642 // input[type=week] in Android is incomplete. crbug.com/135938 642 // input[type=week] in Android is incomplete. crbug.com/135938
643 WebRuntimeFeatures::enableInputTypeWeek(false); 643 WebRuntimeFeatures::enableInputTypeWeek(false);
(...skipping 13 matching lines...) Expand all
657 if (command_line.HasSwitch(switches::kDisableLocalStorage)) 657 if (command_line.HasSwitch(switches::kDisableLocalStorage))
658 WebRuntimeFeatures::enableLocalStorage(false); 658 WebRuntimeFeatures::enableLocalStorage(false);
659 659
660 if (command_line.HasSwitch(switches::kDisableSessionStorage)) 660 if (command_line.HasSwitch(switches::kDisableSessionStorage))
661 WebRuntimeFeatures::enableSessionStorage(false); 661 WebRuntimeFeatures::enableSessionStorage(false);
662 662
663 if (command_line.HasSwitch(switches::kDisableGeolocation)) 663 if (command_line.HasSwitch(switches::kDisableGeolocation))
664 WebRuntimeFeatures::enableGeolocation(false); 664 WebRuntimeFeatures::enableGeolocation(false);
665 665
666 #if !defined(OS_ANDROID) || defined(GOOGLE_TV) 666 #if !defined(OS_ANDROID) || defined(GOOGLE_TV)
667 if (command_line.HasSwitch(switches::kDisableMediaSource)) 667 if (command_line.HasSwitch(switches::kDisableWebKitMediaSource))
668 WebRuntimeFeatures::enableMediaSource(false); 668 WebRuntimeFeatures::enableWebKitMediaSource(false);
669 #endif 669 #endif
670 670
671 #if defined(OS_ANDROID) 671 #if defined(OS_ANDROID)
672 if (command_line.HasSwitch(switches::kDisableWebRTC)) 672 if (command_line.HasSwitch(switches::kDisableWebRTC))
673 WebRuntimeFeatures::enableMediaStream(false); 673 WebRuntimeFeatures::enableMediaStream(false);
674 #endif 674 #endif
675 675
676 #if defined(OS_ANDROID) 676 #if defined(OS_ANDROID)
677 if (command_line.HasSwitch(switches::kDisableWebRTC)) 677 if (command_line.HasSwitch(switches::kDisableWebRTC))
678 WebRuntimeFeatures::enablePeerConnection(false); 678 WebRuntimeFeatures::enablePeerConnection(false);
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
1311 1311
1312 void RenderThreadImpl::SetFlingCurveParameters( 1312 void RenderThreadImpl::SetFlingCurveParameters(
1313 const std::vector<float>& new_touchpad, 1313 const std::vector<float>& new_touchpad,
1314 const std::vector<float>& new_touchscreen) { 1314 const std::vector<float>& new_touchscreen) {
1315 webkit_platform_support_->SetFlingCurveParameters(new_touchpad, 1315 webkit_platform_support_->SetFlingCurveParameters(new_touchpad,
1316 new_touchscreen); 1316 new_touchscreen);
1317 1317
1318 } 1318 }
1319 1319
1320 } // namespace content 1320 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/content_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698