Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (193380 => 193381)
--- trunk/Source/WebKit/mac/ChangeLog 2015-12-03 22:54:40 UTC (rev 193380)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-12-03 23:39:38 UTC (rev 193381)
@@ -1,3 +1,20 @@
+2015-12-03 Jer Noble <jer.no...@apple.com>
+
+ Expose WebCore's InvisibleAutoplayNotPermitted setting to WebKit & WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=151830
+
+ Reviewed by Anders Carlsson.
+
+ Add a new WebPreferences property invisibleAutoplayNotPermitted.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (-[WebPreferences invisibleAutoplayNotPermitted]):
+ (-[WebPreferences setInvisibleAutoplayNotPermitted:]):
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
2015-12-03 Anders Carlsson <ander...@apple.com>
Remove Objective-C GC support
Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (193380 => 193381)
--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2015-12-03 22:54:40 UTC (rev 193380)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2015-12-03 23:39:38 UTC (rev 193381)
@@ -123,6 +123,7 @@
#define WebKitRequiresUserGestureForAudioPlaybackPreferenceKey @"WebKitAudioPlaybackRequiresUserGesture"
#define WebKitAllowsInlineMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsInline"
#define WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey @"InlineMediaPlaybackRequiresPlaysInlineAttribute"
+#define WebKitInvisibleAutoplayNotPermittedKey @"InvisibleAutoplayNotPermitted"
#define WebKitAllowsPictureInPictureMediaPlaybackPreferenceKey @"WebKitAllowsPictureInPictureMediaPlayback"
#define WebKitAllowsAirPlayForMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsAirPlay"
#define WebKitMediaControlsScaleWithPageZoomPreferenceKey @"WebKitMediaControlsScaleWithPageZoom"
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (193380 => 193381)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-12-03 22:54:40 UTC (rev 193380)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-12-03 23:39:38 UTC (rev 193381)
@@ -2218,6 +2218,16 @@
[self _setBoolValue:flag forKey:WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey];
}
+- (BOOL)invisibleAutoplayNotPermitted
+{
+ return [self _boolValueForKey:WebKitInvisibleAutoplayNotPermittedKey];
+}
+
+- (void)setInvisibleAutoplayNotPermitted:(BOOL)flag
+{
+ [self _setBoolValue:flag forKey:WebKitInvisibleAutoplayNotPermittedKey];
+}
+
- (BOOL)mediaControlsScaleWithPageZoom
{
return [self _boolValueForKey:WebKitMediaControlsScaleWithPageZoomPreferenceKey];
Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (193380 => 193381)
--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2015-12-03 22:54:40 UTC (rev 193380)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2015-12-03 23:39:38 UTC (rev 193381)
@@ -254,6 +254,9 @@
- (void)setInlineMediaPlaybackRequiresPlaysInlineAttribute:(BOOL)flag;
- (BOOL)inlineMediaPlaybackRequiresPlaysInlineAttribute;
+- (void)setInvisibleAutoplayNotPermitted:(BOOL)flag;
+- (BOOL)invisibleAutoplayNotPermitted;
+
- (void)setMediaControlsScaleWithPageZoom:(BOOL)flag;
- (BOOL)mediaControlsScaleWithPageZoom;
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (193380 => 193381)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-12-03 22:54:40 UTC (rev 193380)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-12-03 23:39:38 UTC (rev 193381)
@@ -2306,6 +2306,7 @@
settings.setAudioPlaybackRequiresUserGesture([preferences audioPlaybackRequiresUserGesture]);
settings.setAllowsInlineMediaPlayback([preferences mediaPlaybackAllowsInline]);
settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute([preferences inlineMediaPlaybackRequiresPlaysInlineAttribute]);
+ settings.setInvisibleAutoplayNotPermitted([preferences invisibleAutoplayNotPermitted]);
settings.setAllowsPictureInPictureMediaPlayback([preferences allowsPictureInPictureMediaPlayback] && shouldAllowPictureInPictureMediaPlayback());
settings.setMediaControlsScaleWithPageZoom([preferences mediaControlsScaleWithPageZoom]);
settings.setSuppressesIncrementalRendering([preferences suppressesIncrementalRendering]);
Modified: trunk/Source/WebKit2/ChangeLog (193380 => 193381)
--- trunk/Source/WebKit2/ChangeLog 2015-12-03 22:54:40 UTC (rev 193380)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-03 23:39:38 UTC (rev 193381)
@@ -1,3 +1,24 @@
+2015-12-03 Jer Noble <jer.no...@apple.com>
+
+ Expose WebCore's InvisibleAutoplayNotPermitted setting to WebKit & WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=151830
+
+ Reviewed by Anders Carlsson.
+
+ Add a new, private WKWebViewConfiguration property _invisibleAutoplayNotPermitted.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration init]):
+ (-[WKWebViewConfiguration copyWithZone:]):
+ (-[WKWebViewConfiguration _invisibleAutoplayNotPermitted]):
+ (-[WKWebViewConfiguration _setInvisibleAutoplayNotPermitted:]):
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
2015-12-03 Sam Weinig <s...@webkit.org>
It should be possible to use version 6 of the WKPageUIClient without adopting the new createNewPage
Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (193380 => 193381)
--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-12-03 22:54:40 UTC (rev 193380)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-12-03 23:39:38 UTC (rev 193381)
@@ -59,6 +59,7 @@
#define DEFAULT_PASSWORD_ECHO_ENABLED true
#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK false
#define DEFAULT_INLINE_MEDIA_PLAYBACK_REQUIRES_PLAYS_INLINE_ATTRIBUTE true
+#define DEFAULT_INVISIBLE_AUTOPLAY_NOT_PERMITTED true
#define DEFAULT_MEDIA_DATA_LOADS_AUTOMATICALLY false
#define DEFAULT_REQUIRES_USER_GESTURE_FOR_MEDIA_PLAYBACK true
#define DEFAULT_REQUIRES_USER_GESTURE_FOR_AUDIO_PLAYBACK true
@@ -75,6 +76,7 @@
#define DEFAULT_PASSWORD_ECHO_ENABLED false
#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK true
#define DEFAULT_INLINE_MEDIA_PLAYBACK_REQUIRES_PLAYS_INLINE_ATTRIBUTE false
+#define DEFAULT_INVISIBLE_AUTOPLAY_NOT_PERMITTED false
#define DEFAULT_MEDIA_DATA_LOADS_AUTOMATICALLY true
#define DEFAULT_REQUIRES_USER_GESTURE_FOR_MEDIA_PLAYBACK false
#define DEFAULT_REQUIRES_USER_GESTURE_FOR_AUDIO_PLAYBACK false
@@ -143,6 +145,7 @@
macro(RequiresUserGestureForAudioPlayback, requiresUserGestureForAudioPlayback, Bool, bool, DEFAULT_REQUIRES_USER_GESTURE_FOR_AUDIO_PLAYBACK) \
macro(AllowsInlineMediaPlayback, allowsInlineMediaPlayback, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK) \
macro(InlineMediaPlaybackRequiresPlaysInlineAttribute, inlineMediaPlaybackRequiresPlaysInlineAttribute, Bool, bool, DEFAULT_INLINE_MEDIA_PLAYBACK_REQUIRES_PLAYS_INLINE_ATTRIBUTE) \
+ macro(InvisibleAutoplayNotPermitted, invisibleAutoplayNotPermitted, Bool, bool, DEFAULT_INVISIBLE_AUTOPLAY_NOT_PERMITTED) \
macro(MediaDataLoadsAutomatically, mediaDataLoadsAutomatically, Bool, bool, DEFAULT_MEDIA_DATA_LOADS_AUTOMATICALLY) \
macro(AllowsPictureInPictureMediaPlayback, allowsPictureInPictureMediaPlayback, Bool, bool, true) \
macro(AllowsAirPlayForMediaPlayback, allowsAirPlayForMediaPlayback, Bool, bool, true) \
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (193380 => 193381)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-12-03 22:54:40 UTC (rev 193380)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-12-03 23:39:38 UTC (rev 193381)
@@ -361,6 +361,7 @@
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsPictureInPictureMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsPictureInPictureMediaPlayback] && shouldAllowPictureInPictureMediaPlayback()));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::requiresUserGestureForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration requiresUserActionForMediaPlayback]));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::requiresUserGestureForAudioPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration _requiresUserActionForAudioPlayback]));
+ pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::invisibleAutoplayNotPermittedKey(), WebKit::WebPreferencesStore::Value(!![_configuration _invisibleAutoplayNotPermitted]));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::mediaDataLoadsAutomaticallyKey(), WebKit::WebPreferencesStore::Value(!![_configuration _mediaDataLoadsAutomatically]));
#endif
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (193380 => 193381)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2015-12-03 22:54:40 UTC (rev 193380)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2015-12-03 23:39:38 UTC (rev 193381)
@@ -103,6 +103,7 @@
BOOL _alwaysRunsAtForegroundPriority;
BOOL _allowsInlineMediaPlayback;
BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute;
+ BOOL _invisibleAutoplayNotPermitted;
BOOL _mediaDataLoadsAutomatically;
BOOL _requiresUserActionForAudioPlayback;
#endif
@@ -124,6 +125,7 @@
_allowsPictureInPictureMediaPlayback = YES;
_allowsInlineMediaPlayback = WebCore::deviceClass() == MGDeviceClassiPad;
_inlineMediaPlaybackRequiresPlaysInlineAttribute = !_allowsInlineMediaPlayback;
+ _invisibleAutoplayNotPermitted = YES;
_mediaDataLoadsAutomatically = NO;
_respectsImageOrientation = YES;
_printsBackgrounds = YES;
@@ -183,6 +185,7 @@
#if PLATFORM(IOS)
configuration->_allowsInlineMediaPlayback = self->_allowsInlineMediaPlayback;
configuration->_inlineMediaPlaybackRequiresPlaysInlineAttribute = self->_inlineMediaPlaybackRequiresPlaysInlineAttribute;
+ configuration->_invisibleAutoplayNotPermitted = self->_invisibleAutoplayNotPermitted;
configuration->_mediaDataLoadsAutomatically = self->_mediaDataLoadsAutomatically;
configuration->_allowsPictureInPictureMediaPlayback = self->_allowsPictureInPictureMediaPlayback;
configuration->_alwaysRunsAtForegroundPriority = _alwaysRunsAtForegroundPriority;
@@ -456,6 +459,16 @@
_inlineMediaPlaybackRequiresPlaysInlineAttribute = requires;
}
+- (BOOL)_invisibleAutoplayNotPermitted
+{
+ return _invisibleAutoplayNotPermitted;
+}
+
+- (void)_setInvisibleAutoplayNotPermitted:(BOOL)notPermitted
+{
+ _invisibleAutoplayNotPermitted = notPermitted;
+}
+
- (BOOL)_mediaDataLoadsAutomatically
{
return _mediaDataLoadsAutomatically;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (193380 => 193381)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2015-12-03 22:54:40 UTC (rev 193380)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2015-12-03 23:39:38 UTC (rev 193381)
@@ -55,6 +55,7 @@
@property (nonatomic, setter=_setRequiresUserActionForAudioPlayback:) BOOL _requiresUserActionForAudioPlayback WK_AVAILABLE(NA, WK_IOS_TBA);
@property (nonatomic, setter=_setInlineMediaPlaybackRequiresPlaysInlineAttribute:) BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute WK_AVAILABLE(NA, WK_IOS_TBA);
+@property (nonatomic, setter=_setInvisibleAutoplayNotPermitted:) BOOL _invisibleAutoplayNotPermitted WK_AVAILABLE(NA, WK_IOS_TBA);
@property (nonatomic, setter=_setMediaDataLoadsAutomatically:) BOOL _mediaDataLoadsAutomatically WK_AVAILABLE(NA, WK_IOS_TBA);
#else
@property (nonatomic, setter=_setShowsURLsInToolTips:) BOOL _showsURLsInToolTips WK_AVAILABLE(WK_MAC_TBA, NA);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (193380 => 193381)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-12-03 22:54:40 UTC (rev 193380)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-12-03 23:39:38 UTC (rev 193381)
@@ -2783,6 +2783,7 @@
settings.setAudioPlaybackRequiresUserGesture(store.getBoolValueForKey(WebPreferencesKey::requiresUserGestureForAudioPlaybackKey()));
settings.setAllowsInlineMediaPlayback(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackKey()));
settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(store.getBoolValueForKey(WebPreferencesKey::inlineMediaPlaybackRequiresPlaysInlineAttributeKey()));
+ settings.setInvisibleAutoplayNotPermitted(store.getBoolValueForKey(WebPreferencesKey::invisibleAutoplayNotPermittedKey()));
settings.setMediaDataLoadsAutomatically(store.getBoolValueForKey(WebPreferencesKey::mediaDataLoadsAutomaticallyKey()));
settings.setAllowsPictureInPictureMediaPlayback(store.getBoolValueForKey(WebPreferencesKey::allowsPictureInPictureMediaPlaybackKey()));
settings.setMediaControlsScaleWithPageZoom(store.getBoolValueForKey(WebPreferencesKey::mediaControlsScaleWithPageZoomKey()));
Modified: trunk/Tools/ChangeLog (193380 => 193381)
--- trunk/Tools/ChangeLog 2015-12-03 22:54:40 UTC (rev 193380)
+++ trunk/Tools/ChangeLog 2015-12-03 23:39:38 UTC (rev 193381)
@@ -1,3 +1,17 @@
+2015-12-03 Jer Noble <jer.no...@apple.com>
+
+ Expose WebCore's InvisibleAutoplayNotPermitted setting to WebKit & WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=151830
+
+ Reviewed by Anders Carlsson.
+
+ Set invisibleAutoplayNotPermitted to NO by default both in WKTR and DRT.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetWebPreferencesToConsistentValues):
+ * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
+ (WTR::initializeWebViewConfiguration):
+
2015-12-03 Anders Carlsson <ander...@apple.com>
Remove Objective-C GC support
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (193380 => 193381)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-12-03 22:54:40 UTC (rev 193380)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-12-03 23:39:38 UTC (rev 193381)
@@ -943,6 +943,7 @@
[preferences setMediaPlaybackAllowsInline:YES];
[preferences setMediaPlaybackRequiresUserGesture:NO];
[preferences setMediaDataLoadsAutomatically:YES];
+ [preferences setInvisibleAutoplayNotPermitted:NO];
// Enable the tracker before creating the first WebView will
// cause initialization to use the correct database paths.
Modified: trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm (193380 => 193381)
--- trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2015-12-03 22:54:40 UTC (rev 193380)
+++ trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2015-12-03 23:39:38 UTC (rev 193381)
@@ -61,6 +61,7 @@
#if TARGET_OS_IPHONE
globalWebViewConfiguration.allowsInlineMediaPlayback = YES;
globalWebViewConfiguration._inlineMediaPlaybackRequiresPlaysInlineAttribute = NO;
+ globalWebViewConfiguration._invisibleAutoplayNotPermitted = NO;
globalWebViewConfiguration._mediaDataLoadsAutomatically = YES;
globalWebViewConfiguration.requiresUserActionForMediaPlayback = NO;
#endif
