<!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>[184813] 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/184813">184813</a></dd>
<dt>Author</dt> <dd>jonlee@apple.com</dd>
<dt>Date</dt> <dd>2015-05-22 18:57:43 -0700 (Fri, 22 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.
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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHostcpp">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHosth">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsMediaControlsHostidl">trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
<li><a href="#trunkSourceWebCorecssMediaQueryEvaluatorcpp">trunk/Source/WebCore/css/MediaQueryEvaluator.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaSessioncpp">trunk/Source/WebCore/html/HTMLMediaSession.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsin">trunk/Source/WebCore/page/Settings.in</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="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</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="#trunkSourceWebKit2UIProcessAPICWKPreferencescpp">trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitSettingscpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp</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 (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2015-05-22 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> Rename MediaPlaybackAllowsAirPlay
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=145316
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> m_textTrackContainer->updateSizes(true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaControlsHost::mediaPlaybackAllowsInline() const
</del><ins>+bool MediaControlsHost::allowsInlineMediaPlayback() const
</ins><span class="cx"> {
</span><span class="cx"> return !m_mediaElement->mediaSession().requiresFullscreenForVideoPlayback(*m_mediaElement);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.h (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> void setSelectedTextTrack(TextTrack*);
</span><span class="cx"> Element* textTrackContainer();
</span><span class="cx"> void updateTextTrackContainer();
</span><del>- bool mediaPlaybackAllowsInline() const;
</del><ins>+ bool allowsInlineMediaPlayback() const;
</ins><span class="cx"> bool supportsFullscreen();
</span><span class="cx"> bool userGestureRequired() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsMediaControlsHostidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> readonly attribute DOMString captionDisplayMode;
</span><span class="cx"> void setSelectedTextTrack(TextTrack track);
</span><span class="cx"> readonly attribute HTMLElement textTrackContainer;
</span><del>- readonly attribute boolean mediaPlaybackAllowsInline;
</del><ins>+ readonly attribute boolean allowsInlineMediaPlayback;
</ins><span class="cx"> readonly attribute boolean supportsFullscreen;
</span><span class="cx"> readonly attribute boolean userGestureRequired;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx">
</span><span class="cx"> shouldHaveControls: function()
</span><span class="cx"> {
</span><del>- if (!this.isAudio() && !this.host.mediaPlaybackAllowsInline)
</del><ins>+ if (!this.isAudio() && !this.host.allowsInlineMediaPlayback)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return this.video.controls || this.isFullScreen();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> shouldHaveStartPlaybackButton: function() {
</span><del>- var allowsInline = this.host.mediaPlaybackAllowsInline;
</del><ins>+ var allowsInline = this.host.allowsInlineMediaPlayback;
</ins><span class="cx">
</span><span class="cx"> if (this.isPlaying || (this.hasPlayed && allowsInline))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaQueryEvaluatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaQueryEvaluator.cpp (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -644,7 +644,7 @@
</span><span class="cx">
</span><span class="cx"> static bool video_playable_inlineMediaFeatureEval(CSSValue*, const CSSToLengthConversionData&, Frame* frame, MediaFeaturePrefix)
</span><span class="cx"> {
</span><del>- return !isRunningOnIPhoneOrIPod() || frame->settings().mediaPlaybackAllowsInline();
</del><ins>+ return !isRunningOnIPhoneOrIPod() || frame->settings().allowsInlineMediaPlayback();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool hoverMediaFeatureEval(CSSValue* value, const CSSToLengthConversionData&, Frame*, MediaFeaturePrefix)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaSession.cpp (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -362,7 +362,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> Settings* settings = element.document().settings();
</span><del>- if (!settings || !settings->mediaPlaybackAllowsInline())
</del><ins>+ if (!settings || !settings->allowsInlineMediaPlayback())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if (element.fastHasAttribute(HTMLNames::webkit_playsinlineAttr))
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> static const bool defaultFixedPositionCreatesStackingContext = true;
</span><span class="cx"> static const bool defaultFixedBackgroundsPaintRelativeToDocument = true;
</span><span class="cx"> static const bool defaultAcceleratedCompositingForFixedPositionEnabled = true;
</span><del>-static const bool defaultMediaPlaybackAllowsInline = false;
</del><ins>+static const bool defaultAllowsInlineMediaPlayback = false;
</ins><span class="cx"> static const bool defaultRequiresUserGestureForMediaPlayback = true;
</span><span class="cx"> static const bool defaultAudioPlaybackRequiresUserGesture = true;
</span><span class="cx"> static const bool defaultShouldRespectImageOrientation = true;
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> static const bool defaultFixedPositionCreatesStackingContext = false;
</span><span class="cx"> static const bool defaultFixedBackgroundsPaintRelativeToDocument = false;
</span><span class="cx"> static const bool defaultAcceleratedCompositingForFixedPositionEnabled = false;
</span><del>-static const bool defaultMediaPlaybackAllowsInline = true;
</del><ins>+static const bool defaultAllowsInlineMediaPlayback = true;
</ins><span class="cx"> static const bool defaultRequiresUserGestureForMediaPlayback = false;
</span><span class="cx"> static const bool defaultAudioPlaybackRequiresUserGesture = false;
</span><span class="cx"> static const bool defaultShouldRespectImageOrientation = false;
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> allowRunningOfInsecureContent initial=false
</span><span class="cx"> requiresUserGestureForMediaPlayback initial=defaultRequiresUserGestureForMediaPlayback
</span><span class="cx"> audioPlaybackRequiresUserGesture initial=defaultAudioPlaybackRequiresUserGesture
</span><del>-mediaPlaybackAllowsInline initial=defaultMediaPlaybackAllowsInline
</del><ins>+allowsInlineMediaPlayback initial=defaultAllowsInlineMediaPlayback
</ins><span class="cx"> allowsAlternateFullscreen initial=defaultAllowsAlternateFullscreen
</span><span class="cx"> passwordEchoEnabled initial=false
</span><span class="cx"> suppressesIncrementalRendering initial=false
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-05-22 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> Rename MediaPlaybackAllowsAirPlay
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=145316
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> #define WebKitAVFoundationEnabledKey @"WebKitAVFoundationEnabled"
</span><span class="cx"> #define WebKitHixie76WebSocketProtocolEnabledKey @"WebKitHixie76WebSocketProtocolEnabled"
</span><span class="cx"> #define WebKitRequiresUserGestureForMediaPlaybackPreferenceKey @"WebKitMediaPlaybackRequiresUserGesture"
</span><del>-#define WebKitMediaPlaybackAllowsInlinePreferenceKey @"WebKitMediaPlaybackAllowsInline"
</del><ins>+#define WebKitAllowsInlineMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsInline"
</ins><span class="cx"> #define WebKitAllowsAlternateFullscreenPreferenceKey @"WebKitAllowsAlternateFullscreen"
</span><span class="cx"> #define WebKitMockScrollbarsEnabledPreferenceKey @"WebKitMockScrollbarsEnabled"
</span><span class="cx"> #define WebKitShouldDisplaySubtitlesPreferenceKey @"WebKitShouldDisplaySubtitles"
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -518,7 +518,7 @@
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitSuppressesIncrementalRenderingKey,
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitRequiresUserGestureForMediaPlaybackPreferenceKey,
</span><del>- [NSNumber numberWithBool:YES], WebKitMediaPlaybackAllowsInlinePreferenceKey,
</del><ins>+ [NSNumber numberWithBool:YES], WebKitAllowsInlineMediaPlaybackPreferenceKey,
</ins><span class="cx"> [NSNumber numberWithBool:NO], WebKitWebAudioEnabledPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitBackspaceKeyNavigationEnabledKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitShouldDisplaySubtitlesPreferenceKey,
</span><span class="lines">@@ -528,7 +528,7 @@
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitShouldRespectImageOrientationKey,
</span><span class="cx"> #else
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitRequiresUserGestureForMediaPlaybackPreferenceKey,
</span><del>- [NSNumber numberWithBool:NO], WebKitMediaPlaybackAllowsInlinePreferenceKey,
</del><ins>+ [NSNumber numberWithBool:NO], WebKitAllowsInlineMediaPlaybackPreferenceKey,
</ins><span class="cx"> [NSNumber numberWithBool:YES], WebKitAllowsAirPlayForMediaPlaybackPreferenceKey,
</span><span class="cx"> [NSNumber numberWithUnsignedInt:AudioSession::None], WebKitAudioSessionCategoryOverride,
</span><span class="cx"> #if HAVE(AVKIT)
</span><span class="lines">@@ -2170,12 +2170,12 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)mediaPlaybackAllowsInline
</span><span class="cx"> {
</span><del>- return [self _boolValueForKey:WebKitMediaPlaybackAllowsInlinePreferenceKey];
</del><ins>+ return [self _boolValueForKey:WebKitAllowsInlineMediaPlaybackPreferenceKey];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setMediaPlaybackAllowsInline:(BOOL)flag
</span><span class="cx"> {
</span><del>- [self _setBoolValue:flag forKey:WebKitMediaPlaybackAllowsInlinePreferenceKey];
</del><ins>+ [self _setBoolValue:flag forKey:WebKitAllowsInlineMediaPlaybackPreferenceKey];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)allowsAlternateFullscreen
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2297,7 +2297,7 @@
</span><span class="cx"> settings.setValidationMessageTimerMagnification([self validationMessageTimerMagnification]);
</span><span class="cx">
</span><span class="cx"> settings.setRequiresUserGestureForMediaPlayback([preferences mediaPlaybackRequiresUserGesture]);
</span><del>- settings.setMediaPlaybackAllowsInline([preferences mediaPlaybackAllowsInline]);
</del><ins>+ settings.setAllowsInlineMediaPlayback([preferences mediaPlaybackAllowsInline]);
</ins><span class="cx"> settings.setAllowsAlternateFullscreen([preferences allowsAlternateFullscreen] && shouldAllowAlternateFullscreen());
</span><span class="cx"> settings.setSuppressesIncrementalRendering([preferences suppressesIncrementalRendering]);
</span><span class="cx"> settings.setBackspaceKeyNavigationEnabled([preferences backspaceKeyNavigationEnabled]);
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-05-22 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> Unreviewed build fix for Windows.
</span><span class="cx">
</span><span class="cx"> * WebView.cpp:
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5130,7 +5130,7 @@
</span><span class="cx"> hr = prefsPrivate->mediaPlaybackAllowsInline(&enabled);
</span><span class="cx"> if (FAILED(hr))
</span><span class="cx"> return hr;
</span><del>- settings.setMediaPlaybackAllowsInline(enabled);
</del><ins>+ settings.setAllowsInlineMediaPlayback(enabled);
</ins><span class="cx">
</span><span class="cx"> hr = prefsPrivate->shouldInvertColors(&enabled);
</span><span class="cx"> if (FAILED(hr))
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2015-05-22 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> Rename MediaPlaybackAllowsAirPlay
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=145316
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> #define DEFAULT_SHOULD_RESPECT_IMAGE_ORIENTATION true
</span><span class="cx"> #define DEFAULT_MINIMUM_FONT_ZOOM_SIZE WKGetMinimumZoomFontSize()
</span><span class="cx"> #define DEFAULT_PASSWORD_ECHO_ENABLED true
</span><del>-#define DEFAULT_MEDIA_PLAYBACK_ALLOWS_INLINE false
</del><ins>+#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK false
</ins><span class="cx"> #define DEFAULT_REQUIRES_USER_GESTURE_FOR_MEDIA_PLAYBACK true
</span><span class="cx"> #define DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED false
</span><span class="cx"> #else
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> #define DEFAULT_SHOULD_RESPECT_IMAGE_ORIENTATION false
</span><span class="cx"> #define DEFAULT_MINIMUM_FONT_ZOOM_SIZE 0
</span><span class="cx"> #define DEFAULT_PASSWORD_ECHO_ENABLED false
</span><del>-#define DEFAULT_MEDIA_PLAYBACK_ALLOWS_INLINE true
</del><ins>+#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK true
</ins><span class="cx"> #define DEFAULT_REQUIRES_USER_GESTURE_FOR_MEDIA_PLAYBACK false
</span><span class="cx"> #define DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED true
</span><span class="cx"> #endif
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> macro(AllowFileAccessFromFileURLs, allowFileAccessFromFileURLs, Bool, bool, false) \
</span><span class="cx"> macro(AVFoundationEnabled, isAVFoundationEnabled, Bool, bool, true) \
</span><span class="cx"> macro(RequiresUserGestureForMediaPlayback, requiresUserGestureForMediaPlayback, Bool, bool, DEFAULT_REQUIRES_USER_GESTURE_FOR_MEDIA_PLAYBACK) \
</span><del>- macro(MediaPlaybackAllowsInline, mediaPlaybackAllowsInline, Bool, bool, DEFAULT_MEDIA_PLAYBACK_ALLOWS_INLINE) \
</del><ins>+ macro(AllowsInlineMediaPlayback, allowsInlineMediaPlayback, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK) \
</ins><span class="cx"> macro(AllowsAlternateFullscreen, allowsAlternateFullscreen, Bool, bool, true) \
</span><span class="cx"> macro(AllowsAirPlayForMediaPlayback, allowsAirPlayForMediaPlayback, Bool, bool, true) \
</span><span class="cx"> macro(InspectorStartsAttached, inspectorStartsAttached, Bool, bool, true) \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -740,12 +740,12 @@
</span><span class="cx">
</span><span class="cx"> void WKPreferencesSetMediaPlaybackAllowsInline(WKPreferencesRef preferencesRef, bool flag)
</span><span class="cx"> {
</span><del>- toImpl(preferencesRef)->setMediaPlaybackAllowsInline(flag);
</del><ins>+ toImpl(preferencesRef)->setAllowsInlineMediaPlayback(flag);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WKPreferencesGetMediaPlaybackAllowsInline(WKPreferencesRef preferencesRef)
</span><span class="cx"> {
</span><del>- return toImpl(preferencesRef)->mediaPlaybackAllowsInline();
</del><ins>+ return toImpl(preferencesRef)->allowsInlineMediaPlayback();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKPreferencesSetAllowsAlternateFullscreen(WKPreferencesRef preferencesRef, bool flag)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -318,7 +318,7 @@
</span><span class="cx"> webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::suppressesIncrementalRenderingKey(), WebKit::WebPreferencesStore::Value(!![_configuration suppressesIncrementalRendering]));
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackAllowsInlineKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
</del><ins>+ webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
</ins><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><span class="cx"> webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAirPlayForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackAllowsAirPlay]));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2609,7 +2609,7 @@
</span><span class="cx"> {
</span><span class="cx"> g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), TRUE);
</span><span class="cx">
</span><del>- return settings->priv->preferences->mediaPlaybackAllowsInline();
</del><ins>+ return settings->priv->preferences->allowsInlineMediaPlayback();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2624,11 +2624,11 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
</span><span class="cx">
</span><span class="cx"> WebKitSettingsPrivate* priv = settings->priv;
</span><del>- bool currentValue = priv->preferences->mediaPlaybackAllowsInline();
</del><ins>+ bool currentValue = priv->preferences->allowsInlineMediaPlayback();
</ins><span class="cx"> if (currentValue == enabled)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- priv->preferences->setMediaPlaybackAllowsInline(enabled);
</del><ins>+ priv->preferences->setAllowsInlineMediaPlayback(enabled);
</ins><span class="cx"> g_object_notify(G_OBJECT(settings), "media-playback-allows-inline");
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (184812 => 184813)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2770,7 +2770,7 @@
</span><span class="cx"> settings.setForceSoftwareWebGLRendering(store.getBoolValueForKey(WebPreferencesKey::forceSoftwareWebGLRenderingKey()));
</span><span class="cx"> settings.setAccelerated2dCanvasEnabled(store.getBoolValueForKey(WebPreferencesKey::accelerated2dCanvasEnabledKey()));
</span><span class="cx"> settings.setRequiresUserGestureForMediaPlayback(store.getBoolValueForKey(WebPreferencesKey::requiresUserGestureForMediaPlaybackKey()));
</span><del>- settings.setMediaPlaybackAllowsInline(store.getBoolValueForKey(WebPreferencesKey::mediaPlaybackAllowsInlineKey()));
</del><ins>+ settings.setAllowsInlineMediaPlayback(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackKey()));
</ins><span class="cx"> settings.setAllowsAlternateFullscreen(store.getBoolValueForKey(WebPreferencesKey::allowsAlternateFullscreenKey()));
</span><span class="cx"> settings.setMockScrollbarsEnabled(store.getBoolValueForKey(WebPreferencesKey::mockScrollbarsEnabledKey()));
</span><span class="cx"> settings.setHyperlinkAuditingEnabled(store.getBoolValueForKey(WebPreferencesKey::hyperlinkAuditingEnabledKey()));
</span></span></pre>
</div>
</div>
</body>
</html>