<!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>[172212] trunk/Source/WebCore</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/172212">172212</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-08-07 09:06:06 -0700 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Taking a paused video full screen flashes black at beginning of animation.
https://bugs.webkit.org/show_bug.cgi?id=135668
Reviewed by Eric Carlson.
When entering fullscreen, the full screen window will momentarily occlude the browser
window, causing a visiblity change notification. To avoid flickering when client buffering
is disabled, throttle calls to updateClientDataBuffering by delaying those calls for a
short period.
* platform/audio/MediaSession.cpp:
(WebCore::MediaSession::MediaSession):
(WebCore::MediaSession::clientWillPausePlayback):
(WebCore::MediaSession::visibilityChanged):
(WebCore::MediaSession::clientDataBufferingTimerFired):
(WebCore::MediaSession::updateClientDataBuffering):
* platform/audio/MediaSession.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioMediaSessioncpp">trunk/Source/WebCore/platform/audio/MediaSession.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioMediaSessionh">trunk/Source/WebCore/platform/audio/MediaSession.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172211 => 172212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-07 14:58:11 UTC (rev 172211)
+++ trunk/Source/WebCore/ChangeLog 2014-08-07 16:06:06 UTC (rev 172212)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-08-07 Jer Noble <jer.noble@apple.com>
+
+ [Mac] Taking a paused video full screen flashes black at beginning of animation.
+ https://bugs.webkit.org/show_bug.cgi?id=135668
+
+ Reviewed by Eric Carlson.
+
+ When entering fullscreen, the full screen window will momentarily occlude the browser
+ window, causing a visiblity change notification. To avoid flickering when client buffering
+ is disabled, throttle calls to updateClientDataBuffering by delaying those calls for a
+ short period.
+
+ * platform/audio/MediaSession.cpp:
+ (WebCore::MediaSession::MediaSession):
+ (WebCore::MediaSession::clientWillPausePlayback):
+ (WebCore::MediaSession::visibilityChanged):
+ (WebCore::MediaSession::clientDataBufferingTimerFired):
+ (WebCore::MediaSession::updateClientDataBuffering):
+ * platform/audio/MediaSession.h:
+
</ins><span class="cx"> 2014-08-07 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> ASSERT in Document::unregisterCollection reloading apple.com
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSession.cpp (172211 => 172212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSession.cpp 2014-08-07 14:58:11 UTC (rev 172211)
+++ trunk/Source/WebCore/platform/audio/MediaSession.cpp 2014-08-07 16:06:06 UTC (rev 172212)
</span><span class="lines">@@ -34,6 +34,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+const double kClientDataBufferingTimerThrottleDelay = 0.1;
+
</ins><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> static const char* stateName(MediaSession::State state)
</span><span class="cx"> {
</span><span class="lines">@@ -57,6 +59,7 @@
</span><span class="cx">
</span><span class="cx"> MediaSession::MediaSession(MediaSessionClient& client)
</span><span class="cx"> : m_client(client)
</span><ins>+ , m_clientDataBufferingTimer(this, &MediaSession::clientDataBufferingTimerFired)
</ins><span class="cx"> , m_state(Idle)
</span><span class="cx"> , m_stateToRestore(Idle)
</span><span class="cx"> , m_notifyingClient(false)
</span><span class="lines">@@ -125,7 +128,8 @@
</span><span class="cx">
</span><span class="cx"> setState(Paused);
</span><span class="cx"> MediaSessionManager::sharedManager().sessionWillEndPlayback(*this);
</span><del>- updateClientDataBuffering();
</del><ins>+ if (!m_clientDataBufferingTimer.isActive())
+ m_clientDataBufferingTimer.startOneShot(kClientDataBufferingTimerThrottleDelay);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -172,11 +176,20 @@
</span><span class="cx">
</span><span class="cx"> void MediaSession::visibilityChanged()
</span><span class="cx"> {
</span><ins>+ if (!m_clientDataBufferingTimer.isActive())
+ m_clientDataBufferingTimer.startOneShot(kClientDataBufferingTimerThrottleDelay);
+}
+
+void MediaSession::clientDataBufferingTimerFired(Timer<WebCore::MediaSession> &)
+{
</ins><span class="cx"> updateClientDataBuffering();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaSession::updateClientDataBuffering()
</span><span class="cx"> {
</span><ins>+ if (m_clientDataBufferingTimer.isActive())
+ m_clientDataBufferingTimer.stop();
+
</ins><span class="cx"> bool shouldBuffer = m_state == Playing || !m_client.elementIsHidden();
</span><span class="cx"> m_client.setShouldBufferData(shouldBuffer);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSession.h (172211 => 172212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSession.h 2014-08-07 14:58:11 UTC (rev 172211)
+++ trunk/Source/WebCore/platform/audio/MediaSession.h 2014-08-07 16:06:06 UTC (rev 172212)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef MediaSession_h
</span><span class="cx"> #define MediaSession_h
</span><span class="cx">
</span><ins>+#include "Timer.h"
</ins><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -102,9 +103,11 @@
</span><span class="cx"> MediaSessionClient& client() const { return m_client; }
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ void clientDataBufferingTimerFired(Timer<MediaSession>&);
</ins><span class="cx"> void updateClientDataBuffering();
</span><span class="cx">
</span><span class="cx"> MediaSessionClient& m_client;
</span><ins>+ Timer<MediaSession> m_clientDataBufferingTimer;
</ins><span class="cx"> State m_state;
</span><span class="cx"> State m_stateToRestore;
</span><span class="cx"> bool m_notifyingClient;
</span></span></pre>
</div>
</div>
</body>
</html>