<!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>[162178] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/162178">162178</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-01-16 18:12:19 -0800 (Thu, 16 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/162145">r162145</a>): media/video-controls-visible-audio-only.html fails
https://bugs.webkit.org/show_bug.cgi?id=127147
Source/WebCore:
Reviewed by Eric Carlson.
Reset the MediaSessionManager's restrictions to their default values before
each run.
Add a new virtual method "resetRestrictions()" so that each port-specific
MediaSessionManager can reset the restrictions to their default values.
Call this from Internals::resetToConsistentState() so that tests which change
the restrictions don't affect later tests.
* platform/audio/MediaSessionManager.cpp:
(WebCore::MediaSessionManager::MediaSessionManager):
(WebCore::MediaSessionManager::resetRestrictions):
* platform/audio/MediaSessionManager.h:
(WebCore::MediaSessionManager::~MediaSessionManager):
* platform/audio/ios/MediaSessionManagerIOS.h:
* platform/audio/ios/MediaSessionManagerIOS.mm:
(WebCore::MediaSessionManageriOS::resetRestrictions):
* testing/Internals.cpp:
(WebCore::Internals::resetToConsistentState):
LayoutTests:
Re-enable media/video-controls-visible-audio-only.html.
Reviewed by Eric Carlson.
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioMediaSessionManagercpp">trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioMediaSessionManagerh">trunk/Source/WebCore/platform/audio/MediaSessionManager.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSh">trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm">trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (162177 => 162178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-17 01:58:42 UTC (rev 162177)
+++ trunk/LayoutTests/ChangeLog 2014-01-17 02:12:19 UTC (rev 162178)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-01-16 Jer Noble <jer.noble@apple.com>
+
+ REGRESSION(r162145): media/video-controls-visible-audio-only.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=127147
+
+ Re-enable media/video-controls-visible-audio-only.html.
+
+ Reviewed by Eric Carlson.
+
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2014-01-16 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r162145): media/video-controls-visible-audio-only.html fails
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (162177 => 162178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2014-01-17 01:58:42 UTC (rev 162177)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2014-01-17 02:12:19 UTC (rev 162178)
</span><span class="lines">@@ -1362,5 +1362,3 @@
</span><span class="cx">
</span><span class="cx"> # Subpixel: misplaced zoomed svg content.
</span><span class="cx"> webkit.org/b/126900 svg/zoom/page/zoom-zoom-coords.xhtml
</span><del>-
-webkit.org/b/127147 media/video-controls-visible-audio-only.html [ Pass Failure ]
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162177 => 162178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-17 01:58:42 UTC (rev 162177)
+++ trunk/Source/WebCore/ChangeLog 2014-01-17 02:12:19 UTC (rev 162178)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-01-16 Jer Noble <jer.noble@apple.com>
+
+ REGRESSION(r162145): media/video-controls-visible-audio-only.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=127147
+
+ Reviewed by Eric Carlson.
+
+ Reset the MediaSessionManager's restrictions to their default values before
+ each run.
+
+ Add a new virtual method "resetRestrictions()" so that each port-specific
+ MediaSessionManager can reset the restrictions to their default values.
+ Call this from Internals::resetToConsistentState() so that tests which change
+ the restrictions don't affect later tests.
+
+ * platform/audio/MediaSessionManager.cpp:
+ (WebCore::MediaSessionManager::MediaSessionManager):
+ (WebCore::MediaSessionManager::resetRestrictions):
+ * platform/audio/MediaSessionManager.h:
+ (WebCore::MediaSessionManager::~MediaSessionManager):
+ * platform/audio/ios/MediaSessionManagerIOS.h:
+ * platform/audio/ios/MediaSessionManagerIOS.mm:
+ (WebCore::MediaSessionManageriOS::resetRestrictions):
+ * testing/Internals.cpp:
+ (WebCore::Internals::resetToConsistentState):
+
</ins><span class="cx"> 2014-01-16 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Compile fix for WinCairo after r162138.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp (162177 => 162178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp 2014-01-17 01:58:42 UTC (rev 162177)
+++ trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp 2014-01-17 02:12:19 UTC (rev 162178)
</span><span class="lines">@@ -41,6 +41,11 @@
</span><span class="cx"> MediaSessionManager::MediaSessionManager()
</span><span class="cx"> : m_interruptions(0)
</span><span class="cx"> {
</span><ins>+ resetRestrictions();
+}
+
+void MediaSessionManager::resetRestrictions()
+{
</ins><span class="cx"> m_restrictions[MediaSession::Video] = NoRestrictions;
</span><span class="cx"> m_restrictions[MediaSession::Audio] = NoRestrictions;
</span><span class="cx"> m_restrictions[MediaSession::WebAudio] = NoRestrictions;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSessionManager.h (162177 => 162178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSessionManager.h 2014-01-17 01:58:42 UTC (rev 162177)
+++ trunk/Source/WebCore/platform/audio/MediaSessionManager.h 2014-01-17 02:12:19 UTC (rev 162178)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> class MediaSessionManager {
</span><span class="cx"> public:
</span><span class="cx"> static MediaSessionManager& sharedManager();
</span><ins>+ virtual ~MediaSessionManager() { }
</ins><span class="cx">
</span><span class="cx"> bool has(MediaSession::MediaType) const;
</span><span class="cx"> int count(MediaSession::MediaType) const;
</span><span class="lines">@@ -56,6 +57,7 @@
</span><span class="cx"> void addRestriction(MediaSession::MediaType, SessionRestrictions);
</span><span class="cx"> void removeRestriction(MediaSession::MediaType, SessionRestrictions);
</span><span class="cx"> SessionRestrictions restrictions(MediaSession::MediaType);
</span><ins>+ virtual void resetRestrictions();
</ins><span class="cx">
</span><span class="cx"> void sessionWillBeginPlayback(const MediaSession&) const;
</span><span class="cx"> bool sessionRestrictsInlineVideoPlayback(const MediaSession&) const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h (162177 => 162178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h 2014-01-17 01:58:42 UTC (rev 162177)
+++ trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h 2014-01-17 02:12:19 UTC (rev 162178)
</span><span class="lines">@@ -42,6 +42,8 @@
</span><span class="cx"> private:
</span><span class="cx"> friend class MediaSessionManager;
</span><span class="cx">
</span><ins>+ virtual void resetRestrictions() override;
+
</ins><span class="cx"> MediaSessionManageriOS();
</span><span class="cx"> RetainPtr<WebMediaSessionHelper> m_objcObserver;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (162177 => 162178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2014-01-17 01:58:42 UTC (rev 162177)
+++ trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2014-01-17 02:12:19 UTC (rev 162178)
</span><span class="lines">@@ -73,6 +73,12 @@
</span><span class="cx"> :MediaSessionManager()
</span><span class="cx"> , m_objcObserver(adoptNS([[WebMediaSessionHelper alloc] initWithCallback:this]))
</span><span class="cx"> {
</span><ins>+}
+
+void MediaSessionManageriOS::resetRestrictions()
+{
+ MediaSessionManager::resetRestrictions();
+
</ins><span class="cx"> DEFINE_STATIC_LOCAL(wkDeviceClass, deviceClass, (iosDeviceClass()));
</span><span class="cx">
</span><span class="cx"> if (deviceClass == wkDeviceClassiPhone || deviceClass == wkDeviceClassiPod)
</span><span class="lines">@@ -81,8 +87,6 @@
</span><span class="cx"> addRestriction(MediaSession::Video, ConcurrentPlaybackNotPermitted);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-}
-
</del><span class="cx"> @implementation WebMediaSessionHelper
</span><span class="cx">
</span><span class="cx"> - (id)initWithCallback:(MediaSessionManageriOS*)callback
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (162177 => 162178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2014-01-17 01:58:42 UTC (rev 162177)
+++ trunk/Source/WebCore/testing/Internals.cpp 2014-01-17 02:12:19 UTC (rev 162178)
</span><span class="lines">@@ -292,6 +292,9 @@
</span><span class="cx"> if (page->mainFrame().editor().isOverwriteModeEnabled())
</span><span class="cx"> page->mainFrame().editor().toggleOverwriteModeEnabled();
</span><span class="cx"> cacheStorage().setDefaultOriginQuota(ApplicationCacheStorage::noQuota());
</span><ins>+#if ENABLE(VIDEO)
+ MediaSessionManager::sharedManager().resetRestrictions();
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Internals::Internals(Document* document)
</span></span></pre>
</div>
</div>
</body>
</html>