Index: content/public/common/common_param_traits_macros.h |
diff --git a/content/public/common/common_param_traits_macros.h b/content/public/common/common_param_traits_macros.h |
index 3dd2e759f847ac67599e0dc8b7f55f917d9cb462..847618b1a3b66f2f58b33841fbb69fac2d161807 100644 |
--- a/content/public/common/common_param_traits_macros.h |
+++ b/content/public/common/common_param_traits_macros.h |
@@ -75,6 +75,9 @@ IPC_ENUM_TRAITS_MIN_MAX_VALUE(content::ImageAnimationPolicy, |
IPC_ENUM_TRAITS_MIN_MAX_VALUE(content::ViewportStyle, |
content::ViewportStyle::DEFAULT, |
content::ViewportStyle::LAST) |
+IPC_ENUM_TRAITS_MIN_MAX_VALUE(content::AutoplayPolicy, |
+ content::AutoplayPolicy::kNoUserGestureRequired, |
+ content::AutoplayPolicy::kUserGestureRequired); |
IPC_STRUCT_TRAITS_BEGIN(blink::WebPoint) |
IPC_STRUCT_TRAITS_MEMBER(x) |
@@ -220,7 +223,6 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences) |
IPC_STRUCT_TRAITS_MEMBER(force_enable_zoom) |
IPC_STRUCT_TRAITS_MEMBER(fullscreen_supported) |
IPC_STRUCT_TRAITS_MEMBER(double_tap_to_zoom_enabled) |
- IPC_STRUCT_TRAITS_MEMBER(user_gesture_required_for_media_playback) |
IPC_STRUCT_TRAITS_MEMBER(media_playback_gesture_whitelist_scope) |
IPC_STRUCT_TRAITS_MEMBER(default_video_poster_url) |
IPC_STRUCT_TRAITS_MEMBER(support_deprecated_target_density_dpi) |
@@ -241,8 +243,6 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences) |
IPC_STRUCT_TRAITS_MEMBER(video_fullscreen_orientation_lock_enabled) |
IPC_STRUCT_TRAITS_MEMBER(video_fullscreen_detection_enabled) |
IPC_STRUCT_TRAITS_MEMBER(embedded_media_experience_enabled) |
-#else // defined(OS_ANDROID) |
- IPC_STRUCT_TRAITS_MEMBER(cross_origin_media_playback_requires_user_gesture) |
#endif // defined(OS_ANDROID) |
IPC_STRUCT_TRAITS_MEMBER(default_minimum_page_scale_factor) |
IPC_STRUCT_TRAITS_MEMBER(default_maximum_page_scale_factor) |
@@ -252,6 +252,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences) |
IPC_STRUCT_TRAITS_MEMBER(presentation_receiver) |
IPC_STRUCT_TRAITS_MEMBER(media_controls_enabled) |
IPC_STRUCT_TRAITS_MEMBER(do_not_update_selection_on_mutating_selection_range) |
+ IPC_STRUCT_TRAITS_MEMBER(autoplay_policy) |
nasko
2017/04/27 16:52:50
nit: media_autoplay_policy?
mlamouri (slow - plz ping)
2017/04/27 21:34:14
nasko, to me, "autoplay" is for audio/video. What
nasko
2017/04/27 21:42:56
Do you associate playback with media only or not?
|
IPC_STRUCT_TRAITS_END() |
IPC_STRUCT_TRAITS_BEGIN(blink::mojom::WindowFeatures) |