[webkit-changes] [201156] branches/safari-602.1.32-branch/Source/WebKit2

Thu, 19 May 2016 02:36:15 -0700

Title: [201156] branches/safari-602.1.32-branch/Source/WebKit2
Revision
201156
Author
[email protected]
Date
2016-05-19 02:36:03 -0700 (Thu, 19 May 2016)

Log Message

Merge r201016. rdar://problem/25584201


Modified Paths

Diff

Modified: branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog (201155 => 201156)


--- branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog	2016-05-19 09:36:01 UTC (rev 201155)
+++ branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog	2016-05-19 09:36:03 UTC (rev 201156)
@@ -1,5 +1,16 @@
 2016-05-19  Babak Shafiei  <[email protected]>
 
+        Merge r201016. rdar://problem/25584201
+
+    2016-05-17  Jer Noble  <[email protected]>
+
+            Unreviewed GTK+ and EFL bulid fix; make the audio playback user gesture requirement
+            Cocoa-only.
+
+            * Shared/WebPreferencesDefinitions.h:
+
+2016-05-19  Babak Shafiei  <[email protected]>
+
         Merge r200951. rdar://problem/25584201
 
     2016-04-06  Jer Noble  <[email protected]>

Modified: branches/safari-602.1.32-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h (201155 => 201156)


--- branches/safari-602.1.32-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h	2016-05-19 09:36:01 UTC (rev 201155)
+++ branches/safari-602.1.32-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h	2016-05-19 09:36:03 UTC (rev 201156)
@@ -56,10 +56,12 @@
 #define DEFAULT_HIDDEN_PAGE_DOM_TIMER_THROTTLING_ENABLED true
 #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
 
 #if PLATFORM(IOS)
@@ -150,7 +152,7 @@
     macro(AVFoundationNSURLSessionEnabled, isAVFoundationNSURLSessionEnabled, Bool, bool, true, "", "") \
     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, "", "") \
     macro(InlineMediaPlaybackRequiresPlaysInlineAttribute, inlineMediaPlaybackRequiresPlaysInlineAttribute, Bool, bool, DEFAULT_INLINE_MEDIA_PLAYBACK_REQUIRES_PLAYS_INLINE_ATTRIBUTE, "", "") \

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to