Title: [207745] branches/safari-602-branch/Source/WebKit/mac
- Revision
- 207745
- Author
- matthew_han...@apple.com
- Date
- 2016-10-24 00:18:39 -0700 (Mon, 24 Oct 2016)
Log Message
Merge r207160. rdar://problem/28857480
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebKit/mac/ChangeLog (207744 => 207745)
--- branches/safari-602-branch/Source/WebKit/mac/ChangeLog 2016-10-24 07:18:37 UTC (rev 207744)
+++ branches/safari-602-branch/Source/WebKit/mac/ChangeLog 2016-10-24 07:18:39 UTC (rev 207745)
@@ -1,5 +1,28 @@
2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r207160. rdar://problem/28857480
+
+ 2016-10-11 Daniel Bates <daba...@apple.com>
+
+ REGRESSION (r198251): -[UIWebView mediaPlaybackRequiresUserAction] defaults to NO
+ https://bugs.webkit.org/show_bug.cgi?id=163259
+ <rdar://problem/28680515>
+
+ Reviewed by Jer Noble.
+
+ In WebKit1 on iOS we want to require user action to load and play videos by default and
+ allow an embedding app to change this behavior via -[UIWebView setMediaPlaybackRequiresUserAction:].
+ Following r198251, -[UIWebView mediaPlaybackRequiresUserAction] defaults to NO and videos
+ can load and play without being initiated by a user action.
+
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]): Initialize the default value of the deprecated preference
+ WebKitRequiresUserGestureForMediaPlaybackPreferenceKey to YES on iOS. The value of this
+ preference takes precedence over the values of its replacement preferences
+ WebKitRequiresUserGestureForVideoPlaybackPreferenceKey and WebKitRequiresUserGestureForAudioPlaybackPreferenceKey.
+
+2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r207159. rdar://problem/28857481
2016-10-11 Daniel Bates <daba...@apple.com>
Modified: branches/safari-602-branch/Source/WebKit/mac/WebView/WebPreferences.mm (207744 => 207745)
--- branches/safari-602-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2016-10-24 07:18:37 UTC (rev 207744)
+++ branches/safari-602-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2016-10-24 07:18:39 UTC (rev 207745)
@@ -545,6 +545,7 @@
#if HAVE(AVKIT)
[NSNumber numberWithBool:YES], WebKitAVKitEnabled,
#endif
+ [NSNumber numberWithBool:YES], WebKitRequiresUserGestureForMediaPlaybackPreferenceKey,
[NSNumber numberWithBool:NO], WebKitRequiresUserGestureForVideoPlaybackPreferenceKey,
[NSNumber numberWithBool:NO], WebKitRequiresUserGestureForAudioPlaybackPreferenceKey,
[NSNumber numberWithLongLong:WebCore::ApplicationCacheStorage::noQuota()], WebKitApplicationCacheTotalQuota,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
