Rename MediaPlaybackAllowsInline
authorjonlee@apple.com <jonlee@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 23 May 2015 01:57:43 +0000 (01:57 +0000)
committerjonlee@apple.com <jonlee@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 23 May 2015 01:57:43 +0000 (01:57 +0000)
https://bugs.webkit.org/show_bug.cgi?id=145315

Reviewed by Eric Carlson.

Our API uses allowsInlineMediaPlayback. Our symbols should reflect the same.

Source/WebCore:

* 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):

Source/WebKit/mac:

* 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.

Source/WebKit/win:

* WebView.cpp:
(WebView::notifyPreferencesChanged): Use the new name.

Source/WebKit2:

* 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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@184813 268f45cc-cd09-0410-ab3c-d52691b4dbfc

22 files changed:
Source/WebCore/ChangeLog
Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp
Source/WebCore/Modules/mediacontrols/MediaControlsHost.h
Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl
Source/WebCore/Modules/mediacontrols/mediaControlsApple.js
Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js
Source/WebCore/css/MediaQueryEvaluator.cpp
Source/WebCore/html/HTMLMediaSession.cpp
Source/WebCore/page/Settings.cpp
Source/WebCore/page/Settings.in
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
Source/WebKit/mac/WebView/WebPreferences.mm
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebView.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/WebPreferencesDefinitions.h
Source/WebKit2/UIProcess/API/C/WKPreferences.cpp
Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp
Source/WebKit2/WebProcess/WebPage/WebPage.cpp

index 2ef913b..b712962 100644 (file)
@@ -1,5 +1,35 @@
 2015-05-22  Jon Lee  <jonlee@apple.com>
 
+        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  <jonlee@apple.com>
+
         Rename MediaPlaybackAllowsAirPlay
         https://bugs.webkit.org/show_bug.cgi?id=145316
 
index 4fac252..71197c4 100644 (file)
@@ -202,7 +202,7 @@ void MediaControlsHost::updateCaptionDisplaySizes()
         m_textTrackContainer->updateSizes(true);
 }
     
-bool MediaControlsHost::mediaPlaybackAllowsInline() const
+bool MediaControlsHost::allowsInlineMediaPlayback() const
 {
     return !m_mediaElement->mediaSession().requiresFullscreenForVideoPlayback(*m_mediaElement);
 }
index d81eef6..ae4efb1 100644 (file)
@@ -63,7 +63,7 @@ public:
     void setSelectedTextTrack(TextTrack*);
     Element* textTrackContainer();
     void updateTextTrackContainer();
-    bool mediaPlaybackAllowsInline() const;
+    bool allowsInlineMediaPlayback() const;
     bool supportsFullscreen();
     bool userGestureRequired() const;
 
index 51e227a..a81a05c 100644 (file)
@@ -50,7 +50,7 @@ enum MediaUIPartID {
     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;
 
index 90bd39f..94e0fc8 100644 (file)
@@ -280,7 +280,7 @@ Controller.prototype = {
 
     shouldHaveControls: function()
     {
-        if (!this.isAudio() && !this.host.mediaPlaybackAllowsInline)
+        if (!this.isAudio() && !this.host.allowsInlineMediaPlayback)
             return true;
 
         return this.video.controls || this.isFullScreen();
index c6f839b..f9afa40 100644 (file)
@@ -65,7 +65,7 @@ ControllerIOS.prototype = {
     },
 
     shouldHaveStartPlaybackButton: function() {
-        var allowsInline = this.host.mediaPlaybackAllowsInline;
+        var allowsInline = this.host.allowsInlineMediaPlayback;
 
         if (this.isPlaying || (this.hasPlayed && allowsInline))
             return false;
index 5d247d3..6c2c253 100644 (file)
@@ -644,7 +644,7 @@ static inline bool isRunningOnIPhoneOrIPod()
 
 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)
index 9b41291..b1238da 100644 (file)
@@ -362,7 +362,7 @@ bool HTMLMediaSession::requiresFullscreenForVideoPlayback(const HTMLMediaElement
         return false;
 
     Settings* settings = element.document().settings();
-    if (!settings || !settings->mediaPlaybackAllowsInline())
+    if (!settings || !settings->allowsInlineMediaPlayback())
         return true;
 
     if (element.fastHasAttribute(HTMLNames::webkit_playsinlineAttr))
index 82d2790..f478f40 100644 (file)
@@ -125,7 +125,7 @@ static EditingBehaviorType editingBehaviorTypeForPlatform()
 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 defaultScrollingTreeIncludesFrames = true;
 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;
index 2779b06..0296947 100644 (file)
@@ -127,7 +127,7 @@ allowDisplayOfInsecureContent initial=false
 allowRunningOfInsecureContent initial=false
 requiresUserGestureForMediaPlayback initial=defaultRequiresUserGestureForMediaPlayback
 audioPlaybackRequiresUserGesture initial=defaultAudioPlaybackRequiresUserGesture
-mediaPlaybackAllowsInline initial=defaultMediaPlaybackAllowsInline
+allowsInlineMediaPlayback initial=defaultAllowsInlineMediaPlayback
 allowsAlternateFullscreen initial=defaultAllowsAlternateFullscreen
 passwordEchoEnabled initial=false
 suppressesIncrementalRendering initial=false
index f837520..a881ef6 100644 (file)
@@ -1,5 +1,24 @@
 2015-05-22  Jon Lee  <jonlee@apple.com>
 
+        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  <jonlee@apple.com>
+
         Rename MediaPlaybackAllowsAirPlay
         https://bugs.webkit.org/show_bug.cgi?id=145316
 
index 7e4bc69..7592f9a 100644 (file)
 #define WebKitAVFoundationEnabledKey @"WebKitAVFoundationEnabled"
 #define WebKitHixie76WebSocketProtocolEnabledKey @"WebKitHixie76WebSocketProtocolEnabled"
 #define WebKitRequiresUserGestureForMediaPlaybackPreferenceKey @"WebKitMediaPlaybackRequiresUserGesture"
-#define WebKitMediaPlaybackAllowsInlinePreferenceKey @"WebKitMediaPlaybackAllowsInline"
+#define WebKitAllowsInlineMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsInline"
 #define WebKitAllowsAlternateFullscreenPreferenceKey @"WebKitAllowsAlternateFullscreen"
 #define WebKitMockScrollbarsEnabledPreferenceKey @"WebKitMockScrollbarsEnabled"
 #define WebKitShouldDisplaySubtitlesPreferenceKey @"WebKitShouldDisplaySubtitles"
index d164def..ea484c8 100644 (file)
@@ -518,7 +518,7 @@ public:
         [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 @@ public:
         [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 @@ static NSString *classIBCreatorID = nil;
 
 - (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
index 42e2352..3fe7b7b 100644 (file)
@@ -2297,7 +2297,7 @@ static bool needsSelfRetainWhileLoadingQuirk()
     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]);
index 71e54c1..1a8a58e 100644 (file)
@@ -1,5 +1,17 @@
 2015-05-22  Jon Lee  <jonlee@apple.com>
 
+        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  <jonlee@apple.com>
+
         Unreviewed build fix for Windows.
 
         * WebView.cpp:
index c92554d..65f7a0e 100644 (file)
@@ -5130,7 +5130,7 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification)
     hr = prefsPrivate->mediaPlaybackAllowsInline(&enabled);
     if (FAILED(hr))
         return hr;
-    settings.setMediaPlaybackAllowsInline(enabled);
+    settings.setAllowsInlineMediaPlayback(enabled);
 
     hr = prefsPrivate->shouldInvertColors(&enabled);
     if (FAILED(hr))
index 9de24f6..cd3f5d1 100644 (file)
@@ -1,5 +1,28 @@
 2015-05-22  Jon Lee  <jonlee@apple.com>
 
+        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  <jonlee@apple.com>
+
         Rename MediaPlaybackAllowsAirPlay
         https://bugs.webkit.org/show_bug.cgi?id=145316
 
index 4af3652..56921d9 100644 (file)
@@ -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
     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) \
index b16305c..26f1013 100644 (file)
@@ -740,12 +740,12 @@ bool WKPreferencesGetMediaPlaybackRequiresUserGesture(WKPreferencesRef preferenc
 
 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)
index 9fe3502..d78fd81 100644 (file)
@@ -318,7 +318,7 @@ static bool shouldAllowAlternateFullscreen()
     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]));
index ff6374d..d90e432 100644 (file)
@@ -2609,7 +2609,7 @@ gboolean webkit_settings_get_media_playback_allows_inline(WebKitSettings* settin
 {
     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), TRUE);
 
-    return settings->priv->preferences->mediaPlaybackAllowsInline();
+    return settings->priv->preferences->allowsInlineMediaPlayback();
 }
 
 /**
@@ -2624,11 +2624,11 @@ void webkit_settings_set_media_playback_allows_inline(WebKitSettings* settings,
     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");
 }
 
index 02584fe..89459bd 100644 (file)
@@ -2770,7 +2770,7 @@ void WebPage::updatePreferences(const WebPreferencesStore& store)
     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()));