Modified: trunk/Source/WebKit2/ChangeLog (165344 => 165345)
--- trunk/Source/WebKit2/ChangeLog 2014-03-09 02:16:11 UTC (rev 165344)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-09 02:18:32 UTC (rev 165345)
@@ -1,3 +1,13 @@
+2014-03-08 Eric Carlson <eric.carl...@apple.com>
+
+ [iOS] media preferences not initialized correctly in WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=129983
+
+ Reviewed by Dan Bernstein.
+
+ * Shared/WebPreferencesStore.h: Initialize mediaPlaybackAllowsInline and
+ mediaPlaybackRequiresUserGesture correctly for iOS.
+
2014-03-08 Jeremy Jones <jere...@apple.com>
Allow media element to supply the video layer after fullscreen transition has already begun.
Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (165344 => 165345)
--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-03-09 02:16:11 UTC (rev 165344)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-03-09 02:18:32 UTC (rev 165345)
@@ -72,6 +72,8 @@
#define DEFAULT_SHOULD_RESPECT_IMAGE_ORIENTATION true
#define DEFAULT_MINIMUM_FONT_ZOOM_SIZE WKGetMinimumZoomFontSize()
#define DEFAULT_PASSWORD_ECHO_ENABLED true
+#define DEFAULT_MEDIA_PLAYBACK_ALLOWS_INLINE false
+#define DEFAULT_MEDIA_PLAYBACK_REQUIRES_USER_GESTURE true
#else
#define DEFAULT_FRAME_FLATTENING_ENABLED false
#define DEFAULT_SHOULD_PRINT_BACKGROUNDS false
@@ -80,6 +82,8 @@
#define DEFAULT_SHOULD_RESPECT_IMAGE_ORIENTATION false
#define DEFAULT_MINIMUM_FONT_ZOOM_SIZE 0
#define DEFAULT_PASSWORD_ECHO_ENABLED false
+#define DEFAULT_MEDIA_PLAYBACK_ALLOWS_INLINE true
+#define DEFAULT_MEDIA_PLAYBACK_REQUIRES_USER_GESTURE false
#endif
#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
@@ -147,8 +151,8 @@
macro(AllowUniversalAccessFromFileURLs, allowUniversalAccessFromFileURLs, Bool, bool, false) \
macro(AllowFileAccessFromFileURLs, allowFileAccessFromFileURLs, Bool, bool, false) \
macro(AVFoundationEnabled, isAVFoundationEnabled, Bool, bool, true) \
- macro(MediaPlaybackRequiresUserGesture, mediaPlaybackRequiresUserGesture, Bool, bool, false) \
- macro(MediaPlaybackAllowsInline, mediaPlaybackAllowsInline, Bool, bool, true) \
+ macro(MediaPlaybackRequiresUserGesture, mediaPlaybackRequiresUserGesture, Bool, bool, DEFAULT_MEDIA_PLAYBACK_REQUIRES_USER_GESTURE) \
+ macro(MediaPlaybackAllowsInline, mediaPlaybackAllowsInline, Bool, bool, DEFAULT_MEDIA_PLAYBACK_ALLOWS_INLINE) \
macro(InspectorStartsAttached, inspectorStartsAttached, Bool, bool, true) \
macro(ShowsToolTipOverTruncatedText, showsToolTipOverTruncatedText, Bool, bool, false) \
macro(MockScrollbarsEnabled, mockScrollbarsEnabled, Bool, bool, false) \
