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