Diff
Modified: trunk/Source/WebCore/ChangeLog (184801 => 184802)
--- trunk/Source/WebCore/ChangeLog 2015-05-22 23:44:18 UTC (rev 184801)
+++ trunk/Source/WebCore/ChangeLog 2015-05-22 23:56:38 UTC (rev 184802)
@@ -1,3 +1,21 @@
+2015-05-22 Jon Lee <[email protected]>
+
+ Rename MediaPlaybackRequiresUserGesture
+ https://bugs.webkit.org/show_bug.cgi?id=145314
+
+ Reviewed by Anders Carlsson.
+
+ In preparation for an API rename, update internal symbols from mediaPlaybackRequiresUserGesture
+ to requiresUserGestureForMediaPlayback.
+
+ * page/Settings.cpp: update static const default variable name.
+ * page/Settings.in: update the setting name and static const default variable name.
+
+ * Modules/webaudio/AudioContext.cpp:
+ (WebCore::AudioContext::constructCommon): Update settings call.
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::HTMLMediaElement): Ditto.
+
2015-05-22 Joanmarie Diggs <[email protected]>
AX: Figure out why list-detection2.html test fails on GTK
Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp (184801 => 184802)
--- trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2015-05-22 23:44:18 UTC (rev 184801)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2015-05-22 23:56:38 UTC (rev 184802)
@@ -171,7 +171,7 @@
m_listener = AudioListener::create();
#if PLATFORM(IOS)
- if (!document()->settings() || document()->settings()->mediaPlaybackRequiresUserGesture())
+ if (!document()->settings() || document()->settings()->requiresUserGestureForMediaPlayback())
addBehaviorRestriction(RequireUserGestureForAudioStartRestriction);
else
m_restrictions = NoRestrictions;
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (184801 => 184802)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-05-22 23:44:18 UTC (rev 184801)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-05-22 23:56:38 UTC (rev 184802)
@@ -369,13 +369,13 @@
// FIXME: We should clean up and look to better merge the iOS and non-iOS code below.
Settings* settings = document.settings();
#if !PLATFORM(IOS)
- if (settings && settings->mediaPlaybackRequiresUserGesture()) {
+ if (settings && settings->requiresUserGestureForMediaPlayback()) {
m_mediaSession->addBehaviorRestriction(HTMLMediaSession::RequireUserGestureForRateChange);
m_mediaSession->addBehaviorRestriction(HTMLMediaSession::RequireUserGestureForLoad);
}
#else
m_sendProgressEvents = false;
- if (!settings || settings->mediaPlaybackRequiresUserGesture()) {
+ if (!settings || settings->requiresUserGestureForMediaPlayback()) {
// Allow autoplay in a MediaDocument that is not in an iframe.
if (document.ownerElement() || !document.isMediaDocument())
m_mediaSession->addBehaviorRestriction(HTMLMediaSession::RequireUserGestureForRateChange);
@@ -383,7 +383,7 @@
m_mediaSession->addBehaviorRestriction(HTMLMediaSession::RequireUserGestureToShowPlaybackTargetPicker);
#endif
} else {
- // Relax RequireUserGestureForFullscreen when mediaPlaybackRequiresUserGesture is not set:
+ // Relax RequireUserGestureForFullscreen when requiresUserGestureForMediaPlayback is not set:
m_mediaSession->removeBehaviorRestriction(HTMLMediaSession::RequireUserGestureForFullscreen);
}
#endif // !PLATFORM(IOS)
Modified: trunk/Source/WebCore/page/Settings.cpp (184801 => 184802)
--- trunk/Source/WebCore/page/Settings.cpp 2015-05-22 23:44:18 UTC (rev 184801)
+++ trunk/Source/WebCore/page/Settings.cpp 2015-05-22 23:56:38 UTC (rev 184802)
@@ -126,7 +126,7 @@
static const bool defaultFixedBackgroundsPaintRelativeToDocument = true;
static const bool defaultAcceleratedCompositingForFixedPositionEnabled = true;
static const bool defaultMediaPlaybackAllowsInline = false;
-static const bool defaultMediaPlaybackRequiresUserGesture = true;
+static const bool defaultRequiresUserGestureForMediaPlayback = true;
static const bool defaultAudioPlaybackRequiresUserGesture = true;
static const bool defaultShouldRespectImageOrientation = true;
static const bool defaultImageSubsamplingEnabled = true;
@@ -136,7 +136,7 @@
static const bool defaultFixedBackgroundsPaintRelativeToDocument = false;
static const bool defaultAcceleratedCompositingForFixedPositionEnabled = false;
static const bool defaultMediaPlaybackAllowsInline = true;
-static const bool defaultMediaPlaybackRequiresUserGesture = false;
+static const bool defaultRequiresUserGestureForMediaPlayback = false;
static const bool defaultAudioPlaybackRequiresUserGesture = false;
static const bool defaultShouldRespectImageOrientation = false;
static const bool defaultImageSubsamplingEnabled = false;
Modified: trunk/Source/WebCore/page/Settings.in (184801 => 184802)
--- trunk/Source/WebCore/page/Settings.in 2015-05-22 23:44:18 UTC (rev 184801)
+++ trunk/Source/WebCore/page/Settings.in 2015-05-22 23:56:38 UTC (rev 184802)
@@ -125,7 +125,7 @@
fixedElementsLayoutRelativeToFrame initial=false
allowDisplayOfInsecureContent initial=false
allowRunningOfInsecureContent initial=false
-mediaPlaybackRequiresUserGesture initial=defaultMediaPlaybackRequiresUserGesture
+requiresUserGestureForMediaPlayback initial=defaultRequiresUserGestureForMediaPlayback
audioPlaybackRequiresUserGesture initial=defaultAudioPlaybackRequiresUserGesture
mediaPlaybackAllowsInline initial=defaultMediaPlaybackAllowsInline
allowsAlternateFullscreen initial=defaultAllowsAlternateFullscreen
Modified: trunk/Source/WebKit/mac/ChangeLog (184801 => 184802)
--- trunk/Source/WebKit/mac/ChangeLog 2015-05-22 23:44:18 UTC (rev 184801)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-05-22 23:56:38 UTC (rev 184802)
@@ -1,3 +1,25 @@
+2015-05-22 Jon Lee <[email protected]>
+
+ Rename MediaPlaybackRequiresUserGesture
+ https://bugs.webkit.org/show_bug.cgi?id=145314
+
+ Reviewed by Anders Carlsson.
+
+ In preparation for an API rename, update internal symbols from mediaPlaybackRequiresUserGesture
+ to requiresUserGestureForMediaPlayback.
+
+ No changes are being made to the API in this patch.
+
+ * WebView/WebPreferenceKeysPrivate.h: Update the name of the key, but not its value, for backwards
+ compatibility.
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]): Update the symbol.
+ (-[WebPreferences mediaPlaybackRequiresUserGesture]): Ditto. This setting will not be renamed
+ in a future patch.
+ (-[WebPreferences setMediaPlaybackRequiresUserGesture:]): Ditto.
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]): Update the call to settings.
+
2015-05-22 Tim Horton <[email protected]>
Remove action menu support
Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (184801 => 184802)
--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2015-05-22 23:44:18 UTC (rev 184801)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2015-05-22 23:56:38 UTC (rev 184802)
@@ -119,7 +119,7 @@
#define WebKitHyperlinkAuditingEnabledPreferenceKey @"WebKitHyperlinkAuditingEnabled"
#define WebKitAVFoundationEnabledKey @"WebKitAVFoundationEnabled"
#define WebKitHixie76WebSocketProtocolEnabledKey @"WebKitHixie76WebSocketProtocolEnabled"
-#define WebKitMediaPlaybackRequiresUserGesturePreferenceKey @"WebKitMediaPlaybackRequiresUserGesture"
+#define WebKitRequiresUserGestureForMediaPlaybackPreferenceKey @"WebKitMediaPlaybackRequiresUserGesture"
#define WebKitMediaPlaybackAllowsInlinePreferenceKey @"WebKitMediaPlaybackAllowsInline"
#define WebKitAllowsAlternateFullscreenPreferenceKey @"WebKitAllowsAlternateFullscreen"
#define WebKitMockScrollbarsEnabledPreferenceKey @"WebKitMockScrollbarsEnabled"
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (184801 => 184802)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-05-22 23:44:18 UTC (rev 184801)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-05-22 23:56:38 UTC (rev 184802)
@@ -517,7 +517,7 @@
[NSNumber numberWithBool:YES], WebKitAVFoundationEnabledKey,
[NSNumber numberWithBool:NO], WebKitSuppressesIncrementalRenderingKey,
#if !PLATFORM(IOS)
- [NSNumber numberWithBool:NO], WebKitMediaPlaybackRequiresUserGesturePreferenceKey,
+ [NSNumber numberWithBool:NO], WebKitRequiresUserGestureForMediaPlaybackPreferenceKey,
[NSNumber numberWithBool:YES], WebKitMediaPlaybackAllowsInlinePreferenceKey,
[NSNumber numberWithBool:NO], WebKitWebAudioEnabledPreferenceKey,
[NSNumber numberWithBool:YES], WebKitBackspaceKeyNavigationEnabledKey,
@@ -527,7 +527,7 @@
[NSNumber numberWithBool:YES], WebKitNotificationsEnabledKey,
[NSNumber numberWithBool:NO], WebKitShouldRespectImageOrientationKey,
#else
- [NSNumber numberWithBool:YES], WebKitMediaPlaybackRequiresUserGesturePreferenceKey,
+ [NSNumber numberWithBool:YES], WebKitRequiresUserGestureForMediaPlaybackPreferenceKey,
[NSNumber numberWithBool:NO], WebKitMediaPlaybackAllowsInlinePreferenceKey,
[NSNumber numberWithBool:YES], WebKitMediaPlaybackAllowsAirPlayPreferenceKey,
[NSNumber numberWithUnsignedInt:AudioSession::None], WebKitAudioSessionCategoryOverride,
@@ -2160,12 +2160,12 @@
- (BOOL)mediaPlaybackRequiresUserGesture
{
- return [self _boolValueForKey:WebKitMediaPlaybackRequiresUserGesturePreferenceKey];
+ return [self _boolValueForKey:WebKitRequiresUserGestureForMediaPlaybackPreferenceKey];
}
- (void)setMediaPlaybackRequiresUserGesture:(BOOL)flag
{
- [self _setBoolValue:flag forKey:WebKitMediaPlaybackRequiresUserGesturePreferenceKey];
+ [self _setBoolValue:flag forKey:WebKitRequiresUserGestureForMediaPlaybackPreferenceKey];
}
- (BOOL)mediaPlaybackAllowsInline
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (184801 => 184802)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-05-22 23:44:18 UTC (rev 184801)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-05-22 23:56:38 UTC (rev 184802)
@@ -2296,7 +2296,7 @@
settings.setInteractiveFormValidationEnabled([self interactiveFormValidationEnabled]);
settings.setValidationMessageTimerMagnification([self validationMessageTimerMagnification]);
- settings.setMediaPlaybackRequiresUserGesture([preferences mediaPlaybackRequiresUserGesture]);
+ settings.setRequiresUserGestureForMediaPlayback([preferences mediaPlaybackRequiresUserGesture]);
settings.setMediaPlaybackAllowsInline([preferences mediaPlaybackAllowsInline]);
settings.setAllowsAlternateFullscreen([preferences allowsAlternateFullscreen] && shouldAllowAlternateFullscreen());
settings.setSuppressesIncrementalRendering([preferences suppressesIncrementalRendering]);
Modified: trunk/Source/WebKit2/ChangeLog (184801 => 184802)
--- trunk/Source/WebKit2/ChangeLog 2015-05-22 23:44:18 UTC (rev 184801)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-22 23:56:38 UTC (rev 184802)
@@ -1,3 +1,24 @@
+2015-05-22 Jon Lee <[email protected]>
+
+ Rename MediaPlaybackRequiresUserGesture
+ https://bugs.webkit.org/show_bug.cgi?id=145314
+
+ Reviewed by Anders Carlsson.
+
+ In preparation for an API rename, update internal symbols from mediaPlaybackRequiresUserGesture
+ to requiresUserGestureForMediaPlayback.
+
+ No changes are being made to the API in this patch.
+
+ * Shared/WebPreferencesDefinitions.h: Update the name of the macro and the setting.
+ * UIProcess/API/C/WKPreferences.cpp: The C API will not change in a future patch.
+ (WKPreferencesSetMediaPlaybackRequiresUserGesture): Update the call to preferences.
+ (WKPreferencesGetMediaPlaybackRequiresUserGesture): Ditto.
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]): Update the name of the key.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences): Ditto.
+
2015-05-22 Commit Queue <[email protected]>
Unreviewed, rolling out r183647.
Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (184801 => 184802)
--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-05-22 23:44:18 UTC (rev 184801)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-05-22 23:56:38 UTC (rev 184802)
@@ -57,7 +57,7 @@
#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
+#define DEFAULT_REQUIRES_USER_GESTURE_FOR_MEDIA_PLAYBACK true
#define DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED false
#else
#define DEFAULT_FRAME_FLATTENING_ENABLED false
@@ -68,7 +68,7 @@
#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
+#define DEFAULT_REQUIRES_USER_GESTURE_FOR_MEDIA_PLAYBACK false
#define DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED true
#endif
@@ -128,7 +128,7 @@
macro(AllowUniversalAccessFromFileURLs, allowUniversalAccessFromFileURLs, Bool, bool, false) \
macro(AllowFileAccessFromFileURLs, allowFileAccessFromFileURLs, Bool, bool, false) \
macro(AVFoundationEnabled, isAVFoundationEnabled, Bool, bool, true) \
- macro(MediaPlaybackRequiresUserGesture, mediaPlaybackRequiresUserGesture, Bool, bool, DEFAULT_MEDIA_PLAYBACK_REQUIRES_USER_GESTURE) \
+ macro(RequiresUserGestureForMediaPlayback, requiresUserGestureForMediaPlayback, Bool, bool, DEFAULT_REQUIRES_USER_GESTURE_FOR_MEDIA_PLAYBACK) \
macro(MediaPlaybackAllowsInline, mediaPlaybackAllowsInline, Bool, bool, DEFAULT_MEDIA_PLAYBACK_ALLOWS_INLINE) \
macro(AllowsAlternateFullscreen, allowsAlternateFullscreen, Bool, bool, true) \
macro(MediaPlaybackAllowsAirPlay, mediaPlaybackAllowsAirPlay, Bool, bool, true) \
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (184801 => 184802)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2015-05-22 23:44:18 UTC (rev 184801)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2015-05-22 23:56:38 UTC (rev 184802)
@@ -730,12 +730,12 @@
void WKPreferencesSetMediaPlaybackRequiresUserGesture(WKPreferencesRef preferencesRef, bool flag)
{
- toImpl(preferencesRef)->setMediaPlaybackRequiresUserGesture(flag);
+ toImpl(preferencesRef)->setRequiresUserGestureForMediaPlayback(flag);
}
bool WKPreferencesGetMediaPlaybackRequiresUserGesture(WKPreferencesRef preferencesRef)
{
- return toImpl(preferencesRef)->mediaPlaybackRequiresUserGesture();
+ return toImpl(preferencesRef)->requiresUserGestureForMediaPlayback();
}
void WKPreferencesSetMediaPlaybackAllowsInline(WKPreferencesRef preferencesRef, bool flag)
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (184801 => 184802)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-05-22 23:44:18 UTC (rev 184801)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-05-22 23:56:38 UTC (rev 184802)
@@ -320,7 +320,7 @@
#if PLATFORM(IOS)
webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackAllowsInlineKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAlternateFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsAlternateFullscreen] && shouldAllowAlternateFullscreen()));
- webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackRequiresUserGestureKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackRequiresUserAction]));
+ webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::requiresUserGestureForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackRequiresUserAction]));
webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackAllowsAirPlayKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackAllowsAirPlay]));
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (184801 => 184802)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-05-22 23:44:18 UTC (rev 184801)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-05-22 23:56:38 UTC (rev 184802)
@@ -2769,7 +2769,7 @@
settings.setWebGLEnabled(store.getBoolValueForKey(WebPreferencesKey::webGLEnabledKey()));
settings.setForceSoftwareWebGLRendering(store.getBoolValueForKey(WebPreferencesKey::forceSoftwareWebGLRenderingKey()));
settings.setAccelerated2dCanvasEnabled(store.getBoolValueForKey(WebPreferencesKey::accelerated2dCanvasEnabledKey()));
- settings.setMediaPlaybackRequiresUserGesture(store.getBoolValueForKey(WebPreferencesKey::mediaPlaybackRequiresUserGestureKey()));
+ settings.setRequiresUserGestureForMediaPlayback(store.getBoolValueForKey(WebPreferencesKey::requiresUserGestureForMediaPlaybackKey()));
settings.setMediaPlaybackAllowsInline(store.getBoolValueForKey(WebPreferencesKey::mediaPlaybackAllowsInlineKey()));
settings.setAllowsAlternateFullscreen(store.getBoolValueForKey(WebPreferencesKey::allowsAlternateFullscreenKey()));
settings.setMockScrollbarsEnabled(store.getBoolValueForKey(WebPreferencesKey::mockScrollbarsEnabledKey()));
