<!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>[205799] 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/205799">205799</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-09-12 00:53:56 -0700 (Mon, 12 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/205784">r205784</a>. rdar://problem/28230123</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCorehtmlHTMLMediaElementcpp">branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorehtmlMediaElementSessioncpp">branches/safari-602-branch/Source/WebCore/html/MediaElementSession.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorehtmlMediaElementSessionh">branches/safari-602-branch/Source/WebCore/html/MediaElementSession.h</a></li>
<li><a href="#branchessafari602branchToolsChangeLog">branches/safari-602-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari602branchToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj">branches/safari-602-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari602branchToolsTestWebKitAPITestsWebKit2CocoaVideoControlsManagermm">branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/VideoControlsManager.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchToolsTestWebKitAPITestsWebKit2Cocoawideautoplayingvideowithaudiohtml">branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/wide-autoplaying-video-with-audio.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (205798 => 205799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-09-12 07:53:52 UTC (rev 205798)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-09-12 07:53:56 UTC (rev 205799)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2016-09-12 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r205784. rdar://problem/28230123
+
+ 2016-09-10 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Apple.com keynote does not display media controls
+ https://bugs.webkit.org/show_bug.cgi?id=161833
+ <rdar://problem/28230123>
+
+ Reviewed by Tim Horton.
+
+ Tweaks the main content check so that we can distinguish between main content for the purposes of determining
+ autoplay policy vs. main content for the purposes of showing media controls. Namely, we make the latter less
+ restrictive than the former in terms of the maximum aspect ratio a video can have to be considered the right
+ size for main content.
+
+ New unit test in TestWebKitAPI.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::mediaElementSessionInfoForSession):
+ * html/MediaElementSession.cpp:
+ (WebCore::MediaElementSession::canShowControlsManager):
+ (WebCore::MediaElementSession::isLargeEnoughForMainContent):
+ (WebCore::MediaElementSession::wantsToObserveViewportVisibilityForMediaControls):
+ (WebCore::isMainContentForPurposesOfAutoplay):
+ (WebCore::isElementLargeEnoughForMainContent):
+ (WebCore::MediaElementSession::updateIsMainContent):
+ (WebCore::isMainContent): Deleted.
+ * html/MediaElementSession.h:
+
+2016-09-12 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r205765. rdar://problem/28033492
</span><span class="cx">
</span><span class="cx"> 2016-09-09 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp (205798 => 205799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp 2016-09-12 07:53:52 UTC (rev 205798)
+++ branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp 2016-09-12 07:53:56 UTC (rev 205799)
</span><span class="lines">@@ -364,7 +364,7 @@
</span><span class="cx"> session.mostRecentUserInteractionTime(),
</span><span class="cx"> session.canShowControlsManager(),
</span><span class="cx"> element.isFullscreen() || element.isVisibleInViewport(),
</span><del>- session.isLargeEnoughForMainContent(),
</del><ins>+ session.isLargeEnoughForMainContent(MediaSessionMainContentPurpose::MediaControls),
</ins><span class="cx"> element.isPlaying() && element.hasAudio() && !element.muted()
</span><span class="cx"> };
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorehtmlMediaElementSessioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/html/MediaElementSession.cpp (205798 => 205799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/html/MediaElementSession.cpp 2016-09-12 07:53:52 UTC (rev 205798)
+++ branches/safari-602-branch/Source/WebCore/html/MediaElementSession.cpp 2016-09-12 07:53:56 UTC (rev 205799)
</span><span class="lines">@@ -59,8 +59,7 @@
</span><span class="cx">
</span><span class="cx"> static const double elementMainContentCheckInterval = .250;
</span><span class="cx">
</span><del>-static bool isMainContent(const HTMLMediaElement&);
-static bool isElementLargeEnoughForMainContent(const HTMLMediaElement&);
</del><ins>+static bool isElementLargeEnoughForMainContent(const HTMLMediaElement&, MediaSessionMainContentPurpose);
</ins><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> static String restrictionName(MediaElementSession::BehaviorRestrictions restriction)
</span><span class="lines">@@ -274,7 +273,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (isLargeEnoughForMainContent()) {
</del><ins>+ if (isLargeEnoughForMainContent(MediaSessionMainContentPurpose::MediaControls)) {
</ins><span class="cx"> LOG(Media, "MediaElementSession::canShowControlsManager - returning TRUE: Is main content");
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -284,9 +283,9 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaElementSession::isLargeEnoughForMainContent() const
</del><ins>+bool MediaElementSession::isLargeEnoughForMainContent(MediaSessionMainContentPurpose purpose) const
</ins><span class="cx"> {
</span><del>- return isElementLargeEnoughForMainContent(m_element);
</del><ins>+ return isElementLargeEnoughForMainContent(m_element, purpose);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double MediaElementSession::mostRecentUserInteractionTime() const
</span><span class="lines">@@ -296,7 +295,7 @@
</span><span class="cx">
</span><span class="cx"> bool MediaElementSession::wantsToObserveViewportVisibilityForMediaControls() const
</span><span class="cx"> {
</span><del>- return isLargeEnoughForMainContent();
</del><ins>+ return isLargeEnoughForMainContent(MediaSessionMainContentPurpose::MediaControls);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MediaElementSession::wantsToObserveViewportVisibilityForAutoplay() const
</span><span class="lines">@@ -582,7 +581,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static bool isMainContent(const HTMLMediaElement& element)
</del><ins>+static bool isMainContentForPurposesOfAutoplay(const HTMLMediaElement& element)
</ins><span class="cx"> {
</span><span class="cx"> if (!element.hasAudio() || !element.hasVideo())
</span><span class="cx"> return false;
</span><span class="lines">@@ -592,7 +591,7 @@
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!isElementLargeEnoughForMainContent(element))
</del><ins>+ if (!isElementLargeEnoughForMainContent(element, MediaSessionMainContentPurpose::Autoplay))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Elements which are hidden by style, or have been scrolled out of view, cannot be main content.
</span><span class="lines">@@ -652,10 +651,10 @@
</span><span class="cx"> return maxVisibleClientWidth * maxVisibleClientHeight > minimumPercentageOfMainFrameAreaForMainContent * mainFrameView.visibleWidth() * mainFrameView.visibleHeight();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool isElementLargeEnoughForMainContent(const HTMLMediaElement& element)
</del><ins>+static bool isElementLargeEnoughForMainContent(const HTMLMediaElement& element, MediaSessionMainContentPurpose purpose)
</ins><span class="cx"> {
</span><span class="cx"> static const double elementMainContentAreaMinimum = 400 * 300;
</span><del>- static const double maximumAspectRatio = 1.8; // Slightly larger than 16:9.
</del><ins>+ static const double maximumAspectRatio = purpose == MediaSessionMainContentPurpose::MediaControls ? 3 : 1.8;
</ins><span class="cx"> static const double minimumAspectRatio = .5; // Slightly smaller than 9:16.
</span><span class="cx">
</span><span class="cx"> // Elements which have not yet been laid out, or which are not yet in the DOM, cannot be main content.
</span><span class="lines">@@ -688,7 +687,7 @@
</span><span class="cx"> bool MediaElementSession::updateIsMainContent() const
</span><span class="cx"> {
</span><span class="cx"> bool wasMainContent = m_isMainContent;
</span><del>- m_isMainContent = isMainContent(m_element);
</del><ins>+ m_isMainContent = isMainContentForPurposesOfAutoplay(m_element);
</ins><span class="cx">
</span><span class="cx"> if (m_isMainContent != wasMainContent)
</span><span class="cx"> m_element.updateShouldPlay();
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorehtmlMediaElementSessionh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/html/MediaElementSession.h (205798 => 205799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/html/MediaElementSession.h 2016-09-12 07:53:52 UTC (rev 205798)
+++ branches/safari-602-branch/Source/WebCore/html/MediaElementSession.h 2016-09-12 07:53:56 UTC (rev 205799)
</span><span class="lines">@@ -35,6 +35,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+enum class MediaSessionMainContentPurpose {
+ MediaControls,
+ Autoplay
+};
+
</ins><span class="cx"> class Document;
</span><span class="cx"> class HTMLMediaElement;
</span><span class="cx"> class SourceBuffer;
</span><span class="lines">@@ -114,7 +119,7 @@
</span><span class="cx"> bool wantsToObserveViewportVisibilityForMediaControls() const;
</span><span class="cx"> bool wantsToObserveViewportVisibilityForAutoplay() const;
</span><span class="cx"> bool canShowControlsManager() const;
</span><del>- bool isLargeEnoughForMainContent() const;
</del><ins>+ bool isLargeEnoughForMainContent(MediaSessionMainContentPurpose) const;
</ins><span class="cx"> double mostRecentUserInteractionTime() const;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="branchessafari602branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Tools/ChangeLog (205798 => 205799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Tools/ChangeLog 2016-09-12 07:53:52 UTC (rev 205798)
+++ branches/safari-602-branch/Tools/ChangeLog 2016-09-12 07:53:56 UTC (rev 205799)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-09-12 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r205784. rdar://problem/28230123
+
+ 2016-09-10 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Apple.com keynote does not display media controls
+ https://bugs.webkit.org/show_bug.cgi?id=161833
+ <rdar://problem/28230123>
+
+ Reviewed by Tim Horton.
+
+ New unit test verifying that wide videos (~2 aspect ratio) still get media controls.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WebKit2Cocoa/VideoControlsManager.mm:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2Cocoa/wide-autoplaying-video-with-audio.html: Added.
+
+2016-09-12 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r205783. rdar://problem/28229756
</span><span class="cx">
</span><span class="cx"> 2016-09-09 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchToolsTestWebKitAPITestWebKitAPIxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (205798 => 205799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-09-12 07:53:52 UTC (rev 205798)
+++ branches/safari-602-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-09-12 07:53:56 UTC (rev 205799)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> 2DD7D3AF178227B30026E1E3 /* lots-of-text-vertical-lr.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 2DD7D3AE178227AC0026E1E3 /* lots-of-text-vertical-lr.html */; };
</span><span class="cx"> 2DE71AFE1D49C0BD00904094 /* AnimatedResize.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DE71AFD1D49C0BD00904094 /* AnimatedResize.mm */; };
</span><span class="cx"> 2DE71B001D49C3ED00904094 /* blinking-div.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 2DE71AFF1D49C2F000904094 /* blinking-div.html */; };
</span><ins>+ 2E131C181D83A98A001BA36C /* wide-autoplaying-video-with-audio.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 2E131C171D83A97E001BA36C /* wide-autoplaying-video-with-audio.html */; };
</ins><span class="cx"> 2E14A5291D3FE96B0010F35B /* autoplaying-video-with-audio.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 2E14A5281D3FE8B80010F35B /* autoplaying-video-with-audio.html */; };
</span><span class="cx"> 2E1B7B001D41ABA7007558B4 /* large-video-seek-after-ending.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 2E1B7AFF1D41A95F007558B4 /* large-video-seek-after-ending.html */; };
</span><span class="cx"> 2E1B7B021D41B1B9007558B4 /* large-video-hides-controls-after-seek-to-end.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 2E1B7B011D41B1B3007558B4 /* large-video-hides-controls-after-seek-to-end.html */; };
</span><span class="lines">@@ -570,6 +571,7 @@
</span><span class="cx"> 7AE9E5091AE5AE8B00CF874B /* test.pdf in Copy Resources */,
</span><span class="cx"> 7A1458FC1AD5C07000E06772 /* mouse-button-listener.html in Copy Resources */,
</span><span class="cx"> 7C486BA11AA12567003F6F9B /* bundle-file.html in Copy Resources */,
</span><ins>+ 2E131C181D83A98A001BA36C /* wide-autoplaying-video-with-audio.html in Copy Resources */,
</ins><span class="cx"> 2E54F40D1D7BC84200921ADF /* large-video-mutes-onplaying.html in Copy Resources */,
</span><span class="cx"> 2E691AF31D79E75E00129407 /* large-video-playing-scroll-away.html in Copy Resources */,
</span><span class="cx"> 2E691AF11D79E51A00129407 /* large-videos-autoplaying-scroll-to-video.html in Copy Resources */,
</span><span class="lines">@@ -732,6 +734,7 @@
</span><span class="cx"> 2DD7D3AE178227AC0026E1E3 /* lots-of-text-vertical-lr.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "lots-of-text-vertical-lr.html"; sourceTree = "<group>"; };
</span><span class="cx"> 2DE71AFD1D49C0BD00904094 /* AnimatedResize.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AnimatedResize.mm; sourceTree = "<group>"; };
</span><span class="cx"> 2DE71AFF1D49C2F000904094 /* blinking-div.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "blinking-div.html"; sourceTree = "<group>"; };
</span><ins>+ 2E131C171D83A97E001BA36C /* wide-autoplaying-video-with-audio.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "wide-autoplaying-video-with-audio.html"; sourceTree = "<group>"; };
</ins><span class="cx"> 2E14A5281D3FE8B80010F35B /* autoplaying-video-with-audio.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "autoplaying-video-with-audio.html"; sourceTree = "<group>"; };
</span><span class="cx"> 2E1B7AFF1D41A95F007558B4 /* large-video-seek-after-ending.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "large-video-seek-after-ending.html"; sourceTree = "<group>"; };
</span><span class="cx"> 2E1B7B011D41B1B3007558B4 /* large-video-hides-controls-after-seek-to-end.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "large-video-hides-controls-after-seek-to-end.html"; sourceTree = "<group>"; };
</span><span class="lines">@@ -1390,6 +1393,7 @@
</span><span class="cx"> 2E1DFDF01D42E14400714A00 /* large-video-seek-to-beginning-and-play-after-ending.html */,
</span><span class="cx"> 2E1B7B011D41B1B3007558B4 /* large-video-hides-controls-after-seek-to-end.html */,
</span><span class="cx"> 2E1DFDEE1D42A6EB00714A00 /* large-videos-with-audio-autoplay.html */,
</span><ins>+ 2E131C171D83A97E001BA36C /* wide-autoplaying-video-with-audio.html */,
</ins><span class="cx"> 2E54F40C1D7BC83900921ADF /* large-video-mutes-onplaying.html */,
</span><span class="cx"> 2E691AF21D79E75400129407 /* large-video-playing-scroll-away.html */,
</span><span class="cx"> 2E691AF01D79E51400129407 /* large-videos-autoplaying-scroll-to-video.html */,
</span></span></pre></div>
<a id="branchessafari602branchToolsTestWebKitAPITestsWebKit2CocoaVideoControlsManagermm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/VideoControlsManager.mm (205798 => 205799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/VideoControlsManager.mm 2016-09-12 07:53:52 UTC (rev 205798)
+++ branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/VideoControlsManager.mm 2016-09-12 07:53:56 UTC (rev 205799)
</span><span class="lines">@@ -411,6 +411,14 @@
</span><span class="cx"> [webView expectControlsManager:NO afterReceivingMessage:@"playing"];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST(VideoControlsManager, VideoControlsManagerWideMediumSizedVideoInWideMainFrame)
+{
+ RetainPtr<VideoControlsManagerTestWebView*> webView = setUpWebViewForTestingVideoControlsManager(NSMakeRect(0, 0, 1600, 800));
+
+ [webView loadTestPageNamed:@"wide-autoplaying-video-with-audio"];
+ [webView expectControlsManager:YES afterReceivingMessage:@"playing"];
+}
+
</ins><span class="cx"> TEST(VideoControlsManager, VideoControlsManagerFullSizeVideoInWideMainFrame)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<VideoControlsManagerTestWebView*> webView = setUpWebViewForTestingVideoControlsManager(NSMakeRect(0, 0, 1600, 800));
</span></span></pre></div>
<a id="branchessafari602branchToolsTestWebKitAPITestsWebKit2Cocoawideautoplayingvideowithaudiohtml"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/wide-autoplaying-video-with-audio.html (0 => 205799)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/wide-autoplaying-video-with-audio.html (rev 0)
+++ branches/safari-602-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/wide-autoplaying-video-with-audio.html 2016-09-12 07:53:56 UTC (rev 205799)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style>
+ video {
+ width: 800px;
+ height: 400px;
+ }
+ </style>
+ <script>
+ function finishTest() {
+ setTimeout(function() {
+ try {
+ window.webkit.messageHandlers.playingHandler.postMessage("playing");
+ } catch(e) { }
+ }, 0);
+ }
+ </script>
+</head>
+<body>
+ <video autoplay src="video-with-audio.mp4" webkit-playsinline onplaying=finishTest()></video>
+</body>
+</html>
</ins></span></pre>
</div>
</div>
</body>
</html>