<!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>[203882] branches/safari-602-branch</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/203882">203882</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-07-29 00:12:21 -0700 (Fri, 29 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/203752">r203752</a>. rdar://problem/27557968</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchLayoutTestsmediavideoplaysinlineexpectedtxt">branches/safari-602-branch/LayoutTests/media/video-playsinline-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsmediavideoplaysinlinehtml">branches/safari-602-branch/LayoutTests/media/video-playsinline.html</a></li>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCorehtmlMediaElementSessioncpp">branches/safari-602-branch/Source/WebCore/html/MediaElementSession.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorepageSettingscpp">branches/safari-602-branch/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorepageSettingsin">branches/safari-602-branch/Source/WebCore/page/Settings.in</a></li>
<li><a href="#branchessafari602branchSourceWebCoretestingInternalSettingscpp">branches/safari-602-branch/Source/WebCore/testing/InternalSettings.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoretestingInternalSettingsh">branches/safari-602-branch/Source/WebCore/testing/InternalSettings.h</a></li>
<li><a href="#branchessafari602branchSourceWebCoretestingInternalSettingsidl">branches/safari-602-branch/Source/WebCore/testing/InternalSettings.idl</a></li>
<li><a href="#branchessafari602branchSourceWebKitmacChangeLog">branches/safari-602-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebKitmacWebViewWebPreferenceKeysPrivateh">branches/safari-602-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#branchessafari602branchSourceWebKitmacWebViewWebPreferencesmm">branches/safari-602-branch/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#branchessafari602branchSourceWebKitmacWebViewWebPreferencesPrivateh">branches/safari-602-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#branchessafari602branchSourceWebKitmacWebViewWebViewmm">branches/safari-602-branch/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#branchessafari602branchSourceWebKit2ChangeLog">branches/safari-602-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebKit2SharedWebPreferencesDefinitionsh">branches/safari-602-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessAPICWKPreferencescpp">branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh">branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessAPICocoaWKWebViewmm">branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm">branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationPrivateh">branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#branchessafari602branchToolsChangeLog">branches/safari-602-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari602branchToolsDumpRenderTreemacDumpRenderTreemm">branches/safari-602-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
<li><a href="#branchessafari602branchToolsTestWebKitAPITestsWebKit2CocoaRequiresUserActionForPlaybackmm">branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm</a></li>
<li><a href="#branchessafari602branchToolsWebKitTestRunnerTestControllercpp">branches/safari-602-branch/Tools/WebKitTestRunner/TestController.cpp</a></li>
<li><a href="#branchessafari602branchToolsWebKitTestRunnercocoaTestControllerCocoamm">branches/safari-602-branch/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsmediavideowebkitplaysinlineexpectedtxt">branches/safari-602-branch/LayoutTests/media/video-webkit-playsinline-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsmediavideowebkitplaysinlinehtml">branches/safari-602-branch/LayoutTests/media/video-webkit-playsinline.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/ChangeLog (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2016-07-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203752. rdar://problem/27557968
+
+ 2016-07-26 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [iPhone] Playing a video on tudou.com plays only sound, no video
+ https://bugs.webkit.org/show_bug.cgi?id=160178
+ <rdar://problem/27535468>
+
+ Reviewed by Eric Carlson and Dan Bernstein.
+
+ * media/video-playsinline-expected.txt:
+ * media/video-playsinline.html:
+ * media/video-webkit-playsinline-expected.txt: Added.
+ * media/video-webkit-playsinline.html: Added.
+
+2016-07-28 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203711. rdar://problem/27279453
</span><span class="cx">
</span><span class="cx"> 2016-07-25 Nan Wang <n_wang@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsmediavideoplaysinlineexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/media/video-playsinline-expected.txt (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/media/video-playsinline-expected.txt 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/LayoutTests/media/video-playsinline-expected.txt 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -1,130 +1,26 @@
</span><del>-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
</del><ins>+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(true))
</ins><span class="cx"> RUN(video.playsInline = false)
</span><del>-RUN(video.removeAttribute("webkit-playsinline"))
</del><span class="cx"> EVENT(canplaythrough)
</span><span class="cx"> RUN(video.play())
</span><span class="cx"> EVENT(playing)
</span><span class="cx"> EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
</span><del>-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
-RUN(video.playsInline = false)
-RUN(video.setAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
-RUN(video.playsInline = false)
-RUN(video.setAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
-RUN(video.playsInline = false)
-RUN(video.removeAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
</del><ins>+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(true))
</ins><span class="cx"> RUN(video.playsInline = true)
</span><del>-RUN(video.setAttribute("webkit-playsinline"))
</del><span class="cx"> EVENT(canplaythrough)
</span><span class="cx"> RUN(video.play())
</span><span class="cx"> EVENT(playing)
</span><span class="cx"> EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
</span><del>-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
-RUN(video.playsInline = true)
-RUN(video.removeAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
-RUN(video.playsInline = true)
-RUN(video.setAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(true))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
-RUN(video.playsInline = true)
-RUN(video.removeAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
</del><ins>+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(false))
</ins><span class="cx"> RUN(video.playsInline = false)
</span><del>-RUN(video.setAttribute("webkit-playsinline"))
</del><span class="cx"> EVENT(canplaythrough)
</span><span class="cx"> RUN(video.play())
</span><span class="cx"> EVENT(playing)
</span><span class="cx"> EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
</span><del>-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
-RUN(video.playsInline = false)
-RUN(video.removeAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
-RUN(video.playsInline = false)
-RUN(video.setAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
-RUN(video.playsInline = false)
-RUN(video.removeAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
</del><ins>+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(false))
</ins><span class="cx"> RUN(video.playsInline = true)
</span><del>-RUN(video.setAttribute("webkit-playsinline"))
</del><span class="cx"> EVENT(canplaythrough)
</span><span class="cx"> RUN(video.play())
</span><span class="cx"> EVENT(playing)
</span><span class="cx"> EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
</span><del>-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(true))
-RUN(video.playsInline = true)
-RUN(video.removeAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
-RUN(video.playsInline = true)
-RUN(video.setAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(false))
-RUN(internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(false))
-RUN(video.playsInline = true)
-RUN(video.removeAttribute("webkit-playsinline"))
-EVENT(canplaythrough)
-RUN(video.play())
-EVENT(playing)
-EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
</del><span class="cx"> END OF TEST
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsmediavideoplaysinlinehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/media/video-playsinline.html (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/media/video-playsinline.html 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/LayoutTests/media/video-playsinline.html 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -17,16 +17,14 @@
</span><span class="cx"> endTest();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function testPlaysInline(requiresPlaysInline, requiresWebKitPlaysInline, hasPlaysInline, hasWebKitPlaysInline, expectedDisplayingFullscreen)
</del><ins>+function testPlaysInline(requiresPlaysInline, hasPlaysInline, expectedDisplayingFullscreen)
</ins><span class="cx"> {
</span><del>- run('internals.settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(' + requiresPlaysInline + ')');
- run('internals.settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(' + requiresWebKitPlaysInline + ')');
</del><ins>+ run('internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(' + requiresPlaysInline + ')');
</ins><span class="cx"> video = media = document.createElement('video');
</span><span class="cx"> document.body.appendChild(video);
</span><span class="cx"> video.controls = true;
</span><span class="cx"> video.src = findMediaFile('video', 'content/test');
</span><span class="cx"> run('video.playsInline = ' + hasPlaysInline);
</span><del>- run('video.' + (hasWebKitPlaysInline ? 'set' : 'remove') + 'Attribute("webkit-playsinline")');
</del><span class="cx"> waitForEventOnce('canplaythrough', () => {
</span><span class="cx"> runWithKeyDown(() => {
</span><span class="cx"> run('video.play()');
</span><span class="lines">@@ -41,101 +39,29 @@
</span><span class="cx">
</span><span class="cx"> function testRequiresPlaysInlineAndDoesntHaveIt()
</span><span class="cx"> {
</span><del>- testPlaysInline(true, true, false, false, true);
</del><ins>+ testPlaysInline(true, false, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function testRequiresPlaysInlineAndDoesntHaveIt2()
-{
- testPlaysInline(true, true, false, true, false);
-}
-
-function testRequiresPlaysInlineAndDoesntHaveIt3()
-{
- testPlaysInline(true, false, false, true, true);
-}
-
-function testRequiresPlaysInlineAndDoesntHaveIt4()
-{
- testPlaysInline(true, false, false, false, true);
-}
-
</del><span class="cx"> function testRequiresPlaysInlineAndDoesHaveIt()
</span><span class="cx"> {
</span><del>- testPlaysInline(true, true, true, true, false);
</del><ins>+ testPlaysInline(true, true, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function testRequiresPlaysInlineAndDoesHaveIt2()
-{
- testPlaysInline(true, true, true, false, false);
-}
-
-function testRequiresPlaysInlineAndDoesHaveIt3()
-{
- testPlaysInline(true, false, true, true, false);
-}
-
-function testRequiresPlaysInlineAndDoesHaveIt4()
-{
- testPlaysInline(true, false, true, false, false);
-}
-
</del><span class="cx"> function testDoesNotRequirePlaysInlineAndDoesntHaveIt()
</span><span class="cx"> {
</span><del>- testPlaysInline(false, true, false, true, false);
</del><ins>+ testPlaysInline(false, false, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function testDoesNotRequirePlaysInlineAndDoesntHaveIt2()
-{
- testPlaysInline(false, true, false, false, true);
-}
-
-function testDoesNotRequirePlaysInlineAndDoesntHaveIt3()
-{
- testPlaysInline(false, false, false, true, false);
-}
-
-function testDoesNotRequirePlaysInlineAndDoesntHaveIt4()
-{
- testPlaysInline(false, false, false, false, false);
-}
-
</del><span class="cx"> function testDoesNotRequirePlaysInlineAndDoesHaveIt()
</span><span class="cx"> {
</span><del>- testPlaysInline(false, true, true, true, false);
</del><ins>+ testPlaysInline(false, true, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function testDoesNotRequirePlaysInlineAndDoesHaveIt2()
-{
- testPlaysInline(false, true, true, false, true);
-}
-
-function testDoesNotRequirePlaysInlineAndDoesHaveIt3()
-{
- testPlaysInline(false, false, true, true, false);
-}
-
-function testDoesNotRequirePlaysInlineAndDoesHaveIt4()
-{
- testPlaysInline(false, false, true, false, false);
-}
-
</del><span class="cx"> var tests = [
</span><span class="cx"> testRequiresPlaysInlineAndDoesntHaveIt,
</span><del>- testRequiresPlaysInlineAndDoesntHaveIt2,
- testRequiresPlaysInlineAndDoesntHaveIt3,
- testRequiresPlaysInlineAndDoesntHaveIt4,
</del><span class="cx"> testRequiresPlaysInlineAndDoesHaveIt,
</span><del>- testRequiresPlaysInlineAndDoesHaveIt2,
- testRequiresPlaysInlineAndDoesHaveIt3,
- testRequiresPlaysInlineAndDoesHaveIt4,
</del><span class="cx"> testDoesNotRequirePlaysInlineAndDoesntHaveIt,
</span><del>- testDoesNotRequirePlaysInlineAndDoesntHaveIt2,
- testDoesNotRequirePlaysInlineAndDoesntHaveIt3,
- testDoesNotRequirePlaysInlineAndDoesntHaveIt4,
</del><span class="cx"> testDoesNotRequirePlaysInlineAndDoesHaveIt,
</span><del>- testDoesNotRequirePlaysInlineAndDoesHaveIt2,
- testDoesNotRequirePlaysInlineAndDoesHaveIt3,
- testDoesNotRequirePlaysInlineAndDoesHaveIt4
</del><span class="cx"> ];
</span><span class="cx">
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsmediavideowebkitplaysinlineexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/media/video-webkit-playsinline-expected.txt (0 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/media/video-webkit-playsinline-expected.txt (rev 0)
+++ branches/safari-602-branch/LayoutTests/media/video-webkit-playsinline-expected.txt 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(true))
+RUN(video.removeAttribute("webkit-playsinline", ""))
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(true))
+RUN(video.setAttribute("webkit-playsinline", ""))
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+EXPECTED (video.webkitDisplayingFullscreen == 'true') OK
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(false))
+RUN(video.removeAttribute("webkit-playsinline", ""))
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
+RUN(internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(false))
+RUN(video.setAttribute("webkit-playsinline", ""))
+EVENT(canplaythrough)
+RUN(video.play())
+EVENT(playing)
+EXPECTED (video.webkitDisplayingFullscreen == 'false') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsmediavideowebkitplaysinlinehtml"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/media/video-webkit-playsinline.html (0 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/media/video-webkit-playsinline.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/media/video-webkit-playsinline.html 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="media-file.js"></script>
+<script src="video-test.js"></script>
+<script>
+function go()
+{
+ runNextTest();
+}
+
+function runNextTest()
+{
+ if (tests.length)
+ tests.shift()();
+ else
+ endTest();
+}
+
+function testPlaysInline(requiresPlaysInline, hasWebkitPlaysInline, expectedDisplayingFullscreen)
+{
+ run(`internals.settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(${requiresPlaysInline})`);
+ video = media = document.createElement('video');
+ document.body.appendChild(video);
+ video.controls = true;
+ video.src = findMediaFile('video', 'content/test');
+ run(`video.${hasWebkitPlaysInline ? 'set' : 'remove'}Attribute("webkit-playsinline", "")`);
+ waitForEventOnce('canplaythrough', () => {
+ runWithKeyDown(() => {
+ run('video.play()');
+ });
+ })
+ waitForEventOnce('playing', () => {
+ testExpected('video.webkitDisplayingFullscreen', expectedDisplayingFullscreen);
+ document.body.removeChild(video);
+ runNextTest();
+ });
+}
+
+function testRequiresPlaysInlineAndDoesntHaveIt()
+{
+ testPlaysInline(true, false, true);
+}
+
+function testRequiresPlaysInlineAndDoesHaveIt()
+{
+ testPlaysInline(true, true, true);
+}
+
+function testDoesNotRequirePlaysInlineAndDoesntHaveIt()
+{
+ testPlaysInline(false, false, false);
+}
+
+function testDoesNotRequirePlaysInlineAndDoesHaveIt()
+{
+ testPlaysInline(false, true, false);
+}
+
+var tests = [
+ testRequiresPlaysInlineAndDoesntHaveIt,
+ testRequiresPlaysInlineAndDoesHaveIt,
+ testDoesNotRequirePlaysInlineAndDoesntHaveIt,
+ testDoesNotRequirePlaysInlineAndDoesHaveIt,
+];
+
+</script>
+</head>
+<body onload="go()">
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -1,5 +1,49 @@
</span><span class="cx"> 2016-07-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203752. rdar://problem/27557968
+
+ 2016-07-26 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [iPhone] Playing a video on tudou.com plays only sound, no video
+ https://bugs.webkit.org/show_bug.cgi?id=160178
+ <rdar://problem/27535468>
+
+ Reviewed by Eric Carlson and Dan Bernstein.
+
+ This patch re-implements r203520 in a much simpler way which doesn't involve a new SPI.
+ The biggest problem with r203520 is that it make it impossible for a WKWebView to match
+ MobileSafari's behavior. Instead of adding this new SPI, a simple version check should
+ be used to keep old apps working.
+
+ The new behavior is characterized by the following table:
+
+ | iOS | Non-iOS
+ =============================================================================================
+ requiresPlayInlineAttribute == true | Old app: honor -webkit-playsinline | honor playsinline
+ | New app: honor playsinline | honor playsinline
+ ---------------------------------------------------------------------------------------------
+ requiresPlayInlineAttribute == false | Always inline | Always inline
+
+ Specifically, this patch reverts r203545 which is the commit which actually removes
+ the old SPI. As soon as Safari is migrated back to this old SPI, I'll remove the two
+ new SPIs added in r203520.
+
+ Tests: media/video-playsinline.html
+ media/video-webkit-playsinline.html
+
+ * html/MediaElementSession.cpp:
+ (WebCore::MediaElementSession::requiresFullscreenForVideoPlayback):
+ * page/Settings.cpp:
+ * page/Settings.in:
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::Backup::Backup):
+ (WebCore::InternalSettings::Backup::restoreTo):
+ (WebCore::InternalSettings::setInlineMediaPlaybackRequiresPlaysInlineAttribute):
+ * testing/InternalSettings.h:
+ * testing/InternalSettings.idl:
+
+2016-07-28 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203746. rdar://problem/27527151
</span><span class="cx">
</span><span class="cx"> 2016-07-26 Anders Carlsson <andersca@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorehtmlMediaElementSessioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/html/MediaElementSession.cpp (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/html/MediaElementSession.cpp 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Source/WebCore/html/MediaElementSession.cpp 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> #include "RenderView.h"
</span><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "SourceBuffer.h"
</span><ins>+#include <wtf/spi/darwin/dyldSPI.h>
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include "AudioSession.h"
</span><span class="lines">@@ -465,16 +466,14 @@
</span><span class="cx"> if (!settings || !settings->allowsInlineMediaPlayback())
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- bool requiresPlaysInline = settings->allowsInlineMediaPlaybackWithPlaysInlineAttribute();
- bool requiresWebKitPlaysInline = settings->allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute();
-
- if (!requiresPlaysInline && !requiresWebKitPlaysInline)
</del><ins>+ if (!settings->inlineMediaPlaybackRequiresPlaysInlineAttribute())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- bool hasPlaysInline = element.hasAttributeWithoutSynchronization(HTMLNames::playsinlineAttr);
- bool hasWebKitPlaysInline = element.hasAttributeWithoutSynchronization(HTMLNames::webkit_playsinlineAttr);
-
- return !((requiresPlaysInline && hasPlaysInline) || (requiresWebKitPlaysInline && hasWebKitPlaysInline));
</del><ins>+#if PLATFORM(IOS)
+ if (dyld_get_program_sdk_version() < DYLD_IOS_VERSION_10_0)
+ return !element.hasAttributeWithoutSynchronization(HTMLNames::webkit_playsinlineAttr);
+#endif
+ return !element.hasAttributeWithoutSynchronization(HTMLNames::playsinlineAttr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MediaElementSession::allowsAutomaticMediaDataLoading(const HTMLMediaElement& element) const
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/page/Settings.cpp (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/page/Settings.cpp 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Source/WebCore/page/Settings.cpp 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -138,6 +138,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 defaultAllowsInlineMediaPlayback = false;
</span><ins>+static const bool defaultInlineMediaPlaybackRequiresPlaysInlineAttribute = true;
</ins><span class="cx"> static const bool defaultAllowsInlineMediaPlaybackWithPlaysInlineAttribute = true;
</span><span class="cx"> static const bool defaultAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = true;
</span><span class="cx"> static const bool defaultVideoPlaybackRequiresUserGesture = true;
</span><span class="lines">@@ -152,6 +153,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 defaultAllowsInlineMediaPlayback = true;
</span><ins>+static const bool defaultInlineMediaPlaybackRequiresPlaysInlineAttribute = false;
</ins><span class="cx"> static const bool defaultAllowsInlineMediaPlaybackWithPlaysInlineAttribute = false;
</span><span class="cx"> static const bool defaultAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = false;
</span><span class="cx"> static const bool defaultVideoPlaybackRequiresUserGesture = false;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/page/Settings.in (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/page/Settings.in 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Source/WebCore/page/Settings.in 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -131,6 +131,7 @@
</span><span class="cx"> mainContentUserGestureOverrideEnabled initial=false
</span><span class="cx"> allowsInlineMediaPlayback initial=defaultAllowsInlineMediaPlayback
</span><span class="cx"> allowsInlineMediaPlaybackAfterFullscreen initial=true
</span><ins>+inlineMediaPlaybackRequiresPlaysInlineAttribute initial=defaultInlineMediaPlaybackRequiresPlaysInlineAttribute
</ins><span class="cx"> allowsInlineMediaPlaybackWithPlaysInlineAttribute initial=defaultAllowsInlineMediaPlaybackWithPlaysInlineAttribute
</span><span class="cx"> allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute initial=defaultAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute
</span><span class="cx"> allowsPictureInPictureMediaPlayback initial=defaultAllowsPictureInPictureMediaPlayback
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoretestingInternalSettingscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/testing/InternalSettings.cpp (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/testing/InternalSettings.cpp 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Source/WebCore/testing/InternalSettings.cpp 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -107,6 +107,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_allowsInlineMediaPlayback(settings.allowsInlineMediaPlayback())
</span><span class="cx"> , m_allowsInlineMediaPlaybackAfterFullscreen(settings.allowsInlineMediaPlaybackAfterFullscreen())
</span><ins>+ , m_inlineMediaPlaybackRequiresPlaysInlineAttribute(settings.inlineMediaPlaybackRequiresPlaysInlineAttribute())
</ins><span class="cx"> , m_allowsInlineMediaPlaybackWithPlaysInlineAttribute(settings.allowsInlineMediaPlaybackWithPlaysInlineAttribute())
</span><span class="cx"> , m_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(settings.allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute())
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
</span><span class="lines">@@ -184,6 +185,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> settings.setAllowsInlineMediaPlayback(m_allowsInlineMediaPlayback);
</span><span class="cx"> settings.setAllowsInlineMediaPlaybackAfterFullscreen(m_allowsInlineMediaPlaybackAfterFullscreen);
</span><ins>+ settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(m_inlineMediaPlaybackRequiresPlaysInlineAttribute);
</ins><span class="cx"> settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(m_allowsInlineMediaPlaybackWithPlaysInlineAttribute);
</span><span class="cx"> settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(m_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute);
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setPluginReplacementEnabled(m_pluginReplacementEnabled);
</span><span class="lines">@@ -576,6 +578,12 @@
</span><span class="cx"> settings()->setAllowsInlineMediaPlaybackAfterFullscreen(allows);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void InternalSettings::setInlineMediaPlaybackRequiresPlaysInlineAttribute(bool requires, ExceptionCode& ec)
+{
+ InternalSettingsGuardForSettings();
+ settings()->setInlineMediaPlaybackRequiresPlaysInlineAttribute(requires);
+}
+
</ins><span class="cx"> void InternalSettings::setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(bool requires, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> InternalSettingsGuardForSettings();
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoretestingInternalSettingsh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/testing/InternalSettings.h (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/testing/InternalSettings.h 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Source/WebCore/testing/InternalSettings.h 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -107,6 +107,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> bool m_allowsInlineMediaPlayback;
</span><span class="cx"> bool m_allowsInlineMediaPlaybackAfterFullscreen;
</span><ins>+ bool m_inlineMediaPlaybackRequiresPlaysInlineAttribute;
</ins><span class="cx"> bool m_allowsInlineMediaPlaybackWithPlaysInlineAttribute;
</span><span class="cx"> bool m_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
</span><span class="lines">@@ -163,6 +164,7 @@
</span><span class="cx"> void setScrollingTreeIncludesFrames(bool, ExceptionCode&);
</span><span class="cx"> void setAllowsInlineMediaPlayback(bool, ExceptionCode&);
</span><span class="cx"> void setAllowsInlineMediaPlaybackAfterFullscreen(bool, ExceptionCode&);
</span><ins>+ void setInlineMediaPlaybackRequiresPlaysInlineAttribute(bool, ExceptionCode&);
</ins><span class="cx"> void setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(bool, ExceptionCode&);
</span><span class="cx"> void setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(bool, ExceptionCode&);
</span><span class="cx"> void setIndexedDBWorkersEnabled(bool, ExceptionCode&);
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoretestingInternalSettingsidl"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/testing/InternalSettings.idl (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/testing/InternalSettings.idl 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Source/WebCore/testing/InternalSettings.idl 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx"> [RaisesException] void setMinimumTimerInterval(unrestricted double intervalInSeconds);
</span><span class="cx"> [RaisesException] void setAllowsInlineMediaPlayback(boolean allows);
</span><span class="cx"> [RaisesException] void setAllowsInlineMediaPlaybackAfterFullscreen(boolean allows);
</span><ins>+ [RaisesException] void setInlineMediaPlaybackRequiresPlaysInlineAttribute(boolean requires);
</ins><span class="cx"> [RaisesException] void setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(boolean requires);
</span><span class="cx"> [RaisesException] void setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(boolean requires);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit/mac/ChangeLog (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit/mac/ChangeLog 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Source/WebKit/mac/ChangeLog 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-07-28 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r203752. rdar://problem/27557968
+
+ 2016-07-26 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [iPhone] Playing a video on tudou.com plays only sound, no video
+ https://bugs.webkit.org/show_bug.cgi?id=160178
+ <rdar://problem/27535468>
+
+ Reviewed by Eric Carlson and Dan Bernstein.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences inlineMediaPlaybackRequiresPlaysInlineAttribute]):
+ (-[WebPreferences setInlineMediaPlaybackRequiresPlaysInlineAttribute:]):
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
</ins><span class="cx"> 2016-07-22 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r203545. rdar://problem/26964090
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -126,6 +126,7 @@
</span><span class="cx"> #define WebKitMainContentUserGestureOverrideEnabledPreferenceKey @"WebKitMainContentUserGestureOverrideEnabled"
</span><span class="cx"> #define WebKitAllowsInlineMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsInline"
</span><span class="cx"> #define WebKitAllowsInlineMediaPlaybackAfterFullscreenPreferenceKey @"WebKitAllowsInlineMediaPlaybackAfterFullscreen"
</span><ins>+#define WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey @"InlineMediaPlaybackRequiresPlaysInlineAttribute"
</ins><span class="cx"> #define WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey @"AllowsInlineMediaPlaybackWithPlaysInlineAttribute"
</span><span class="cx"> #define WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey @"AllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute"
</span><span class="cx"> #define WebKitInvisibleAutoplayNotPermittedKey @"InvisibleAutoplayNotPermitted"
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit/mac/WebView/WebPreferences.mm (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -525,6 +525,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitAllowsInlineMediaPlaybackPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitAllowsInlineMediaPlaybackAfterFullscreenPreferenceKey,
</span><ins>+ [NSNumber numberWithBool:NO], WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey,
</ins><span class="cx"> [NSNumber numberWithBool:NO], WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey,
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitMediaControlsScaleWithPageZoomPreferenceKey,
</span><span class="lines">@@ -539,6 +540,7 @@
</span><span class="cx"> #else
</span><span class="cx"> [NSNumber numberWithBool:allowsInlineMediaPlayback], WebKitAllowsInlineMediaPlaybackPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:allowsInlineMediaPlaybackAfterFullscreen], WebKitAllowsInlineMediaPlaybackAfterFullscreenPreferenceKey,
</span><ins>+ [NSNumber numberWithBool:requiresPlaysInlineAttribute], WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey,
</ins><span class="cx"> [NSNumber numberWithBool:requiresPlaysInlineAttribute], WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey,
</span><span class="cx"> [NSNumber numberWithBool:requiresPlaysInlineAttribute], WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitMediaControlsScaleWithPageZoomPreferenceKey,
</span><span class="lines">@@ -2285,6 +2287,16 @@
</span><span class="cx"> [self _setBoolValue:flag forKey:WebKitAllowsInlineMediaPlaybackPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)inlineMediaPlaybackRequiresPlaysInlineAttribute
+{
+ return [self _boolValueForKey:WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey];
+}
+
+- (void)setInlineMediaPlaybackRequiresPlaysInlineAttribute:(BOOL)flag
+{
+ [self _setBoolValue:flag forKey:WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey];
+}
+
</ins><span class="cx"> - (BOOL)allowsInlineMediaPlaybackWithPlaysInlineAttribute
</span><span class="cx"> {
</span><span class="cx"> return [self _boolValueForKey:WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey];
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -262,6 +262,9 @@
</span><span class="cx"> - (void)setMediaPlaybackAllowsInline:(BOOL)flag;
</span><span class="cx"> - (BOOL)mediaPlaybackAllowsInline;
</span><span class="cx">
</span><ins>+- (void)setInlineMediaPlaybackRequiresPlaysInlineAttribute:(BOOL)flag;
+- (BOOL)inlineMediaPlaybackRequiresPlaysInlineAttribute;
+
</ins><span class="cx"> - (void)setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:(BOOL)flag;
</span><span class="cx"> - (BOOL)allowsInlineMediaPlaybackWithPlaysInlineAttribute;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit/mac/WebView/WebView.mm (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit/mac/WebView/WebView.mm 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Source/WebKit/mac/WebView/WebView.mm 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -2348,6 +2348,7 @@
</span><span class="cx"> settings.setMainContentUserGestureOverrideEnabled([preferences overrideUserGestureRequirementForMainContent]);
</span><span class="cx"> settings.setAllowsInlineMediaPlayback([preferences mediaPlaybackAllowsInline]);
</span><span class="cx"> settings.setAllowsInlineMediaPlaybackAfterFullscreen([preferences allowsInlineMediaPlaybackAfterFullscreen]);
</span><ins>+ settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute([preferences inlineMediaPlaybackRequiresPlaysInlineAttribute]);
</ins><span class="cx"> settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute([preferences allowsInlineMediaPlaybackWithPlaysInlineAttribute]);
</span><span class="cx"> settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute([preferences allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute]);
</span><span class="cx"> settings.setInvisibleAutoplayNotPermitted([preferences invisibleAutoplayNotPermitted]);
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2016-07-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203752. rdar://problem/27557968
+
+ 2016-07-26 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [iPhone] Playing a video on tudou.com plays only sound, no video
+ https://bugs.webkit.org/show_bug.cgi?id=160178
+ <rdar://problem/27535468>
+
+ Reviewed by Eric Carlson and Dan Bernstein.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetInlineMediaPlaybackRequiresPlaysInlineAttribute):
+ (WKPreferencesGetInlineMediaPlaybackRequiresPlaysInlineAttribute):
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _initializeWithConfiguration:]):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration init]):
+ (-[WKWebViewConfiguration copyWithZone:]):
+ (-[WKWebViewConfiguration _inlineMediaPlaybackRequiresPlaysInlineAttribute]):
+ (-[WKWebViewConfiguration _setInlineMediaPlaybackRequiresPlaysInlineAttribute:]):
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
+2016-07-28 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203741. rdar://problem/27480873
</span><span class="cx">
</span><span class="cx"> 2016-07-26 Anders Carlsson <andersca@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -156,6 +156,7 @@
</span><span class="cx"> macro(MainContentUserGestureOverrideEnabled, mainContentUserGestureOverrideEnabled, Bool, bool, false, "", "") \
</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><ins>+ macro(InlineMediaPlaybackRequiresPlaysInlineAttribute, inlineMediaPlaybackRequiresPlaysInlineAttribute, Bool, bool, DEFAULT_INLINE_MEDIA_PLAYBACK_REQUIRES_PLAYS_INLINE_ATTRIBUTE, "", "") \
</ins><span class="cx"> macro(AllowsInlineMediaPlaybackWithPlaysInlineAttribute, allowsInlineMediaPlaybackWithPlaysInlineAttribute, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_PLAYS_INLINE_ATTRIBUTE, "", "") \
</span><span class="cx"> macro(AllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute, allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_WEBKIT_PLAYS_INLINE_ATTRIBUTE, "", "") \
</span><span class="cx"> macro(InvisibleAutoplayNotPermitted, invisibleAutoplayNotPermitted, Bool, bool, DEFAULT_INVISIBLE_AUTOPLAY_NOT_PERMITTED, "", "") \
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -793,6 +793,16 @@
</span><span class="cx"> return toImpl(preferencesRef)->allowsInlineMediaPlayback();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKPreferencesSetInlineMediaPlaybackRequiresPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag)
+{
+ toImpl(preferencesRef)->setInlineMediaPlaybackRequiresPlaysInlineAttribute(flag);
+}
+
+bool WKPreferencesGetInlineMediaPlaybackRequiresPlaysInlineAttribute(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->inlineMediaPlaybackRequiresPlaysInlineAttribute();
+}
+
</ins><span class="cx"> void WKPreferencesSetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag)
</span><span class="cx"> {
</span><span class="cx"> toImpl(preferencesRef)->setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(flag);
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -191,6 +191,10 @@
</span><span class="cx"> WK_EXPORT void WKPreferencesSetMediaPlaybackAllowsInline(WKPreferencesRef preferencesRef, bool flag);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetMediaPlaybackAllowsInline(WKPreferencesRef preferencesRef);
</span><span class="cx">
</span><ins>+// Defaults to false.
+WK_EXPORT void WKPreferencesSetInlineMediaPlaybackRequiresPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag);
+WK_EXPORT bool WKPreferencesGetInlineMediaPlaybackRequiresPlaysInlineAttribute(WKPreferencesRef preferencesRef);
+
</ins><span class="cx"> // Defaults to true on iOS, false elsewhere.
</span><span class="cx"> WK_EXPORT void WKPreferencesSetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(WKPreferencesRef preferencesRef);
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -455,6 +455,7 @@
</span><span class="cx">
</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><ins>+ pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::inlineMediaPlaybackRequiresPlaysInlineAttributeKey(), WebKit::WebPreferencesStore::Value(!![_configuration _inlineMediaPlaybackRequiresPlaysInlineAttribute]));
</ins><span class="cx"> pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackWithPlaysInlineAttributeKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsInlineMediaPlaybackWithPlaysInlineAttribute]));
</span><span class="cx"> pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute]));
</span><span class="cx"> pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsPictureInPictureMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsPictureInPictureMediaPlayback] && shouldAllowPictureInPictureMediaPlayback()));
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -107,6 +107,7 @@
</span><span class="cx"> LazyInitialized<RetainPtr<WKWebViewContentProviderRegistry>> _contentProviderRegistry;
</span><span class="cx"> BOOL _alwaysRunsAtForegroundPriority;
</span><span class="cx"> BOOL _allowsInlineMediaPlayback;
</span><ins>+ BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute;
</ins><span class="cx"> BOOL _allowsInlineMediaPlaybackWithPlaysInlineAttribute;
</span><span class="cx"> BOOL _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
</span><span class="cx"> BOOL _allowsInlineMediaPlaybackAfterFullscreen;
</span><span class="lines">@@ -138,6 +139,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> _allowsPictureInPictureMediaPlayback = YES;
</span><span class="cx"> _allowsInlineMediaPlayback = WebCore::deviceClass() == MGDeviceClassiPad;
</span><ins>+ _inlineMediaPlaybackRequiresPlaysInlineAttribute = !_allowsInlineMediaPlayback;
</ins><span class="cx"> _allowsInlineMediaPlaybackWithPlaysInlineAttribute = !_allowsInlineMediaPlayback;
</span><span class="cx"> _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = !_allowsInlineMediaPlayback;
</span><span class="cx"> _allowsInlineMediaPlaybackAfterFullscreen = !_allowsInlineMediaPlayback;
</span><span class="lines">@@ -290,6 +292,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> configuration->_allowsInlineMediaPlayback = self->_allowsInlineMediaPlayback;
</span><span class="cx"> configuration->_allowsInlineMediaPlaybackAfterFullscreen = self->_allowsInlineMediaPlaybackAfterFullscreen;
</span><ins>+ configuration->_inlineMediaPlaybackRequiresPlaysInlineAttribute = self->_inlineMediaPlaybackRequiresPlaysInlineAttribute;
</ins><span class="cx"> configuration->_allowsInlineMediaPlaybackWithPlaysInlineAttribute = self->_allowsInlineMediaPlaybackWithPlaysInlineAttribute;
</span><span class="cx"> configuration->_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = self->_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
</span><span class="cx"> configuration->_allowsPictureInPictureMediaPlayback = self->_allowsPictureInPictureMediaPlayback;
</span><span class="lines">@@ -571,6 +574,16 @@
</span><span class="cx"> _alwaysRunsAtForegroundPriority = alwaysRunsAtForegroundPriority;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_inlineMediaPlaybackRequiresPlaysInlineAttribute
+{
+ return _inlineMediaPlaybackRequiresPlaysInlineAttribute;
+}
+
+- (void)_setInlineMediaPlaybackRequiresPlaysInlineAttribute:(BOOL)requires
+{
+ _inlineMediaPlaybackRequiresPlaysInlineAttribute = requires;
+}
+
</ins><span class="cx"> - (BOOL)_allowsInlineMediaPlaybackWithPlaysInlineAttribute
</span><span class="cx"> {
</span><span class="cx"> return _allowsInlineMediaPlaybackWithPlaysInlineAttribute;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx">
</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><ins>+@property (nonatomic, setter=_setInlineMediaPlaybackRequiresPlaysInlineAttribute:) BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute WK_API_AVAILABLE(ios(WK_IOS_TBA));
</ins><span class="cx"> @property (nonatomic, setter=_setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:) BOOL _allowsInlineMediaPlaybackWithPlaysInlineAttribute WK_API_AVAILABLE(ios(WK_IOS_TBA));
</span><span class="cx"> @property (nonatomic, setter=_setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:) BOOL _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute WK_API_AVAILABLE(ios(WK_IOS_TBA));
</span><span class="cx"> @property (nonatomic, setter=_setAllowsInlineMediaPlaybackAfterFullscreen:) BOOL _allowsInlineMediaPlaybackAfterFullscreen WK_API_AVAILABLE(ios(WK_IOS_TBA));
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -2985,6 +2985,7 @@
</span><span class="cx"> settings.setMainContentUserGestureOverrideEnabled(store.getBoolValueForKey(WebPreferencesKey::mainContentUserGestureOverrideEnabledKey()));
</span><span class="cx"> settings.setAllowsInlineMediaPlayback(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackKey()));
</span><span class="cx"> settings.setAllowsInlineMediaPlaybackAfterFullscreen(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackAfterFullscreenKey()));
</span><ins>+ settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(store.getBoolValueForKey(WebPreferencesKey::inlineMediaPlaybackRequiresPlaysInlineAttributeKey()));
</ins><span class="cx"> settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackWithPlaysInlineAttributeKey()));
</span><span class="cx"> settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey()));
</span><span class="cx"> settings.setInvisibleAutoplayNotPermitted(store.getBoolValueForKey(WebPreferencesKey::invisibleAutoplayNotPermittedKey()));
</span></span></pre></div>
<a id="branchessafari602branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Tools/ChangeLog (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Tools/ChangeLog 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Tools/ChangeLog 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2016-07-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203752. rdar://problem/27557968
+
+ 2016-07-26 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [iPhone] Playing a video on tudou.com plays only sound, no video
+ https://bugs.webkit.org/show_bug.cgi?id=160178
+ <rdar://problem/27535468>
+
+ Reviewed by Dan Bernstein.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (setDefaultsToConsistentValuesForTesting):
+ * TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm:
+ (RequiresUserActionForPlaybackTest::SetUp):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetPreferencesToConsistentValues):
+ * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
+ (WTR::initializeWebViewConfiguration):
+
+2016-07-28 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203698. rdar://problem/26986673
</span><span class="cx">
</span><span class="cx"> 2016-07-25 Wenson Hsieh <wenson_hsieh@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -1017,6 +1017,7 @@
</span><span class="cx"> WebKitEnableFullDocumentTeardownPreferenceKey: @YES,
</span><span class="cx"> WebKitFullScreenEnabledPreferenceKey: @YES,
</span><span class="cx"> WebKitAllowsInlineMediaPlaybackPreferenceKey: @YES,
</span><ins>+ WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey: @NO,
</ins><span class="cx"> WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey: @NO,
</span><span class="cx"> WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey: @NO,
</span><span class="cx"> @"UseWebKitWebInspector": @YES,
</span></span></pre></div>
<a id="branchessafari602branchToolsTestWebKitAPITestsWebKit2CocoaRequiresUserActionForPlaybackmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx"> configuration.get()._mediaDataLoadsAutomatically = YES;
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> configuration.get().allowsInlineMediaPlayback = YES;
</span><ins>+ configuration.get()._inlineMediaPlaybackRequiresPlaysInlineAttribute = NO;
</ins><span class="cx"> configuration.get()._allowsInlineMediaPlaybackWithPlaysInlineAttribute = NO;
</span><span class="cx"> configuration.get()._allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = NO;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari602branchToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Tools/WebKitTestRunner/TestController.cpp (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Tools/WebKitTestRunner/TestController.cpp 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Tools/WebKitTestRunner/TestController.cpp 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -684,6 +684,7 @@
</span><span class="cx"> WKPreferencesSetStorageBlockingPolicy(preferences, kWKAllowAllStorage);
</span><span class="cx">
</span><span class="cx"> WKPreferencesSetMediaPlaybackAllowsInline(preferences, true);
</span><ins>+ WKPreferencesSetInlineMediaPlaybackRequiresPlaysInlineAttribute(preferences, false);
</ins><span class="cx"> WKPreferencesSetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(preferences, false);
</span><span class="cx"> WKPreferencesSetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(preferences, false);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchToolsWebKitTestRunnercocoaTestControllerCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm (203881 => 203882)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2016-07-29 07:12:12 UTC (rev 203881)
+++ branches/safari-602-branch/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2016-07-29 07:12:21 UTC (rev 203882)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> globalWebViewConfiguration.allowsInlineMediaPlayback = YES;
</span><ins>+ globalWebViewConfiguration._inlineMediaPlaybackRequiresPlaysInlineAttribute = NO;
</ins><span class="cx"> globalWebViewConfiguration._allowsInlineMediaPlaybackWithPlaysInlineAttribute = NO;
</span><span class="cx"> globalWebViewConfiguration._allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = NO;
</span><span class="cx"> globalWebViewConfiguration._invisibleAutoplayNotPermitted = NO;
</span></span></pre>
</div>
</div>
</body>
</html>