Modified: trunk/Source/WebKit/mac/ChangeLog (198250 => 198251)
--- trunk/Source/WebKit/mac/ChangeLog 2016-03-16 00:22:14 UTC (rev 198250)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-03-16 00:45:32 UTC (rev 198251)
@@ -1,3 +1,17 @@
+2016-03-15 Jer Noble <jer.no...@apple.com>
+
+ [ios-sim debug] API test WebKit1.AudioSessionCategoryIOS timing out
+ https://bugs.webkit.org/show_bug.cgi?id=155275
+
+ Reviewed by Alexey Proskuryakov.
+
+ The videoPlaybackRequiresUserGesture and audioPlaybackRequiresUserGesture should both defalut to
+ NO, so that legacy clients of -[UIWebView setMediaPlaybackRequiresUserAction:] continue to work
+ as expected.
+
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+
2016-03-15 Oliver Hunt <oli...@apple.com>
Remove compile time define for SEPARATED_HEAP
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (198250 => 198251)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-03-16 00:22:14 UTC (rev 198250)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-03-16 00:45:32 UTC (rev 198251)
@@ -524,8 +524,6 @@
[NSNumber numberWithBool:NO], WebKitSuppressesIncrementalRenderingKey,
[NSNumber numberWithBool:attachmentElementEnabled], WebKitAttachmentElementEnabledPreferenceKey,
#if !PLATFORM(IOS)
- [NSNumber numberWithBool:NO], WebKitRequiresUserGestureForVideoPlaybackPreferenceKey,
- [NSNumber numberWithBool:NO], WebKitRequiresUserGestureForAudioPlaybackPreferenceKey,
[NSNumber numberWithBool:YES], WebKitAllowsInlineMediaPlaybackPreferenceKey,
[NSNumber numberWithBool:NO], WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey,
[NSNumber numberWithBool:YES], WebKitMediaControlsScaleWithPageZoomPreferenceKey,
@@ -538,8 +536,6 @@
[NSNumber numberWithBool:NO], WebKitShouldRespectImageOrientationKey,
[NSNumber numberWithBool:YES], WebKitMediaDataLoadsAutomaticallyPreferenceKey,
#else
- [NSNumber numberWithBool:YES], WebKitRequiresUserGestureForVideoPlaybackPreferenceKey,
- [NSNumber numberWithBool:YES], WebKitRequiresUserGestureForAudioPlaybackPreferenceKey,
[NSNumber numberWithBool:allowsInlineMediaPlayback], WebKitAllowsInlineMediaPlaybackPreferenceKey,
[NSNumber numberWithBool:requiresPlaysInlineAttribute], WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey,
[NSNumber numberWithBool:NO], WebKitMediaControlsScaleWithPageZoomPreferenceKey,
@@ -548,6 +544,8 @@
#if HAVE(AVKIT)
[NSNumber numberWithBool:YES], WebKitAVKitEnabled,
#endif
+ [NSNumber numberWithBool:NO], WebKitRequiresUserGestureForVideoPlaybackPreferenceKey,
+ [NSNumber numberWithBool:NO], WebKitRequiresUserGestureForAudioPlaybackPreferenceKey,
[NSNumber numberWithLongLong:WebCore::ApplicationCacheStorage::noQuota()], WebKitApplicationCacheTotalQuota,
// Per-Origin Quota on iOS is 25MB. When the quota is reached for a particular origin
