| 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_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 1038 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1049 WebRuntimeFeatures::EnableVideoFullscreenOrientationLock( | 1049 WebRuntimeFeatures::EnableVideoFullscreenOrientationLock( |
| 1050 prefs.video_fullscreen_orientation_lock_enabled); | 1050 prefs.video_fullscreen_orientation_lock_enabled); |
| 1051 WebRuntimeFeatures::EnableVideoFullscreenDetection( | 1051 WebRuntimeFeatures::EnableVideoFullscreenDetection( |
| 1052 prefs.video_fullscreen_detection_enabled); | 1052 prefs.video_fullscreen_detection_enabled); |
| 1053 settings->SetEmbeddedMediaExperienceEnabled( | 1053 settings->SetEmbeddedMediaExperienceEnabled( |
| 1054 prefs.embedded_media_experience_enabled); | 1054 prefs.embedded_media_experience_enabled); |
| 1055 settings->SetDoNotUpdateSelectionOnMutatingSelectionRange( | 1055 settings->SetDoNotUpdateSelectionOnMutatingSelectionRange( |
| 1056 prefs.do_not_update_selection_on_mutating_selection_range); | 1056 prefs.do_not_update_selection_on_mutating_selection_range); |
| 1057 #endif // defined(OS_ANDROID) | 1057 #endif // defined(OS_ANDROID) |
| 1058 | 1058 |
| 1059 // TODO(mlamouri): use an AutoplayPolicy in WebSettings. | |
| 1060 switch (prefs.autoplay_policy) { | 1059 switch (prefs.autoplay_policy) { |
| 1061 case AutoplayPolicy::kNoUserGestureRequired: | 1060 case AutoplayPolicy::kNoUserGestureRequired: |
| 1062 settings->SetMediaPlaybackRequiresUserGesture(false); | 1061 settings->SetAutoplayPolicy( |
| 1063 settings->SetCrossOriginMediaPlaybackRequiresUserGesture(false); | 1062 WebSettings::AutoplayPolicy::kNoUserGestureRequired); |
| 1064 break; | 1063 break; |
| 1065 case AutoplayPolicy::kCrossOriginUserGestureRequired: | 1064 case AutoplayPolicy::kCrossOriginUserGestureRequired: |
| 1066 settings->SetMediaPlaybackRequiresUserGesture(false); | 1065 settings->SetAutoplayPolicy( |
| 1067 settings->SetCrossOriginMediaPlaybackRequiresUserGesture(true); | 1066 WebSettings::AutoplayPolicy::kCrossOriginUserGestureRequired); |
| 1068 break; | 1067 break; |
| 1069 case AutoplayPolicy::kUserGestureRequired: | 1068 case AutoplayPolicy::kUserGestureRequired: |
| 1070 settings->SetMediaPlaybackRequiresUserGesture(true); | 1069 settings->SetAutoplayPolicy( |
| 1071 settings->SetCrossOriginMediaPlaybackRequiresUserGesture(false); | 1070 WebSettings::AutoplayPolicy::kUserGestureRequired); |
| 1072 break; | 1071 break; |
| 1073 } | 1072 } |
| 1074 | 1073 |
| 1075 settings->SetViewportEnabled(prefs.viewport_enabled); | 1074 settings->SetViewportEnabled(prefs.viewport_enabled); |
| 1076 settings->SetViewportMetaEnabled(prefs.viewport_meta_enabled); | 1075 settings->SetViewportMetaEnabled(prefs.viewport_meta_enabled); |
| 1077 settings->SetShrinksViewportContentToFit( | 1076 settings->SetShrinksViewportContentToFit( |
| 1078 prefs.shrinks_viewport_contents_to_fit); | 1077 prefs.shrinks_viewport_contents_to_fit); |
| 1079 settings->SetViewportStyle( | 1078 settings->SetViewportStyle( |
| 1080 static_cast<blink::WebViewportStyle>(prefs.viewport_style)); | 1079 static_cast<blink::WebViewportStyle>(prefs.viewport_style)); |
| 1081 | 1080 |
| (...skipping 1589 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2671 input_event.GetCoalescedEventsPointers(), latency_info, | 2670 input_event.GetCoalescedEventsPointers(), latency_info, |
| 2672 dispatch_type); | 2671 dispatch_type); |
| 2673 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; | 2672 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; |
| 2674 } | 2673 } |
| 2675 idle_user_detector_->ActivityDetected(); | 2674 idle_user_detector_->ActivityDetected(); |
| 2676 return RenderWidget::HandleInputEvent(input_event, latency_info, | 2675 return RenderWidget::HandleInputEvent(input_event, latency_info, |
| 2677 dispatch_type); | 2676 dispatch_type); |
| 2678 } | 2677 } |
| 2679 | 2678 |
| 2680 } // namespace content | 2679 } // namespace content |
| OLD | NEW |