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

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

Issue 2846623003: Make autoplay policies no longer platform dependant. (Closed)
Patch Set: bauerb review comments Created 3 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
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | media/base/media_switches.h » ('j') | 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_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 988 matching lines...) Expand 10 before | Expand all | Expand 10 after
999 999
1000 #if defined(OS_ANDROID) 1000 #if defined(OS_ANDROID)
1001 settings->SetAllowCustomScrollbarInMainFrame(false); 1001 settings->SetAllowCustomScrollbarInMainFrame(false);
1002 settings->SetTextAutosizingEnabled(prefs.text_autosizing_enabled); 1002 settings->SetTextAutosizingEnabled(prefs.text_autosizing_enabled);
1003 settings->SetAccessibilityFontScaleFactor(prefs.font_scale_factor); 1003 settings->SetAccessibilityFontScaleFactor(prefs.font_scale_factor);
1004 settings->SetDeviceScaleAdjustment(prefs.device_scale_adjustment); 1004 settings->SetDeviceScaleAdjustment(prefs.device_scale_adjustment);
1005 settings->SetFullscreenSupported(prefs.fullscreen_supported); 1005 settings->SetFullscreenSupported(prefs.fullscreen_supported);
1006 web_view->SetIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); 1006 web_view->SetIgnoreViewportTagScaleLimits(prefs.force_enable_zoom);
1007 settings->SetAutoZoomFocusedNodeToLegibleScale(true); 1007 settings->SetAutoZoomFocusedNodeToLegibleScale(true);
1008 settings->SetDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); 1008 settings->SetDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled);
1009 settings->SetMediaPlaybackRequiresUserGesture(
1010 prefs.user_gesture_required_for_media_playback);
1011 settings->SetMediaPlaybackGestureWhitelistScope( 1009 settings->SetMediaPlaybackGestureWhitelistScope(
1012 blink::WebString::FromUTF8(prefs.media_playback_gesture_whitelist_scope)); 1010 blink::WebString::FromUTF8(prefs.media_playback_gesture_whitelist_scope));
1013 settings->SetDefaultVideoPosterURL( 1011 settings->SetDefaultVideoPosterURL(
1014 WebString::FromASCII(prefs.default_video_poster_url.spec())); 1012 WebString::FromASCII(prefs.default_video_poster_url.spec()));
1015 settings->SetSupportDeprecatedTargetDensityDPI( 1013 settings->SetSupportDeprecatedTargetDensityDPI(
1016 prefs.support_deprecated_target_density_dpi); 1014 prefs.support_deprecated_target_density_dpi);
1017 settings->SetUseLegacyBackgroundSizeShorthandBehavior( 1015 settings->SetUseLegacyBackgroundSizeShorthandBehavior(
1018 prefs.use_legacy_background_size_shorthand_behavior); 1016 prefs.use_legacy_background_size_shorthand_behavior);
1019 settings->SetWideViewportQuirkEnabled(prefs.wide_viewport_quirk); 1017 settings->SetWideViewportQuirkEnabled(prefs.wide_viewport_quirk);
1020 settings->SetUseWideViewport(prefs.use_wide_viewport); 1018 settings->SetUseWideViewport(prefs.use_wide_viewport);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 WebRuntimeFeatures::EnableVideoFullscreenOrientationLock( 1050 WebRuntimeFeatures::EnableVideoFullscreenOrientationLock(
1053 prefs.video_fullscreen_orientation_lock_enabled); 1051 prefs.video_fullscreen_orientation_lock_enabled);
1054 WebRuntimeFeatures::EnableVideoRotateToFullscreen( 1052 WebRuntimeFeatures::EnableVideoRotateToFullscreen(
1055 prefs.video_rotate_to_fullscreen_enabled); 1053 prefs.video_rotate_to_fullscreen_enabled);
1056 WebRuntimeFeatures::EnableVideoFullscreenDetection( 1054 WebRuntimeFeatures::EnableVideoFullscreenDetection(
1057 prefs.video_fullscreen_detection_enabled); 1055 prefs.video_fullscreen_detection_enabled);
1058 settings->SetEmbeddedMediaExperienceEnabled( 1056 settings->SetEmbeddedMediaExperienceEnabled(
1059 prefs.embedded_media_experience_enabled); 1057 prefs.embedded_media_experience_enabled);
1060 settings->SetDoNotUpdateSelectionOnMutatingSelectionRange( 1058 settings->SetDoNotUpdateSelectionOnMutatingSelectionRange(
1061 prefs.do_not_update_selection_on_mutating_selection_range); 1059 prefs.do_not_update_selection_on_mutating_selection_range);
1062 #else // defined(OS_ANDROID)
1063 settings->SetCrossOriginMediaPlaybackRequiresUserGesture(
1064 prefs.cross_origin_media_playback_requires_user_gesture);
1065 #endif // defined(OS_ANDROID) 1060 #endif // defined(OS_ANDROID)
1066 1061
1062 // TODO(mlamouri): use an AutoplayPolicy in WebSettings.
1063 switch (prefs.autoplay_policy) {
1064 case AutoplayPolicy::kNoUserGestureRequired:
1065 settings->SetMediaPlaybackRequiresUserGesture(false);
1066 settings->SetCrossOriginMediaPlaybackRequiresUserGesture(false);
1067 break;
1068 case AutoplayPolicy::kUserGestureRequired:
1069 settings->SetMediaPlaybackRequiresUserGesture(true);
1070 settings->SetCrossOriginMediaPlaybackRequiresUserGesture(false);
1071 break;
1072 case AutoplayPolicy::kUserGestureRequiredForCrossOrigin:
1073 settings->SetMediaPlaybackRequiresUserGesture(false);
1074 settings->SetCrossOriginMediaPlaybackRequiresUserGesture(true);
1075 break;
1076 }
1077
1067 settings->SetViewportEnabled(prefs.viewport_enabled); 1078 settings->SetViewportEnabled(prefs.viewport_enabled);
1068 settings->SetViewportMetaEnabled(prefs.viewport_meta_enabled); 1079 settings->SetViewportMetaEnabled(prefs.viewport_meta_enabled);
1069 settings->SetShrinksViewportContentToFit( 1080 settings->SetShrinksViewportContentToFit(
1070 prefs.shrinks_viewport_contents_to_fit); 1081 prefs.shrinks_viewport_contents_to_fit);
1071 settings->SetViewportStyle( 1082 settings->SetViewportStyle(
1072 static_cast<blink::WebViewportStyle>(prefs.viewport_style)); 1083 static_cast<blink::WebViewportStyle>(prefs.viewport_style));
1073 1084
1074 settings->SetLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale); 1085 settings->SetLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale);
1075 settings->SetMainFrameResizesAreOrientationChanges( 1086 settings->SetMainFrameResizesAreOrientationChanges(
1076 prefs.main_frame_resizes_are_orientation_changes); 1087 prefs.main_frame_resizes_are_orientation_changes);
(...skipping 1592 matching lines...) Expand 10 before | Expand all | Expand 10 after
2669 input_event.GetCoalescedEventsPointers(), latency_info, 2680 input_event.GetCoalescedEventsPointers(), latency_info,
2670 dispatch_type); 2681 dispatch_type);
2671 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; 2682 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
2672 } 2683 }
2673 idle_user_detector_->ActivityDetected(); 2684 idle_user_detector_->ActivityDetected();
2674 return RenderWidget::HandleInputEvent(input_event, latency_info, 2685 return RenderWidget::HandleInputEvent(input_event, latency_info,
2675 dispatch_type); 2686 dispatch_type);
2676 } 2687 }
2677 2688
2678 } // namespace content 2689 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | media/base/media_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698