Changeset 201156 in webkit

Timestamp:

May 19, 2016, 2:36:03 AM (9 years ago)

Author:

bshafiei@apple.com

Message:

Merge r201016. rdar://problem/25584201

Location:

branches/safari-602.1.32-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebPreferencesDefinitions.h (modified) (2 diffs)

branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-05-19  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r201016. rdar://problem/25584201
+
+    2016-05-17  Jer Noble  <jer.noble@apple.com>
+
+            Unreviewed GTK+ and EFL bulid fix; make the audio playback user gesture requirement
+            Cocoa-only.
+
+            * Shared/WebPreferencesDefinitions.h:
+
 2016-05-19  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-602.1.32-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h

@@ -57 +57 @@
 #define DEFAULT_HIDDEN_PAGE_CSS_ANIMATION_SUSPENSION_ENABLED true
 #define DEFAULT_PDFPLUGIN_ENABLED true
+#define DEFAULT_REQUIRES_USER_GESTURE_FOR_AUDIO_PLAYBACK true
 #else
 #define DEFAULT_HIDDEN_PAGE_DOM_TIMER_THROTTLING_ENABLED false
 #define DEFAULT_HIDDEN_PAGE_CSS_ANIMATION_SUSPENSION_ENABLED false
 #define DEFAULT_PDFPLUGIN_ENABLED false
+#define DEFAULT_REQUIRES_USER_GESTURE_FOR_AUDIO_PLAYBACK false
 #endif
 
@@ -151 +153 @@
     macro(RequiresUserGestureForMediaPlayback, requiresUserGestureForMediaPlayback, Bool, bool, false, "", "") \
     macro(RequiresUserGestureForVideoPlayback, requiresUserGestureForVideoPlayback, Bool, bool, false, "", "") \
-    macro(RequiresUserGestureForAudioPlayback, requiresUserGestureForAudioPlayback, Bool, bool, true, "", "") \
+    macro(RequiresUserGestureForAudioPlayback, requiresUserGestureForAudioPlayback, Bool, bool, DEFAULT_REQUIRES_USER_GESTURE_FOR_AUDIO_PLAYBACK, "", "") \
     macro(MainContentUserGestureOverrideEnabled, mainContentUserGestureOverrideEnabled, Bool, bool, false, "", "") \
     macro(AllowsInlineMediaPlayback, allowsInlineMediaPlayback, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK, "", "") \