Diff
Modified: trunk/Source/WebCore/ChangeLog (184812 => 184813)
--- trunk/Source/WebCore/ChangeLog 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebCore/ChangeLog 2015-05-23 01:57:43 UTC (rev 184813)
@@ -1,5 +1,35 @@
2015-05-22 Jon Lee <[email protected]>
+ Rename MediaPlaybackAllowsInline
+ https://bugs.webkit.org/show_bug.cgi?id=145315
+
+ Reviewed by Eric Carlson.
+
+ Our API uses allowsInlineMediaPlayback. Our symbols should reflect the same.
+
+ * page/Settings.cpp: Update the static variable name as well as the setting.
+ * page/Settings.in: Ditto.
+
+ * Modules/mediacontrols/MediaControlsHost.idl: Rename to allowsInlineMediaPlayback.
+ Affects the media controls code.
+ * Modules/mediacontrols/MediaControlsHost.h:
+ * Modules/mediacontrols/MediaControlsHost.cpp:
+ (WebCore::MediaControlsHost::allowsInlineMediaPlayback):
+ (WebCore::MediaControlsHost::mediaPlaybackAllowsInline): Deleted.
+
+ Update to use the new name in the media controls.
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.shouldHaveControls):
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.shouldHaveStartPlaybackButton):
+
+ * css/MediaQueryEvaluator.cpp:
+ (WebCore::video_playable_inlineMediaFeatureEval):
+ * html/HTMLMediaSession.cpp:
+ (WebCore::HTMLMediaSession::requiresFullscreenForVideoPlayback):
+
+2015-05-22 Jon Lee <[email protected]>
+
Rename MediaPlaybackAllowsAirPlay
https://bugs.webkit.org/show_bug.cgi?id=145316
Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp (184812 => 184813)
--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2015-05-23 01:57:43 UTC (rev 184813)
@@ -202,7 +202,7 @@
m_textTrackContainer->updateSizes(true);
}
-bool MediaControlsHost::mediaPlaybackAllowsInline() const
+bool MediaControlsHost::allowsInlineMediaPlayback() const
{
return !m_mediaElement->mediaSession().requiresFullscreenForVideoPlayback(*m_mediaElement);
}
Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h (184812 => 184813)
--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h 2015-05-23 01:57:43 UTC (rev 184813)
@@ -63,7 +63,7 @@
void setSelectedTextTrack(TextTrack*);
Element* textTrackContainer();
void updateTextTrackContainer();
- bool mediaPlaybackAllowsInline() const;
+ bool allowsInlineMediaPlayback() const;
bool supportsFullscreen();
bool userGestureRequired() const;
Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl (184812 => 184813)
--- trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl 2015-05-23 01:57:43 UTC (rev 184813)
@@ -50,7 +50,7 @@
readonly attribute DOMString captionDisplayMode;
void setSelectedTextTrack(TextTrack track);
readonly attribute HTMLElement textTrackContainer;
- readonly attribute boolean mediaPlaybackAllowsInline;
+ readonly attribute boolean allowsInlineMediaPlayback;
readonly attribute boolean supportsFullscreen;
readonly attribute boolean userGestureRequired;
Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (184812 => 184813)
--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-05-23 01:57:43 UTC (rev 184813)
@@ -280,7 +280,7 @@
shouldHaveControls: function()
{
- if (!this.isAudio() && !this.host.mediaPlaybackAllowsInline)
+ if (!this.isAudio() && !this.host.allowsInlineMediaPlayback)
return true;
return this.video.controls || this.isFullScreen();
Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (184812 => 184813)
--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-05-23 01:57:43 UTC (rev 184813)
@@ -65,7 +65,7 @@
},
shouldHaveStartPlaybackButton: function() {
- var allowsInline = this.host.mediaPlaybackAllowsInline;
+ var allowsInline = this.host.allowsInlineMediaPlayback;
if (this.isPlaying || (this.hasPlayed && allowsInline))
return false;
Modified: trunk/Source/WebCore/css/MediaQueryEvaluator.cpp (184812 => 184813)
--- trunk/Source/WebCore/css/MediaQueryEvaluator.cpp 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebCore/css/MediaQueryEvaluator.cpp 2015-05-23 01:57:43 UTC (rev 184813)
@@ -644,7 +644,7 @@
static bool video_playable_inlineMediaFeatureEval(CSSValue*, const CSSToLengthConversionData&, Frame* frame, MediaFeaturePrefix)
{
- return !isRunningOnIPhoneOrIPod() || frame->settings().mediaPlaybackAllowsInline();
+ return !isRunningOnIPhoneOrIPod() || frame->settings().allowsInlineMediaPlayback();
}
static bool hoverMediaFeatureEval(CSSValue* value, const CSSToLengthConversionData&, Frame*, MediaFeaturePrefix)
Modified: trunk/Source/WebCore/html/HTMLMediaSession.cpp (184812 => 184813)
--- trunk/Source/WebCore/html/HTMLMediaSession.cpp 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebCore/html/HTMLMediaSession.cpp 2015-05-23 01:57:43 UTC (rev 184813)
@@ -362,7 +362,7 @@
return false;
Settings* settings = element.document().settings();
- if (!settings || !settings->mediaPlaybackAllowsInline())
+ if (!settings || !settings->allowsInlineMediaPlayback())
return true;
if (element.fastHasAttribute(HTMLNames::webkit_playsinlineAttr))
Modified: trunk/Source/WebCore/page/Settings.cpp (184812 => 184813)
--- trunk/Source/WebCore/page/Settings.cpp 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebCore/page/Settings.cpp 2015-05-23 01:57:43 UTC (rev 184813)
@@ -125,7 +125,7 @@
static const bool defaultFixedPositionCreatesStackingContext = true;
static const bool defaultFixedBackgroundsPaintRelativeToDocument = true;
static const bool defaultAcceleratedCompositingForFixedPositionEnabled = true;
-static const bool defaultMediaPlaybackAllowsInline = false;
+static const bool defaultAllowsInlineMediaPlayback = false;
static const bool defaultRequiresUserGestureForMediaPlayback = true;
static const bool defaultAudioPlaybackRequiresUserGesture = true;
static const bool defaultShouldRespectImageOrientation = true;
@@ -135,7 +135,7 @@
static const bool defaultFixedPositionCreatesStackingContext = false;
static const bool defaultFixedBackgroundsPaintRelativeToDocument = false;
static const bool defaultAcceleratedCompositingForFixedPositionEnabled = false;
-static const bool defaultMediaPlaybackAllowsInline = true;
+static const bool defaultAllowsInlineMediaPlayback = true;
static const bool defaultRequiresUserGestureForMediaPlayback = false;
static const bool defaultAudioPlaybackRequiresUserGesture = false;
static const bool defaultShouldRespectImageOrientation = false;
Modified: trunk/Source/WebCore/page/Settings.in (184812 => 184813)
--- trunk/Source/WebCore/page/Settings.in 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebCore/page/Settings.in 2015-05-23 01:57:43 UTC (rev 184813)
@@ -127,7 +127,7 @@
allowRunningOfInsecureContent initial=false
requiresUserGestureForMediaPlayback initial=defaultRequiresUserGestureForMediaPlayback
audioPlaybackRequiresUserGesture initial=defaultAudioPlaybackRequiresUserGesture
-mediaPlaybackAllowsInline initial=defaultMediaPlaybackAllowsInline
+allowsInlineMediaPlayback initial=defaultAllowsInlineMediaPlayback
allowsAlternateFullscreen initial=defaultAllowsAlternateFullscreen
passwordEchoEnabled initial=false
suppressesIncrementalRendering initial=false
Modified: trunk/Source/WebKit/mac/ChangeLog (184812 => 184813)
--- trunk/Source/WebKit/mac/ChangeLog 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-05-23 01:57:43 UTC (rev 184813)
@@ -1,5 +1,24 @@
2015-05-22 Jon Lee <[email protected]>
+ Rename MediaPlaybackAllowsInline
+ https://bugs.webkit.org/show_bug.cgi?id=145315
+
+ Reviewed by Eric Carlson.
+
+ Our API uses allowsInlineMediaPlayback. Our symbols should reflect the same.
+
+ * 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 mediaPlaybackAllowsInline]): Ditto. This setting will not
+ be renamed in a future patch.
+ (-[WebPreferences setMediaPlaybackAllowsInline:]): Ditto.
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]): Update the call to settings.
+
+2015-05-22 Jon Lee <[email protected]>
+
Rename MediaPlaybackAllowsAirPlay
https://bugs.webkit.org/show_bug.cgi?id=145316
Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (184812 => 184813)
--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2015-05-23 01:57:43 UTC (rev 184813)
@@ -120,7 +120,7 @@
#define WebKitAVFoundationEnabledKey @"WebKitAVFoundationEnabled"
#define WebKitHixie76WebSocketProtocolEnabledKey @"WebKitHixie76WebSocketProtocolEnabled"
#define WebKitRequiresUserGestureForMediaPlaybackPreferenceKey @"WebKitMediaPlaybackRequiresUserGesture"
-#define WebKitMediaPlaybackAllowsInlinePreferenceKey @"WebKitMediaPlaybackAllowsInline"
+#define WebKitAllowsInlineMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsInline"
#define WebKitAllowsAlternateFullscreenPreferenceKey @"WebKitAllowsAlternateFullscreen"
#define WebKitMockScrollbarsEnabledPreferenceKey @"WebKitMockScrollbarsEnabled"
#define WebKitShouldDisplaySubtitlesPreferenceKey @"WebKitShouldDisplaySubtitles"
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (184812 => 184813)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-05-23 01:57:43 UTC (rev 184813)
@@ -518,7 +518,7 @@
[NSNumber numberWithBool:NO], WebKitSuppressesIncrementalRenderingKey,
#if !PLATFORM(IOS)
[NSNumber numberWithBool:NO], WebKitRequiresUserGestureForMediaPlaybackPreferenceKey,
- [NSNumber numberWithBool:YES], WebKitMediaPlaybackAllowsInlinePreferenceKey,
+ [NSNumber numberWithBool:YES], WebKitAllowsInlineMediaPlaybackPreferenceKey,
[NSNumber numberWithBool:NO], WebKitWebAudioEnabledPreferenceKey,
[NSNumber numberWithBool:YES], WebKitBackspaceKeyNavigationEnabledKey,
[NSNumber numberWithBool:NO], WebKitShouldDisplaySubtitlesPreferenceKey,
@@ -528,7 +528,7 @@
[NSNumber numberWithBool:NO], WebKitShouldRespectImageOrientationKey,
#else
[NSNumber numberWithBool:YES], WebKitRequiresUserGestureForMediaPlaybackPreferenceKey,
- [NSNumber numberWithBool:NO], WebKitMediaPlaybackAllowsInlinePreferenceKey,
+ [NSNumber numberWithBool:NO], WebKitAllowsInlineMediaPlaybackPreferenceKey,
[NSNumber numberWithBool:YES], WebKitAllowsAirPlayForMediaPlaybackPreferenceKey,
[NSNumber numberWithUnsignedInt:AudioSession::None], WebKitAudioSessionCategoryOverride,
#if HAVE(AVKIT)
@@ -2170,12 +2170,12 @@
- (BOOL)mediaPlaybackAllowsInline
{
- return [self _boolValueForKey:WebKitMediaPlaybackAllowsInlinePreferenceKey];
+ return [self _boolValueForKey:WebKitAllowsInlineMediaPlaybackPreferenceKey];
}
- (void)setMediaPlaybackAllowsInline:(BOOL)flag
{
- [self _setBoolValue:flag forKey:WebKitMediaPlaybackAllowsInlinePreferenceKey];
+ [self _setBoolValue:flag forKey:WebKitAllowsInlineMediaPlaybackPreferenceKey];
}
- (BOOL)allowsAlternateFullscreen
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (184812 => 184813)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-05-23 01:57:43 UTC (rev 184813)
@@ -2297,7 +2297,7 @@
settings.setValidationMessageTimerMagnification([self validationMessageTimerMagnification]);
settings.setRequiresUserGestureForMediaPlayback([preferences mediaPlaybackRequiresUserGesture]);
- settings.setMediaPlaybackAllowsInline([preferences mediaPlaybackAllowsInline]);
+ settings.setAllowsInlineMediaPlayback([preferences mediaPlaybackAllowsInline]);
settings.setAllowsAlternateFullscreen([preferences allowsAlternateFullscreen] && shouldAllowAlternateFullscreen());
settings.setSuppressesIncrementalRendering([preferences suppressesIncrementalRendering]);
settings.setBackspaceKeyNavigationEnabled([preferences backspaceKeyNavigationEnabled]);
Modified: trunk/Source/WebKit/win/ChangeLog (184812 => 184813)
--- trunk/Source/WebKit/win/ChangeLog 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebKit/win/ChangeLog 2015-05-23 01:57:43 UTC (rev 184813)
@@ -1,5 +1,17 @@
2015-05-22 Jon Lee <[email protected]>
+ Rename MediaPlaybackAllowsInline
+ https://bugs.webkit.org/show_bug.cgi?id=145315
+
+ Reviewed by Eric Carlson.
+
+ Our API uses allowsInlineMediaPlayback. Our symbols should reflect the same.
+
+ * WebView.cpp:
+ (WebView::notifyPreferencesChanged): Use the new name.
+
+2015-05-22 Jon Lee <[email protected]>
+
Unreviewed build fix for Windows.
* WebView.cpp:
Modified: trunk/Source/WebKit/win/WebView.cpp (184812 => 184813)
--- trunk/Source/WebKit/win/WebView.cpp 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-05-23 01:57:43 UTC (rev 184813)
@@ -5130,7 +5130,7 @@
hr = prefsPrivate->mediaPlaybackAllowsInline(&enabled);
if (FAILED(hr))
return hr;
- settings.setMediaPlaybackAllowsInline(enabled);
+ settings.setAllowsInlineMediaPlayback(enabled);
hr = prefsPrivate->shouldInvertColors(&enabled);
if (FAILED(hr))
Modified: trunk/Source/WebKit2/ChangeLog (184812 => 184813)
--- trunk/Source/WebKit2/ChangeLog 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-23 01:57:43 UTC (rev 184813)
@@ -1,5 +1,28 @@
2015-05-22 Jon Lee <[email protected]>
+ Rename MediaPlaybackAllowsInline
+ https://bugs.webkit.org/show_bug.cgi?id=145315
+
+ Reviewed by Eric Carlson.
+
+ Our API uses allowsInlineMediaPlayback. Our symbols should reflect the same.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetMediaPlaybackAllowsInline): Update the call to preferences.
+ The C API will not change in a future patch.
+ (WKPreferencesGetMediaPlaybackAllowsInline): Ditto.
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]): Update the name of the key.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences): Ditto.
+
+ * UIProcess/API/gtk/WebKitSettings.cpp: Update the call.
+ (webkit_settings_get_media_playback_allows_inline):
+ (webkit_settings_set_media_playback_allows_inline):
+
+2015-05-22 Jon Lee <[email protected]>
+
Rename MediaPlaybackAllowsAirPlay
https://bugs.webkit.org/show_bug.cgi?id=145316
Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (184812 => 184813)
--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-05-23 01:57:43 UTC (rev 184813)
@@ -56,7 +56,7 @@
#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_ALLOWS_INLINE_MEDIA_PLAYBACK false
#define DEFAULT_REQUIRES_USER_GESTURE_FOR_MEDIA_PLAYBACK true
#define DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED false
#else
@@ -67,7 +67,7 @@
#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_ALLOWS_INLINE_MEDIA_PLAYBACK true
#define DEFAULT_REQUIRES_USER_GESTURE_FOR_MEDIA_PLAYBACK false
#define DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED true
#endif
@@ -129,7 +129,7 @@
macro(AllowFileAccessFromFileURLs, allowFileAccessFromFileURLs, Bool, bool, false) \
macro(AVFoundationEnabled, isAVFoundationEnabled, Bool, bool, true) \
macro(RequiresUserGestureForMediaPlayback, requiresUserGestureForMediaPlayback, Bool, bool, DEFAULT_REQUIRES_USER_GESTURE_FOR_MEDIA_PLAYBACK) \
- macro(MediaPlaybackAllowsInline, mediaPlaybackAllowsInline, Bool, bool, DEFAULT_MEDIA_PLAYBACK_ALLOWS_INLINE) \
+ macro(AllowsInlineMediaPlayback, allowsInlineMediaPlayback, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK) \
macro(AllowsAlternateFullscreen, allowsAlternateFullscreen, Bool, bool, true) \
macro(AllowsAirPlayForMediaPlayback, allowsAirPlayForMediaPlayback, Bool, bool, true) \
macro(InspectorStartsAttached, inspectorStartsAttached, Bool, bool, true) \
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (184812 => 184813)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2015-05-23 01:57:43 UTC (rev 184813)
@@ -740,12 +740,12 @@
void WKPreferencesSetMediaPlaybackAllowsInline(WKPreferencesRef preferencesRef, bool flag)
{
- toImpl(preferencesRef)->setMediaPlaybackAllowsInline(flag);
+ toImpl(preferencesRef)->setAllowsInlineMediaPlayback(flag);
}
bool WKPreferencesGetMediaPlaybackAllowsInline(WKPreferencesRef preferencesRef)
{
- return toImpl(preferencesRef)->mediaPlaybackAllowsInline();
+ return toImpl(preferencesRef)->allowsInlineMediaPlayback();
}
void WKPreferencesSetAllowsAlternateFullscreen(WKPreferencesRef preferencesRef, bool flag)
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (184812 => 184813)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-05-23 01:57:43 UTC (rev 184813)
@@ -318,7 +318,7 @@
webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::suppressesIncrementalRenderingKey(), WebKit::WebPreferencesStore::Value(!![_configuration suppressesIncrementalRendering]));
#if PLATFORM(IOS)
- webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackAllowsInlineKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
+ webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAlternateFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsAlternateFullscreen] && shouldAllowAlternateFullscreen()));
webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::requiresUserGestureForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackRequiresUserAction]));
webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAirPlayForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackAllowsAirPlay]));
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp (184812 => 184813)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2015-05-23 01:57:43 UTC (rev 184813)
@@ -2609,7 +2609,7 @@
{
g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), TRUE);
- return settings->priv->preferences->mediaPlaybackAllowsInline();
+ return settings->priv->preferences->allowsInlineMediaPlayback();
}
/**
@@ -2624,11 +2624,11 @@
g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
WebKitSettingsPrivate* priv = settings->priv;
- bool currentValue = priv->preferences->mediaPlaybackAllowsInline();
+ bool currentValue = priv->preferences->allowsInlineMediaPlayback();
if (currentValue == enabled)
return;
- priv->preferences->setMediaPlaybackAllowsInline(enabled);
+ priv->preferences->setAllowsInlineMediaPlayback(enabled);
g_object_notify(G_OBJECT(settings), "media-playback-allows-inline");
}
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (184812 => 184813)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-05-23 01:57:24 UTC (rev 184812)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-05-23 01:57:43 UTC (rev 184813)
@@ -2770,7 +2770,7 @@
settings.setForceSoftwareWebGLRendering(store.getBoolValueForKey(WebPreferencesKey::forceSoftwareWebGLRenderingKey()));
settings.setAccelerated2dCanvasEnabled(store.getBoolValueForKey(WebPreferencesKey::accelerated2dCanvasEnabledKey()));
settings.setRequiresUserGestureForMediaPlayback(store.getBoolValueForKey(WebPreferencesKey::requiresUserGestureForMediaPlaybackKey()));
- settings.setMediaPlaybackAllowsInline(store.getBoolValueForKey(WebPreferencesKey::mediaPlaybackAllowsInlineKey()));
+ settings.setAllowsInlineMediaPlayback(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackKey()));
settings.setAllowsAlternateFullscreen(store.getBoolValueForKey(WebPreferencesKey::allowsAlternateFullscreenKey()));
settings.setMockScrollbarsEnabled(store.getBoolValueForKey(WebPreferencesKey::mockScrollbarsEnabledKey()));
settings.setHyperlinkAuditingEnabled(store.getBoolValueForKey(WebPreferencesKey::hyperlinkAuditingEnabledKey()));
