<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[184811] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/184811">184811</a></dd>
<dt>Author</dt> <dd>jonlee@apple.com</dd>
<dt>Date</dt> <dd>2015-05-22 18:55:41 -0700 (Fri, 22 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename MediaPlaybackAllowsAirPlay
https://bugs.webkit.org/show_bug.cgi?id=145316
Reviewed by Eric Carlson.
In preparation for an API rename, update internal symbols from mediaPlaybackAllowsAirPlay
to allowsAirPlayForMediaPlayback.
Source/WebCore:
* page/Settings.in: Update the setting name.
* html/HTMLMediaSession.cpp:
(WebCore::HTMLMediaSession::wirelessVideoPlaybackDisabled): Update the call to settings.
* testing/InternalSettings.h: Update the name of the member variable.
* testing/InternalSettings.cpp: Update the names and calls to settings.
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::InternalSettings):
(WebCore::InternalSettings::resetToConsistentState):
(WebCore::InternalSettings::setWirelessPlaybackDisabled):
Source/WebKit/mac:
* WebView/WebPreferenceKeysPrivate.h: Update the name but keep its value, for backwards
compatibility.
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]): Update to reference the new key name.
(-[WebPreferences mediaPlaybackAllowsAirPlay]): Ditto. This API will not change in a future
patch.
(-[WebPreferences setMediaPlaybackAllowsAirPlay:]): Ditto.
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]): Update the call to settings.
Source/WebKit2:
* Shared/WebPreferencesDefinitions.h: Update the name.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]): Ditto.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences): Update the call to settings.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaSessioncpp">trunk/Source/WebCore/html/HTMLMediaSession.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsin">trunk/Source/WebCore/page/Settings.in</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingscpp">trunk/Source/WebCore/testing/InternalSettings.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingsh">trunk/Source/WebCore/testing/InternalSettings.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184810 => 184811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-23 01:15:32 UTC (rev 184810)
+++ trunk/Source/WebCore/ChangeLog 2015-05-23 01:55:41 UTC (rev 184811)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-05-22 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><ins>+ Rename MediaPlaybackAllowsAirPlay
+ https://bugs.webkit.org/show_bug.cgi?id=145316
+
+ Reviewed by Eric Carlson.
+
+ In preparation for an API rename, update internal symbols from mediaPlaybackAllowsAirPlay
+ to allowsAirPlayForMediaPlayback.
+
+ * page/Settings.in: Update the setting name.
+
+ * html/HTMLMediaSession.cpp:
+ (WebCore::HTMLMediaSession::wirelessVideoPlaybackDisabled): Update the call to settings.
+ * testing/InternalSettings.h: Update the name of the member variable.
+ * testing/InternalSettings.cpp: Update the names and calls to settings.
+ (WebCore::InternalSettings::Backup::Backup):
+ (WebCore::InternalSettings::InternalSettings):
+ (WebCore::InternalSettings::resetToConsistentState):
+ (WebCore::InternalSettings::setWirelessPlaybackDisabled):
+
+2015-05-22 Jon Lee <jonlee@apple.com>
+
</ins><span class="cx"> Rename MediaPlaybackRequiresUserGesture
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=145314
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaSession.cpp (184810 => 184811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaSession.cpp 2015-05-23 01:15:32 UTC (rev 184810)
+++ trunk/Source/WebCore/html/HTMLMediaSession.cpp 2015-05-23 01:55:41 UTC (rev 184811)
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> bool HTMLMediaSession::wirelessVideoPlaybackDisabled(const HTMLMediaElement& element) const
</span><span class="cx"> {
</span><span class="cx"> Settings* settings = element.document().settings();
</span><del>- if (!settings || !settings->mediaPlaybackAllowsAirPlay()) {
</del><ins>+ if (!settings || !settings->allowsAirPlayForMediaPlayback()) {
</ins><span class="cx"> LOG(Media, "HTMLMediaSession::wirelessVideoPlaybackDisabled - returning TRUE because of settings");
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (184810 => 184811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.in 2015-05-23 01:15:32 UTC (rev 184810)
+++ trunk/Source/WebCore/page/Settings.in 2015-05-23 01:55:41 UTC (rev 184811)
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> # FIXME: Rename to allowMultiElementImplicitFormSubmission once we upstream the iOS changes to WebView.mm.
</span><span class="cx"> allowMultiElementImplicitSubmission initial=false
</span><span class="cx">
</span><del>-mediaPlaybackAllowsAirPlay initial=true, conditional=WIRELESS_PLAYBACK_TARGET
</del><ins>+allowsAirPlayForMediaPlayback initial=true, conditional=WIRELESS_PLAYBACK_TARGET
</ins><span class="cx">
</span><span class="cx"> shouldConvertPositionStyleOnCopy initial=false
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (184810 => 184811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.cpp 2015-05-23 01:15:32 UTC (rev 184810)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2015-05-23 01:55:41 UTC (rev 184811)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> , m_touchEventEmulationEnabled(settings.isTouchEventEmulationEnabled())
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- , m_mediaPlaybackAllowsAirPlay(settings.mediaPlaybackAllowsAirPlay())
</del><ins>+ , m_allowsAirPlayForMediaPlayback(settings.allowsAirPlayForMediaPlayback())
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> , m_backup(page->settings())
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- page->settings().setMediaPlaybackAllowsAirPlay(false);
</del><ins>+ page->settings().setAllowsAirPlayForMediaPlayback(false);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> page()->setPageScaleFactor(1, IntPoint(0, 0));
</span><span class="cx"> page()->setCanStartMedia(true);
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- m_page->settings().setMediaPlaybackAllowsAirPlay(false);
</del><ins>+ m_page->settings().setAllowsAirPlayForMediaPlayback(false);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_backup.restoreTo(*settings());
</span><span class="lines">@@ -363,7 +363,7 @@
</span><span class="cx"> void InternalSettings::setWirelessPlaybackDisabled(bool available)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- m_page->settings().setMediaPlaybackAllowsAirPlay(available);
</del><ins>+ m_page->settings().setAllowsAirPlayForMediaPlayback(available);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(available);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.h (184810 => 184811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.h 2015-05-23 01:15:32 UTC (rev 184810)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2015-05-23 01:55:41 UTC (rev 184811)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> bool m_touchEventEmulationEnabled;
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- bool m_mediaPlaybackAllowsAirPlay;
</del><ins>+ bool m_allowsAirPlayForMediaPlayback;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (184810 => 184811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-05-23 01:15:32 UTC (rev 184810)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-05-23 01:55:41 UTC (rev 184811)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-05-22 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><ins>+ Rename MediaPlaybackAllowsAirPlay
+ https://bugs.webkit.org/show_bug.cgi?id=145316
+
+ Reviewed by Eric Carlson.
+
+ In preparation for an API rename, update internal symbols from mediaPlaybackAllowsAirPlay
+ to allowsAirPlayForMediaPlayback.
+
+ * WebView/WebPreferenceKeysPrivate.h: Update the name but keep its value, for backwards
+ compatibility.
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]): Update to reference the new key name.
+ (-[WebPreferences mediaPlaybackAllowsAirPlay]): Ditto. This API will not change in a future
+ patch.
+ (-[WebPreferences setMediaPlaybackAllowsAirPlay:]): Ditto.
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]): Update the call to settings.
+
+2015-05-22 Jon Lee <jonlee@apple.com>
+
</ins><span class="cx"> Rename MediaPlaybackRequiresUserGesture
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=145314
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (184810 => 184811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2015-05-23 01:15:32 UTC (rev 184810)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2015-05-23 01:55:41 UTC (rev 184811)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> #define WebKitSuppressesIncrementalRenderingKey @"WebKitSuppressesIncrementalRendering"
</span><span class="cx"> #define WebKitSubpixelCSSOMElementMetricsEnabledPreferenceKey @"WebKitSubpixelCSSOMElementMetricsEnabled"
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><del>-#define WebKitMediaPlaybackAllowsAirPlayPreferenceKey @"WebKitMediaPlaybackAllowsAirPlay"
</del><ins>+#define WebKitAllowsAirPlayForMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsAirPlay"
</ins><span class="cx"> #define WebKitAudioSessionCategoryOverride @"WebKitAudioSessionCategoryOverride"
</span><span class="cx"> #define WebKitAVKitEnabled @"WebKitAVKitEnabled"
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (184810 => 184811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-05-23 01:15:32 UTC (rev 184810)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-05-23 01:55:41 UTC (rev 184811)
</span><span class="lines">@@ -529,7 +529,7 @@
</span><span class="cx"> #else
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitRequiresUserGestureForMediaPlaybackPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitMediaPlaybackAllowsInlinePreferenceKey,
</span><del>- [NSNumber numberWithBool:YES], WebKitMediaPlaybackAllowsAirPlayPreferenceKey,
</del><ins>+ [NSNumber numberWithBool:YES], WebKitAllowsAirPlayForMediaPlaybackPreferenceKey,
</ins><span class="cx"> [NSNumber numberWithUnsignedInt:AudioSession::None], WebKitAudioSessionCategoryOverride,
</span><span class="cx"> #if HAVE(AVKIT)
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitAVKitEnabled,
</span><span class="lines">@@ -2079,12 +2079,12 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> - (BOOL)mediaPlaybackAllowsAirPlay
</span><span class="cx"> {
</span><del>- return [self _boolValueForKey:WebKitMediaPlaybackAllowsAirPlayPreferenceKey];
</del><ins>+ return [self _boolValueForKey:WebKitAllowsAirPlayForMediaPlaybackPreferenceKey];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setMediaPlaybackAllowsAirPlay:(BOOL)flag
</span><span class="cx"> {
</span><del>- [self _setBoolValue:flag forKey:WebKitMediaPlaybackAllowsAirPlayPreferenceKey];
</del><ins>+ [self _setBoolValue:flag forKey:WebKitAllowsAirPlayForMediaPlaybackPreferenceKey];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (unsigned)audioSessionCategoryOverride
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (184810 => 184811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-05-23 01:15:32 UTC (rev 184810)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-05-23 01:55:41 UTC (rev 184811)
</span><span class="lines">@@ -2350,7 +2350,7 @@
</span><span class="cx"> settings.setLayoutInterval(std::chrono::milliseconds([preferences _layoutInterval]));
</span><span class="cx"> settings.setMaxParseDuration([preferences _maxParseDuration]);
</span><span class="cx"> settings.setAlwaysUseAcceleratedOverflowScroll([preferences _alwaysUseAcceleratedOverflowScroll]);
</span><del>- settings.setMediaPlaybackAllowsAirPlay([preferences mediaPlaybackAllowsAirPlay]);
</del><ins>+ settings.setAllowsAirPlayForMediaPlayback([preferences mediaPlaybackAllowsAirPlay]);
</ins><span class="cx"> settings.setAudioSessionCategoryOverride([preferences audioSessionCategoryOverride]);
</span><span class="cx"> settings.setNetworkDataUsageTrackingEnabled([preferences networkDataUsageTrackingEnabled]);
</span><span class="cx"> settings.setNetworkInterfaceName([preferences networkInterfaceName]);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (184810 => 184811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-23 01:15:32 UTC (rev 184810)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-23 01:55:41 UTC (rev 184811)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-05-22 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><ins>+ Rename MediaPlaybackAllowsAirPlay
+ https://bugs.webkit.org/show_bug.cgi?id=145316
+
+ Reviewed by Eric Carlson.
+
+ In preparation for an API rename, update internal symbols from mediaPlaybackAllowsAirPlay
+ to allowsAirPlayForMediaPlayback.
+
+ * Shared/WebPreferencesDefinitions.h: Update the name.
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]): Ditto.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences): Update the call to settings.
+
+2015-05-22 Jon Lee <jonlee@apple.com>
+
</ins><span class="cx"> Unreviewed GTK fix after r184802.
</span><span class="cx">
</span><span class="cx"> * UIProcess/API/gtk/WebKitSettings.cpp:
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (184810 => 184811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-05-23 01:15:32 UTC (rev 184810)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-05-23 01:55:41 UTC (rev 184811)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> macro(RequiresUserGestureForMediaPlayback, requiresUserGestureForMediaPlayback, Bool, bool, DEFAULT_REQUIRES_USER_GESTURE_FOR_MEDIA_PLAYBACK) \
</span><span class="cx"> macro(MediaPlaybackAllowsInline, mediaPlaybackAllowsInline, Bool, bool, DEFAULT_MEDIA_PLAYBACK_ALLOWS_INLINE) \
</span><span class="cx"> macro(AllowsAlternateFullscreen, allowsAlternateFullscreen, Bool, bool, true) \
</span><del>- macro(MediaPlaybackAllowsAirPlay, mediaPlaybackAllowsAirPlay, Bool, bool, true) \
</del><ins>+ macro(AllowsAirPlayForMediaPlayback, allowsAirPlayForMediaPlayback, Bool, bool, true) \
</ins><span class="cx"> macro(InspectorStartsAttached, inspectorStartsAttached, Bool, bool, true) \
</span><span class="cx"> macro(ShowsToolTipOverTruncatedText, showsToolTipOverTruncatedText, Bool, bool, false) \
</span><span class="cx"> macro(MockScrollbarsEnabled, mockScrollbarsEnabled, Bool, bool, false) \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (184810 => 184811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-05-23 01:15:32 UTC (rev 184810)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-05-23 01:55:41 UTC (rev 184811)
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx"> webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackAllowsInlineKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
</span><span class="cx"> webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAlternateFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsAlternateFullscreen] && shouldAllowAlternateFullscreen()));
</span><span class="cx"> webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::requiresUserGestureForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackRequiresUserAction]));
</span><del>- webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackAllowsAirPlayKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackAllowsAirPlay]));
</del><ins>+ webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAirPlayForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackAllowsAirPlay]));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (184810 => 184811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-05-23 01:15:32 UTC (rev 184810)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-05-23 01:55:41 UTC (rev 184811)
</span><span class="lines">@@ -2819,7 +2819,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- settings.setMediaPlaybackAllowsAirPlay(store.getBoolValueForKey(WebPreferencesKey::mediaPlaybackAllowsAirPlayKey()));
</del><ins>+ settings.setAllowsAirPlayForMediaPlayback(store.getBoolValueForKey(WebPreferencesKey::allowsAirPlayForMediaPlaybackKey()));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> settings.setSuppressesIncrementalRendering(store.getBoolValueForKey(WebPreferencesKey::suppressesIncrementalRenderingKey()));
</span></span></pre>
</div>
</div>
</body>
</html>