<!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>[195154] 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/195154">195154</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-15 15:34:25 -0800 (Fri, 15 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix audio build with video disabled
https://bugs.webkit.org/show_bug.cgi?id=153134
Patch by Olivier Blin <olivier.blin@softathome.com> on 2016-01-15
Reviewed by Michael Catanzaro.
Build fails when WebAudio is enabled but VIDEO disabled.
No new tests since this is a build fix only.
* platform/audio/PlatformMediaSession.cpp:
* platform/audio/PlatformMediaSession.h:
* platform/audio/PlatformMediaSessionManager.cpp:
* testing/Internals.cpp:
(WebCore::Internals::setAudioContextRestrictions):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioPlatformMediaSessioncpp">trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioPlatformMediaSessionh">trunk/Source/WebCore/platform/audio/PlatformMediaSession.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioPlatformMediaSessionManagercpp">trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195153 => 195154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-15 23:22:45 UTC (rev 195153)
+++ trunk/Source/WebCore/ChangeLog 2016-01-15 23:34:25 UTC (rev 195154)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2016-01-15 Olivier Blin <olivier.blin@softathome.com>
</span><span class="cx">
</span><ins>+ Fix audio build with video disabled
+ https://bugs.webkit.org/show_bug.cgi?id=153134
+
+ Reviewed by Michael Catanzaro.
+
+ Build fails when WebAudio is enabled but VIDEO disabled.
+
+ No new tests since this is a build fix only.
+
+ * platform/audio/PlatformMediaSession.cpp:
+ * platform/audio/PlatformMediaSession.h:
+ * platform/audio/PlatformMediaSessionManager.cpp:
+ * testing/Internals.cpp:
+ (WebCore::Internals::setAudioContextRestrictions):
+
+2016-01-15 Olivier Blin <olivier.blin@softathome.com>
+
</ins><span class="cx"> [GTK] Fix build of RenderThemeGtk without VIDEO by including HTMLInputElement
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=153133
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioPlatformMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp (195153 => 195154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp 2016-01-15 23:22:45 UTC (rev 195153)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp 2016-01-15 23:34:25 UTC (rev 195154)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "PlatformMediaSession.h"
</span><span class="cx">
</span><del>-#if ENABLE(VIDEO)
</del><ins>+#if ENABLE(VIDEO) || ENABLE(WEB_AUDIO)
</ins><span class="cx"> #include "HTMLMediaElement.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "MediaPlayer.h"
</span><span class="lines">@@ -205,6 +205,7 @@
</span><span class="cx"> return m_client.presentationType();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(VIDEO)
</ins><span class="cx"> String PlatformMediaSession::title() const
</span><span class="cx"> {
</span><span class="cx"> return m_client.mediaSessionTitle();
</span><span class="lines">@@ -219,6 +220,7 @@
</span><span class="cx"> {
</span><span class="cx"> return m_client.mediaSessionCurrentTime();
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> bool PlatformMediaSession::canReceiveRemoteControlCommands() const
</span><span class="cx"> {
</span><span class="lines">@@ -299,6 +301,7 @@
</span><span class="cx"> PlatformMediaSessionManager::sharedManager().sessionCanProduceAudioChanged(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(VIDEO)
</ins><span class="cx"> String PlatformMediaSessionClient::mediaSessionTitle() const
</span><span class="cx"> {
</span><span class="cx"> return String();
</span><span class="lines">@@ -313,6 +316,7 @@
</span><span class="cx"> {
</span><span class="cx"> return MediaPlayer::invalidTime();
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioPlatformMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSession.h (195153 => 195154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/PlatformMediaSession.h 2016-01-15 23:22:45 UTC (rev 195153)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSession.h 2016-01-15 23:34:25 UTC (rev 195154)
</span><span class="lines">@@ -97,9 +97,11 @@
</span><span class="cx">
</span><span class="cx"> void visibilityChanged();
</span><span class="cx">
</span><ins>+#if ENABLE(VIDEO)
</ins><span class="cx"> String title() const;
</span><span class="cx"> double duration() const;
</span><span class="cx"> double currentTime() const;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> enum RemoteControlCommandType {
</span><span class="cx"> NoCommand,
</span><span class="lines">@@ -176,9 +178,11 @@
</span><span class="cx"> virtual void mayResumePlayback(bool shouldResume) = 0;
</span><span class="cx"> virtual void suspendPlayback() = 0;
</span><span class="cx">
</span><ins>+#if ENABLE(VIDEO)
</ins><span class="cx"> virtual String mediaSessionTitle() const;
</span><span class="cx"> virtual double mediaSessionDuration() const;
</span><span class="cx"> virtual double mediaSessionCurrentTime() const;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> virtual bool canReceiveRemoteControlCommands() const = 0;
</span><span class="cx"> virtual void didReceiveRemoteControlCommand(PlatformMediaSession::RemoteControlCommandType) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioPlatformMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp (195153 => 195154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp 2016-01-15 23:22:45 UTC (rev 195153)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp 2016-01-15 23:34:25 UTC (rev 195154)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "PlatformMediaSessionManager.h"
</span><span class="cx">
</span><del>-#if ENABLE(VIDEO)
</del><ins>+#if ENABLE(VIDEO) || ENABLE(WEB_AUDIO)
</ins><span class="cx">
</span><span class="cx"> #include "AudioSession.h"
</span><span class="cx"> #include "Document.h"
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (195153 => 195154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2016-01-15 23:22:45 UTC (rev 195153)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-01-15 23:34:25 UTC (rev 195154)
</span><span class="lines">@@ -2949,7 +2949,7 @@
</span><span class="cx"> AudioContext::BehaviorRestrictions restrictions = context->behaviorRestrictions();
</span><span class="cx"> context->removeBehaviorRestriction(restrictions);
</span><span class="cx">
</span><del>- restrictions = MediaElementSession::NoRestrictions;
</del><ins>+ restrictions = AudioContext::NoRestrictions;
</ins><span class="cx">
</span><span class="cx"> Vector<String> restrictionsArray;
</span><span class="cx"> restrictionsString.split(',', false, restrictionsArray);
</span></span></pre>
</div>
</div>
</body>
</html>