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 1017 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1028 WebSettings::AutoplayPolicy::kNoUserGestureRequired); | 1028 WebSettings::AutoplayPolicy::kNoUserGestureRequired); |
1029 break; | 1029 break; |
1030 case AutoplayPolicy::kUserGestureRequired: | 1030 case AutoplayPolicy::kUserGestureRequired: |
1031 settings->SetAutoplayPolicy( | 1031 settings->SetAutoplayPolicy( |
1032 WebSettings::AutoplayPolicy::kUserGestureRequired); | 1032 WebSettings::AutoplayPolicy::kUserGestureRequired); |
1033 break; | 1033 break; |
1034 case AutoplayPolicy::kUserGestureRequiredForCrossOrigin: | 1034 case AutoplayPolicy::kUserGestureRequiredForCrossOrigin: |
1035 settings->SetAutoplayPolicy( | 1035 settings->SetAutoplayPolicy( |
1036 WebSettings::AutoplayPolicy::kUserGestureRequiredForCrossOrigin); | 1036 WebSettings::AutoplayPolicy::kUserGestureRequiredForCrossOrigin); |
1037 break; | 1037 break; |
| 1038 case AutoplayPolicy::kDocumentUserActivationRequired: |
| 1039 settings->SetAutoplayPolicy( |
| 1040 WebSettings::AutoplayPolicy::kDocumentUserActivationRequired); |
| 1041 break; |
1038 } | 1042 } |
1039 | 1043 |
1040 settings->SetViewportEnabled(prefs.viewport_enabled); | 1044 settings->SetViewportEnabled(prefs.viewport_enabled); |
1041 settings->SetViewportMetaEnabled(prefs.viewport_meta_enabled); | 1045 settings->SetViewportMetaEnabled(prefs.viewport_meta_enabled); |
1042 settings->SetShrinksViewportContentToFit( | 1046 settings->SetShrinksViewportContentToFit( |
1043 prefs.shrinks_viewport_contents_to_fit); | 1047 prefs.shrinks_viewport_contents_to_fit); |
1044 settings->SetViewportStyle( | 1048 settings->SetViewportStyle( |
1045 static_cast<blink::WebViewportStyle>(prefs.viewport_style)); | 1049 static_cast<blink::WebViewportStyle>(prefs.viewport_style)); |
1046 | 1050 |
1047 settings->SetLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale); | 1051 settings->SetLoadWithOverviewMode(prefs.initialize_at_minimum_page_scale); |
(...skipping 1604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2652 input_event.GetCoalescedEventsPointers(), latency_info, | 2656 input_event.GetCoalescedEventsPointers(), latency_info, |
2653 dispatch_type); | 2657 dispatch_type); |
2654 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; | 2658 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; |
2655 } | 2659 } |
2656 idle_user_detector_->ActivityDetected(); | 2660 idle_user_detector_->ActivityDetected(); |
2657 return RenderWidget::HandleInputEvent(input_event, latency_info, | 2661 return RenderWidget::HandleInputEvent(input_event, latency_info, |
2658 dispatch_type); | 2662 dispatch_type); |
2659 } | 2663 } |
2660 | 2664 |
2661 } // namespace content | 2665 } // namespace content |
OLD | NEW |