<!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>[203855] trunk</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/203855">203855</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-07-28 20:03:21 -0700 (Thu, 28 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove deprecated SPI for video inline / fullscreen controls
https://bugs.webkit.org/show_bug.cgi?id=160318
Reviewed by Tim Horton.
Source/WebCore:
<a href="http://trac.webkit.org/projects/webkit/changeset/203752">r203752</a> deprecated the SPI allowsInlineMediaPlaybackWithPlaysInlineAttribute
and allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute (in favor of
inlineMediaPlaybackRequiresPlaysInlineAttribute). This patch removes the
deprecated SPI symbols.
No new tests because there is no behavior change.
* page/Settings.cpp:
* page/Settings.in:
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::Backup): Deleted.
(WebCore::InternalSettings::Backup::restoreTo): Deleted.
(WebCore::InternalSettings::setAllowsInlineMediaPlaybackWithPlaysInlineAttribute): Deleted.
(WebCore::InternalSettings::setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute): Deleted.
* testing/InternalSettings.h:
* testing/InternalSettings.idl:
Source/WebKit/mac:
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]): Deleted.
(-[WebPreferences allowsInlineMediaPlaybackWithPlaysInlineAttribute]): Deleted.
(-[WebPreferences setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:]): Deleted.
(-[WebPreferences allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute]): Deleted.
(-[WebPreferences setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:]): Deleted.
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]): Deleted.
Source/WebKit2:
* Shared/WebPreferencesDefinitions.h:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetAllowsInlineMediaPlaybackWithPlaysInlineAttribute): Deleted.
(WKPreferencesGetAllowsInlineMediaPlaybackWithPlaysInlineAttribute): Deleted.
(WKPreferencesSetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute): Deleted.
(WKPreferencesGetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute): Deleted.
* UIProcess/API/C/WKPreferencesRefPrivate.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _initializeWithConfiguration:]): Deleted.
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration init]): Deleted.
(-[WKWebViewConfiguration copyWithZone:]): Deleted.
(-[WKWebViewConfiguration _allowsInlineMediaPlaybackWithPlaysInlineAttribute]): Deleted.
(-[WKWebViewConfiguration _setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:]): Deleted.
(-[WKWebViewConfiguration _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute]): Deleted.
(-[WKWebViewConfiguration _setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:]): Deleted.
* UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences): Deleted.
Tools:
* DumpRenderTree/mac/DumpRenderTree.mm:
(setDefaultsToConsistentValuesForTesting): Deleted.
* TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm:
(RequiresUserActionForPlaybackTest::SetUp): Deleted.
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::resetPreferencesToConsistentValues): Deleted.
* WebKitTestRunner/cocoa/TestControllerCocoa.mm:
(WTR::initializeWebViewConfiguration): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoretestingInternalSettingscpp">trunk/Source/WebCore/testing/InternalSettings.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingsh">trunk/Source/WebCore/testing/InternalSettings.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingsidl">trunk/Source/WebCore/testing/InternalSettings.idl</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="#trunkSourceWebKitmacWebViewWebPreferencesPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</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="#trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaRequiresUserActionForPlaybackmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnercocoaTestControllerCocoamm">trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebCore/ChangeLog 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-07-28 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Remove deprecated SPI for video inline / fullscreen controls
+ https://bugs.webkit.org/show_bug.cgi?id=160318
+
+ Reviewed by Tim Horton.
+
+ r203752 deprecated the SPI allowsInlineMediaPlaybackWithPlaysInlineAttribute
+ and allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute (in favor of
+ inlineMediaPlaybackRequiresPlaysInlineAttribute). This patch removes the
+ deprecated SPI symbols.
+
+ No new tests because there is no behavior change.
+
+ * page/Settings.cpp:
+ * page/Settings.in:
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::Backup::Backup): Deleted.
+ (WebCore::InternalSettings::Backup::restoreTo): Deleted.
+ (WebCore::InternalSettings::setAllowsInlineMediaPlaybackWithPlaysInlineAttribute): Deleted.
+ (WebCore::InternalSettings::setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute): Deleted.
+ * testing/InternalSettings.h:
+ * testing/InternalSettings.idl:
+
</ins><span class="cx"> 2016-07-28 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for Element.getAttributeNames()
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.cpp 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebCore/page/Settings.cpp 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -139,8 +139,6 @@
</span><span class="cx"> static const bool defaultAcceleratedCompositingForFixedPositionEnabled = true;
</span><span class="cx"> static const bool defaultAllowsInlineMediaPlayback = false;
</span><span class="cx"> static const bool defaultInlineMediaPlaybackRequiresPlaysInlineAttribute = true;
</span><del>-static const bool defaultAllowsInlineMediaPlaybackWithPlaysInlineAttribute = true;
-static const bool defaultAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = true;
</del><span class="cx"> static const bool defaultVideoPlaybackRequiresUserGesture = true;
</span><span class="cx"> static const bool defaultAudioPlaybackRequiresUserGesture = true;
</span><span class="cx"> static const bool defaultMediaDataLoadsAutomatically = false;
</span><span class="lines">@@ -154,8 +152,6 @@
</span><span class="cx"> static const bool defaultAcceleratedCompositingForFixedPositionEnabled = false;
</span><span class="cx"> static const bool defaultAllowsInlineMediaPlayback = true;
</span><span class="cx"> static const bool defaultInlineMediaPlaybackRequiresPlaysInlineAttribute = false;
</span><del>-static const bool defaultAllowsInlineMediaPlaybackWithPlaysInlineAttribute = false;
-static const bool defaultAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = false;
</del><span class="cx"> static const bool defaultVideoPlaybackRequiresUserGesture = false;
</span><span class="cx"> static const bool defaultAudioPlaybackRequiresUserGesture = false;
</span><span class="cx"> static const bool defaultMediaDataLoadsAutomatically = true;
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.in 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebCore/page/Settings.in 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -132,8 +132,6 @@
</span><span class="cx"> allowsInlineMediaPlayback initial=defaultAllowsInlineMediaPlayback
</span><span class="cx"> allowsInlineMediaPlaybackAfterFullscreen initial=true
</span><span class="cx"> inlineMediaPlaybackRequiresPlaysInlineAttribute initial=defaultInlineMediaPlaybackRequiresPlaysInlineAttribute
</span><del>-allowsInlineMediaPlaybackWithPlaysInlineAttribute initial=defaultAllowsInlineMediaPlaybackWithPlaysInlineAttribute
-allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute initial=defaultAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute
</del><span class="cx"> allowsPictureInPictureMediaPlayback initial=defaultAllowsPictureInPictureMediaPlayback
</span><span class="cx"> mediaControlsScaleWithPageZoom initial=defaultMediaControlsScaleWithPageZoom
</span><span class="cx"> invisibleAutoplayNotPermitted initial=false
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.cpp 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -108,8 +108,6 @@
</span><span class="cx"> , m_allowsInlineMediaPlayback(settings.allowsInlineMediaPlayback())
</span><span class="cx"> , m_allowsInlineMediaPlaybackAfterFullscreen(settings.allowsInlineMediaPlaybackAfterFullscreen())
</span><span class="cx"> , m_inlineMediaPlaybackRequiresPlaysInlineAttribute(settings.inlineMediaPlaybackRequiresPlaysInlineAttribute())
</span><del>- , m_allowsInlineMediaPlaybackWithPlaysInlineAttribute(settings.allowsInlineMediaPlaybackWithPlaysInlineAttribute())
- , m_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(settings.allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute())
</del><span class="cx"> #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
</span><span class="cx"> , m_indexedDBWorkersEnabled(RuntimeEnabledFeatures::sharedFeatures().indexedDBWorkersEnabled())
</span><span class="cx"> #endif
</span><span class="lines">@@ -186,8 +184,6 @@
</span><span class="cx"> settings.setAllowsInlineMediaPlayback(m_allowsInlineMediaPlayback);
</span><span class="cx"> settings.setAllowsInlineMediaPlaybackAfterFullscreen(m_allowsInlineMediaPlaybackAfterFullscreen);
</span><span class="cx"> settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(m_inlineMediaPlaybackRequiresPlaysInlineAttribute);
</span><del>- settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(m_allowsInlineMediaPlaybackWithPlaysInlineAttribute);
- settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(m_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute);
</del><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setPluginReplacementEnabled(m_pluginReplacementEnabled);
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setIndexedDBWorkersEnabled(m_indexedDBWorkersEnabled);
</span><span class="lines">@@ -584,18 +580,6 @@
</span><span class="cx"> settings()->setInlineMediaPlaybackRequiresPlaysInlineAttribute(requires);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InternalSettings::setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(bool requires, ExceptionCode& ec)
-{
- InternalSettingsGuardForSettings();
- settings()->setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(requires);
-}
-
-void InternalSettings::setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(bool requires, ExceptionCode& ec)
-{
- InternalSettingsGuardForSettings();
- settings()->setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(requires);
-}
-
</del><span class="cx"> void InternalSettings::setIndexedDBWorkersEnabled(bool enabled, ExceptionCode&)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.h (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.h 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -108,8 +108,6 @@
</span><span class="cx"> bool m_allowsInlineMediaPlayback;
</span><span class="cx"> bool m_allowsInlineMediaPlaybackAfterFullscreen;
</span><span class="cx"> bool m_inlineMediaPlaybackRequiresPlaysInlineAttribute;
</span><del>- bool m_allowsInlineMediaPlaybackWithPlaysInlineAttribute;
- bool m_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
</del><span class="cx"> #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
</span><span class="cx"> bool m_indexedDBWorkersEnabled;
</span><span class="cx"> #endif
</span><span class="lines">@@ -165,8 +163,6 @@
</span><span class="cx"> void setAllowsInlineMediaPlayback(bool, ExceptionCode&);
</span><span class="cx"> void setAllowsInlineMediaPlaybackAfterFullscreen(bool, ExceptionCode&);
</span><span class="cx"> void setInlineMediaPlaybackRequiresPlaysInlineAttribute(bool, ExceptionCode&);
</span><del>- void setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(bool, ExceptionCode&);
- void setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(bool, ExceptionCode&);
</del><span class="cx"> void setIndexedDBWorkersEnabled(bool, ExceptionCode&);
</span><span class="cx"> String userInterfaceDirectionPolicy(ExceptionCode&);
</span><span class="cx"> void setUserInterfaceDirectionPolicy(const String& policy, ExceptionCode&);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.idl (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.idl 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebCore/testing/InternalSettings.idl 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -78,8 +78,6 @@
</span><span class="cx"> [RaisesException] void setAllowsInlineMediaPlayback(boolean allows);
</span><span class="cx"> [RaisesException] void setAllowsInlineMediaPlaybackAfterFullscreen(boolean allows);
</span><span class="cx"> [RaisesException] void setInlineMediaPlaybackRequiresPlaysInlineAttribute(boolean requires);
</span><del>- [RaisesException] void setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(boolean requires);
- [RaisesException] void setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(boolean requires);
</del><span class="cx">
</span><span class="cx"> [RaisesException] void setIndexedDBWorkersEnabled(boolean requires);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-07-28 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Remove deprecated SPI for video inline / fullscreen controls
+ https://bugs.webkit.org/show_bug.cgi?id=160318
+
+ Reviewed by Tim Horton.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]): Deleted.
+ (-[WebPreferences allowsInlineMediaPlaybackWithPlaysInlineAttribute]): Deleted.
+ (-[WebPreferences setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:]): Deleted.
+ (-[WebPreferences allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute]): Deleted.
+ (-[WebPreferences setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:]): Deleted.
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]): Deleted.
+
</ins><span class="cx"> 2016-07-28 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Move a Mail.app workaround closer to where it's actually needed
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -127,8 +127,6 @@
</span><span class="cx"> #define WebKitAllowsInlineMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsInline"
</span><span class="cx"> #define WebKitAllowsInlineMediaPlaybackAfterFullscreenPreferenceKey @"WebKitAllowsInlineMediaPlaybackAfterFullscreen"
</span><span class="cx"> #define WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey @"InlineMediaPlaybackRequiresPlaysInlineAttribute"
</span><del>-#define WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey @"AllowsInlineMediaPlaybackWithPlaysInlineAttribute"
-#define WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey @"AllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute"
</del><span class="cx"> #define WebKitInvisibleAutoplayNotPermittedKey @"InvisibleAutoplayNotPermitted"
</span><span class="cx"> #define WebKitAllowsPictureInPictureMediaPlaybackPreferenceKey @"WebKitAllowsPictureInPictureMediaPlayback"
</span><span class="cx"> #define WebKitAllowsAirPlayForMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsAirPlay"
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -526,8 +526,6 @@
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitAllowsInlineMediaPlaybackPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitAllowsInlineMediaPlaybackAfterFullscreenPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey,
</span><del>- [NSNumber numberWithBool:NO], WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey,
- [NSNumber numberWithBool:NO], WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey,
</del><span class="cx"> [NSNumber numberWithBool:YES], WebKitMediaControlsScaleWithPageZoomPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitWebAudioEnabledPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitBackspaceKeyNavigationEnabledKey,
</span><span class="lines">@@ -541,8 +539,6 @@
</span><span class="cx"> [NSNumber numberWithBool:allowsInlineMediaPlayback], WebKitAllowsInlineMediaPlaybackPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:allowsInlineMediaPlaybackAfterFullscreen], WebKitAllowsInlineMediaPlaybackAfterFullscreenPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:requiresPlaysInlineAttribute], WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey,
</span><del>- [NSNumber numberWithBool:requiresPlaysInlineAttribute], WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey,
- [NSNumber numberWithBool:requiresPlaysInlineAttribute], WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey,
</del><span class="cx"> [NSNumber numberWithBool:NO], WebKitMediaControlsScaleWithPageZoomPreferenceKey,
</span><span class="cx"> [NSNumber numberWithUnsignedInt:AudioSession::None], WebKitAudioSessionCategoryOverride,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitMediaDataLoadsAutomaticallyPreferenceKey,
</span><span class="lines">@@ -2297,26 +2293,6 @@
</span><span class="cx"> [self _setBoolValue:flag forKey:WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)allowsInlineMediaPlaybackWithPlaysInlineAttribute
-{
- return [self _boolValueForKey:WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey];
-}
-
-- (void)setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:(BOOL)flag
-{
- [self _setBoolValue:flag forKey:WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey];
-}
-
-- (BOOL)allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute
-{
- return [self _boolValueForKey:WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey];
-}
-
-- (void)setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:(BOOL)flag
-{
- [self _setBoolValue:flag forKey:WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey];
-}
-
</del><span class="cx"> - (BOOL)invisibleAutoplayNotPermitted
</span><span class="cx"> {
</span><span class="cx"> return [self _boolValueForKey:WebKitInvisibleAutoplayNotPermittedKey];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -265,12 +265,6 @@
</span><span class="cx"> - (void)setInlineMediaPlaybackRequiresPlaysInlineAttribute:(BOOL)flag;
</span><span class="cx"> - (BOOL)inlineMediaPlaybackRequiresPlaysInlineAttribute;
</span><span class="cx">
</span><del>-- (void)setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:(BOOL)flag;
-- (BOOL)allowsInlineMediaPlaybackWithPlaysInlineAttribute;
-
-- (void)setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:(BOOL)flag;
-- (BOOL)allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
-
</del><span class="cx"> - (void)setInvisibleAutoplayNotPermitted:(BOOL)flag;
</span><span class="cx"> - (BOOL)invisibleAutoplayNotPermitted;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -2349,8 +2349,6 @@
</span><span class="cx"> settings.setAllowsInlineMediaPlayback([preferences mediaPlaybackAllowsInline]);
</span><span class="cx"> settings.setAllowsInlineMediaPlaybackAfterFullscreen([preferences allowsInlineMediaPlaybackAfterFullscreen]);
</span><span class="cx"> settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute([preferences inlineMediaPlaybackRequiresPlaysInlineAttribute]);
</span><del>- settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute([preferences allowsInlineMediaPlaybackWithPlaysInlineAttribute]);
- settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute([preferences allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute]);
</del><span class="cx"> settings.setInvisibleAutoplayNotPermitted([preferences invisibleAutoplayNotPermitted]);
</span><span class="cx"> settings.setAllowsPictureInPictureMediaPlayback([preferences allowsPictureInPictureMediaPlayback] && shouldAllowPictureInPictureMediaPlayback());
</span><span class="cx"> settings.setMediaControlsScaleWithPageZoom([preferences mediaControlsScaleWithPageZoom]);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-07-28 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Remove deprecated SPI for video inline / fullscreen controls
+ https://bugs.webkit.org/show_bug.cgi?id=160318
+
+ Reviewed by Tim Horton.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetAllowsInlineMediaPlaybackWithPlaysInlineAttribute): Deleted.
+ (WKPreferencesGetAllowsInlineMediaPlaybackWithPlaysInlineAttribute): Deleted.
+ (WKPreferencesSetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute): Deleted.
+ (WKPreferencesGetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute): Deleted.
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _initializeWithConfiguration:]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration init]): Deleted.
+ (-[WKWebViewConfiguration copyWithZone:]): Deleted.
+ (-[WKWebViewConfiguration _allowsInlineMediaPlaybackWithPlaysInlineAttribute]): Deleted.
+ (-[WKWebViewConfiguration _setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:]): Deleted.
+ (-[WKWebViewConfiguration _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute]): Deleted.
+ (-[WKWebViewConfiguration _setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences): Deleted.
+
</ins><span class="cx"> 2016-07-28 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Frequent animation lags when interacting with Safari (sidebar, tab switching, etc.)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -66,8 +66,6 @@
</span><span class="cx"> #define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK false
</span><span class="cx"> #define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_AFTER_FULLSCREEN true
</span><span class="cx"> #define DEFAULT_INLINE_MEDIA_PLAYBACK_REQUIRES_PLAYS_INLINE_ATTRIBUTE true
</span><del>-#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_PLAYS_INLINE_ATTRIBUTE true
-#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_WEBKIT_PLAYS_INLINE_ATTRIBUTE true
</del><span class="cx"> #define DEFAULT_INVISIBLE_AUTOPLAY_NOT_PERMITTED true
</span><span class="cx"> #define DEFAULT_MEDIA_DATA_LOADS_AUTOMATICALLY false
</span><span class="cx"> #define DEFAULT_MEDIA_CONTROLS_SCALE_WITH_PAGE_ZOOM false
</span><span class="lines">@@ -85,8 +83,6 @@
</span><span class="cx"> #define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK true
</span><span class="cx"> #define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_AFTER_FULLSCREEN false
</span><span class="cx"> #define DEFAULT_INLINE_MEDIA_PLAYBACK_REQUIRES_PLAYS_INLINE_ATTRIBUTE false
</span><del>-#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_PLAYS_INLINE_ATTRIBUTE false
-#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_WEBKIT_PLAYS_INLINE_ATTRIBUTE false
</del><span class="cx"> #define DEFAULT_INVISIBLE_AUTOPLAY_NOT_PERMITTED false
</span><span class="cx"> #define DEFAULT_MEDIA_DATA_LOADS_AUTOMATICALLY true
</span><span class="cx"> #define DEFAULT_MEDIA_CONTROLS_SCALE_WITH_PAGE_ZOOM true
</span><span class="lines">@@ -157,8 +153,6 @@
</span><span class="cx"> macro(AllowsInlineMediaPlayback, allowsInlineMediaPlayback, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK, "", "") \
</span><span class="cx"> macro(AllowsInlineMediaPlaybackAfterFullscreen, allowsInlineMediaPlaybackAfterFullscreen, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_AFTER_FULLSCREEN, "", "") \
</span><span class="cx"> macro(InlineMediaPlaybackRequiresPlaysInlineAttribute, inlineMediaPlaybackRequiresPlaysInlineAttribute, Bool, bool, DEFAULT_INLINE_MEDIA_PLAYBACK_REQUIRES_PLAYS_INLINE_ATTRIBUTE, "", "") \
</span><del>- macro(AllowsInlineMediaPlaybackWithPlaysInlineAttribute, allowsInlineMediaPlaybackWithPlaysInlineAttribute, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_PLAYS_INLINE_ATTRIBUTE, "", "") \
- macro(AllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute, allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_WEBKIT_PLAYS_INLINE_ATTRIBUTE, "", "") \
</del><span class="cx"> macro(InvisibleAutoplayNotPermitted, invisibleAutoplayNotPermitted, Bool, bool, DEFAULT_INVISIBLE_AUTOPLAY_NOT_PERMITTED, "", "") \
</span><span class="cx"> macro(MediaDataLoadsAutomatically, mediaDataLoadsAutomatically, Bool, bool, DEFAULT_MEDIA_DATA_LOADS_AUTOMATICALLY, "", "") \
</span><span class="cx"> macro(AllowsPictureInPictureMediaPlayback, allowsPictureInPictureMediaPlayback, Bool, bool, DEFAULT_ALLOWS_PICTURE_IN_PICTURE_MEDIA_PLAYBACK, "", "") \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -803,26 +803,6 @@
</span><span class="cx"> return toImpl(preferencesRef)->inlineMediaPlaybackRequiresPlaysInlineAttribute();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPreferencesSetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag)
-{
- toImpl(preferencesRef)->setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(flag);
-}
-
-bool WKPreferencesGetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->allowsInlineMediaPlaybackWithPlaysInlineAttribute();
-}
-
-void WKPreferencesSetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag)
-{
- toImpl(preferencesRef)->setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(flag);
-}
-
-bool WKPreferencesGetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute();
-}
-
</del><span class="cx"> void WKPreferencesSetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef, bool flag)
</span><span class="cx"> {
</span><span class="cx"> toImpl(preferencesRef)->setMediaControlsScaleWithPageZoom(flag);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -195,14 +195,6 @@
</span><span class="cx"> WK_EXPORT void WKPreferencesSetInlineMediaPlaybackRequiresPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetInlineMediaPlaybackRequiresPlaysInlineAttribute(WKPreferencesRef preferencesRef);
</span><span class="cx">
</span><del>-// Defaults to true on iOS, false elsewhere.
-WK_EXPORT void WKPreferencesSetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag);
-WK_EXPORT bool WKPreferencesGetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(WKPreferencesRef preferencesRef);
-
-// Defaults to true on iOS, false elsewhere.
-WK_EXPORT void WKPreferencesSetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag);
-WK_EXPORT bool WKPreferencesGetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(WKPreferencesRef preferencesRef);
-
</del><span class="cx"> // Defaults to false on iOS, true elsewhere.
</span><span class="cx"> WK_EXPORT void WKPreferencesSetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef, bool flag);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -458,8 +458,6 @@
</span><span class="cx"> pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
</span><span class="cx"> pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackAfterFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsInlineMediaPlaybackAfterFullscreen]));
</span><span class="cx"> pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::inlineMediaPlaybackRequiresPlaysInlineAttributeKey(), WebKit::WebPreferencesStore::Value(!![_configuration _inlineMediaPlaybackRequiresPlaysInlineAttribute]));
</span><del>- pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackWithPlaysInlineAttributeKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsInlineMediaPlaybackWithPlaysInlineAttribute]));
- pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute]));
</del><span class="cx"> pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsPictureInPictureMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsPictureInPictureMediaPlayback] && shouldAllowPictureInPictureMediaPlayback()));
</span><span class="cx"> pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::userInterfaceDirectionPolicyKey(), WebKit::WebPreferencesStore::Value(static_cast<uint32_t>(WebCore::UserInterfaceDirectionPolicy::Content)));
</span><span class="cx"> pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::systemLayoutDirectionKey(), WebKit::WebPreferencesStore::Value(static_cast<uint32_t>(WebCore::LTR)));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -108,8 +108,6 @@
</span><span class="cx"> BOOL _alwaysRunsAtForegroundPriority;
</span><span class="cx"> BOOL _allowsInlineMediaPlayback;
</span><span class="cx"> BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute;
</span><del>- BOOL _allowsInlineMediaPlaybackWithPlaysInlineAttribute;
- BOOL _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
</del><span class="cx"> BOOL _allowsInlineMediaPlaybackAfterFullscreen;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -140,8 +138,6 @@
</span><span class="cx"> _allowsPictureInPictureMediaPlayback = YES;
</span><span class="cx"> _allowsInlineMediaPlayback = WebCore::deviceClass() == MGDeviceClassiPad;
</span><span class="cx"> _inlineMediaPlaybackRequiresPlaysInlineAttribute = !_allowsInlineMediaPlayback;
</span><del>- _allowsInlineMediaPlaybackWithPlaysInlineAttribute = !_allowsInlineMediaPlayback;
- _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = !_allowsInlineMediaPlayback;
</del><span class="cx"> _allowsInlineMediaPlaybackAfterFullscreen = !_allowsInlineMediaPlayback;
</span><span class="cx"> _mediaDataLoadsAutomatically = NO;
</span><span class="cx"> if (linkedOnOrAfter(WebKit::LibraryVersion::FirstWithMediaTypesRequiringUserActionForPlayback))
</span><span class="lines">@@ -293,8 +289,6 @@
</span><span class="cx"> configuration->_allowsInlineMediaPlayback = self->_allowsInlineMediaPlayback;
</span><span class="cx"> configuration->_allowsInlineMediaPlaybackAfterFullscreen = self->_allowsInlineMediaPlaybackAfterFullscreen;
</span><span class="cx"> configuration->_inlineMediaPlaybackRequiresPlaysInlineAttribute = self->_inlineMediaPlaybackRequiresPlaysInlineAttribute;
</span><del>- configuration->_allowsInlineMediaPlaybackWithPlaysInlineAttribute = self->_allowsInlineMediaPlaybackWithPlaysInlineAttribute;
- configuration->_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = self->_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
</del><span class="cx"> configuration->_allowsPictureInPictureMediaPlayback = self->_allowsPictureInPictureMediaPlayback;
</span><span class="cx"> configuration->_alwaysRunsAtForegroundPriority = _alwaysRunsAtForegroundPriority;
</span><span class="cx"> configuration->_selectionGranularity = self->_selectionGranularity;
</span><span class="lines">@@ -584,26 +578,6 @@
</span><span class="cx"> _inlineMediaPlaybackRequiresPlaysInlineAttribute = requires;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)_allowsInlineMediaPlaybackWithPlaysInlineAttribute
-{
- return _allowsInlineMediaPlaybackWithPlaysInlineAttribute;
-}
-
-- (void)_setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:(BOOL)requires
-{
- _allowsInlineMediaPlaybackWithPlaysInlineAttribute = requires;
-}
-
-- (BOOL)_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute
-{
- return _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
-}
-
-- (void)_setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:(BOOL)requires
-{
- _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = requires;
-}
-
</del><span class="cx"> - (BOOL)_allowsInlineMediaPlaybackAfterFullscreen
</span><span class="cx"> {
</span><span class="cx"> return _allowsInlineMediaPlaybackAfterFullscreen;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -60,8 +60,6 @@
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> @property (nonatomic, setter=_setAlwaysRunsAtForegroundPriority:) BOOL _alwaysRunsAtForegroundPriority WK_API_AVAILABLE(ios(9_0));
</span><span class="cx"> @property (nonatomic, setter=_setInlineMediaPlaybackRequiresPlaysInlineAttribute:) BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute WK_API_AVAILABLE(ios(WK_IOS_TBA));
</span><del>-@property (nonatomic, setter=_setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:) BOOL _allowsInlineMediaPlaybackWithPlaysInlineAttribute WK_API_AVAILABLE(ios(WK_IOS_TBA));
-@property (nonatomic, setter=_setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:) BOOL _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute WK_API_AVAILABLE(ios(WK_IOS_TBA));
</del><span class="cx"> @property (nonatomic, setter=_setAllowsInlineMediaPlaybackAfterFullscreen:) BOOL _allowsInlineMediaPlaybackAfterFullscreen WK_API_AVAILABLE(ios(WK_IOS_TBA));
</span><span class="cx"> #else
</span><span class="cx"> @property (nonatomic, setter=_setShowsURLsInToolTips:) BOOL _showsURLsInToolTips WK_API_AVAILABLE(macosx(WK_MAC_TBA));
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -2978,8 +2978,6 @@
</span><span class="cx"> settings.setAllowsInlineMediaPlayback(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackKey()));
</span><span class="cx"> settings.setAllowsInlineMediaPlaybackAfterFullscreen(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackAfterFullscreenKey()));
</span><span class="cx"> settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(store.getBoolValueForKey(WebPreferencesKey::inlineMediaPlaybackRequiresPlaysInlineAttributeKey()));
</span><del>- settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackWithPlaysInlineAttributeKey()));
- settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey()));
</del><span class="cx"> settings.setInvisibleAutoplayNotPermitted(store.getBoolValueForKey(WebPreferencesKey::invisibleAutoplayNotPermittedKey()));
</span><span class="cx"> settings.setMediaDataLoadsAutomatically(store.getBoolValueForKey(WebPreferencesKey::mediaDataLoadsAutomaticallyKey()));
</span><span class="cx"> #if ENABLE(ATTACHMENT_ELEMENT)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Tools/ChangeLog 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-07-28 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Remove deprecated SPI for video inline / fullscreen controls
+ https://bugs.webkit.org/show_bug.cgi?id=160318
+
+ Reviewed by Tim Horton.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (setDefaultsToConsistentValuesForTesting): Deleted.
+ * TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm:
+ (RequiresUserActionForPlaybackTest::SetUp): Deleted.
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetPreferencesToConsistentValues): Deleted.
+ * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
+ (WTR::initializeWebViewConfiguration): Deleted.
+
</ins><span class="cx"> 2016-07-28 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] TestWebKitAPI bundle targets are not code signed
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -1018,8 +1018,6 @@
</span><span class="cx"> WebKitFullScreenEnabledPreferenceKey: @YES,
</span><span class="cx"> WebKitAllowsInlineMediaPlaybackPreferenceKey: @YES,
</span><span class="cx"> WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey: @NO,
</span><del>- WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey: @NO,
- WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey: @NO,
</del><span class="cx"> @"UseWebKitWebInspector": @YES,
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> @"NSPreferredSpellServerLanguage": @"en_US",
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaRequiresUserActionForPlaybackmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -77,8 +77,6 @@
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> configuration.get().allowsInlineMediaPlayback = YES;
</span><span class="cx"> configuration.get()._inlineMediaPlaybackRequiresPlaysInlineAttribute = NO;
</span><del>- configuration.get()._allowsInlineMediaPlaybackWithPlaysInlineAttribute = NO;
- configuration.get()._allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = NO;
</del><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -685,8 +685,6 @@
</span><span class="cx">
</span><span class="cx"> WKPreferencesSetMediaPlaybackAllowsInline(preferences, true);
</span><span class="cx"> WKPreferencesSetInlineMediaPlaybackRequiresPlaysInlineAttribute(preferences, false);
</span><del>- WKPreferencesSetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(preferences, false);
- WKPreferencesSetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(preferences, false);
</del><span class="cx">
</span><span class="cx"> WKCookieManagerDeleteAllCookies(WKContextGetCookieManager(m_context.get()));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnercocoaTestControllerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm (203854 => 203855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2016-07-29 03:03:21 UTC (rev 203855)
</span><span class="lines">@@ -62,8 +62,6 @@
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> globalWebViewConfiguration.allowsInlineMediaPlayback = YES;
</span><span class="cx"> globalWebViewConfiguration._inlineMediaPlaybackRequiresPlaysInlineAttribute = NO;
</span><del>- globalWebViewConfiguration._allowsInlineMediaPlaybackWithPlaysInlineAttribute = NO;
- globalWebViewConfiguration._allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = NO;
</del><span class="cx"> globalWebViewConfiguration._invisibleAutoplayNotPermitted = NO;
</span><span class="cx"> globalWebViewConfiguration._mediaDataLoadsAutomatically = YES;
</span><span class="cx"> globalWebViewConfiguration.requiresUserActionForMediaPlayback = NO;
</span></span></pre>
</div>
</div>
</body>
</html>