<!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>[175336] 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/175336">175336</a></dd>
<dt>Author</dt> <dd>adachan@apple.com</dd>
<dt>Date</dt> <dd>2014-10-29 11:56:42 -0700 (Wed, 29 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add API to mute/unmute a page.
https://bugs.webkit.org/show_bug.cgi?id=138150
Reviewed by Eric Carlson.
No new tests, since it's difficult to test whether the Page has indeed been muted.
* dom/Document.cpp:
(WebCore::Document::setMuted):
Go through each AudioProducer and call setMuted() on it.
* dom/Document.h:
* page/AudioProducer.h:
Add setMuted(bool). HTMLMediaElement, the only derived class of AudioProducer so far,
has already implemented setMuted().
* page/Page.cpp:
(WebCore::Page::setMuted):
Go through all its frames and call setMuted() on each frame's Document.
* page/Page.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCorepageAudioProducerh">trunk/Source/WebCore/page/AudioProducer.h</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175335 => 175336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-10-29 18:48:23 UTC (rev 175335)
+++ trunk/Source/WebCore/ChangeLog        2014-10-29 18:56:42 UTC (rev 175336)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-10-28 Ada Chan <adachan@apple.com>
+
+ Add API to mute/unmute a page.
+ https://bugs.webkit.org/show_bug.cgi?id=138150
+
+ Reviewed by Eric Carlson.
+
+ No new tests, since it's difficult to test whether the Page has indeed been muted.
+
+ * dom/Document.cpp:
+ (WebCore::Document::setMuted):
+ Go through each AudioProducer and call setMuted() on it.
+ * dom/Document.h:
+ * page/AudioProducer.h:
+ Add setMuted(bool). HTMLMediaElement, the only derived class of AudioProducer so far,
+ has already implemented setMuted().
+ * page/Page.cpp:
+ (WebCore::Page::setMuted):
+ Go through all its frames and call setMuted() on each frame's Document.
+ * page/Page.h:
+
</ins><span class="cx"> 2014-10-29 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement action menus for data detected items
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (175335 => 175336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp        2014-10-29 18:48:23 UTC (rev 175335)
+++ trunk/Source/WebCore/dom/Document.cpp        2014-10-29 18:56:42 UTC (rev 175336)
</span><span class="lines">@@ -3304,6 +3304,12 @@
</span><span class="cx"> page()->updateIsPlayingAudio();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Document::setMuted(bool muted)
+{
+ for (auto audioProducer : m_audioProducers)
+ audioProducer->setMuted(muted);
+}
+
</ins><span class="cx"> void Document::styleResolverChanged(StyleResolverUpdateFlag updateFlag)
</span><span class="cx"> {
</span><span class="cx"> if (m_optimizedStyleSheetUpdateTimer.isActive())
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (175335 => 175336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h        2014-10-29 18:48:23 UTC (rev 175335)
+++ trunk/Source/WebCore/dom/Document.h        2014-10-29 18:56:42 UTC (rev 175336)
</span><span class="lines">@@ -1292,6 +1292,7 @@
</span><span class="cx"> void removeAudioProducer(AudioProducer*);
</span><span class="cx"> bool isPlayingAudio() const { return m_isPlayingAudio; }
</span><span class="cx"> void updateIsPlayingAudio();
</span><ins>+ void setMuted(bool);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> enum ConstructionFlags { Synthesized = 1, NonRenderedPlaceholder = 1 << 1 };
</span></span></pre></div>
<a id="trunkSourceWebCorepageAudioProducerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/AudioProducer.h (175335 => 175336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/AudioProducer.h        2014-10-29 18:48:23 UTC (rev 175335)
+++ trunk/Source/WebCore/page/AudioProducer.h        2014-10-29 18:56:42 UTC (rev 175336)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> class AudioProducer {
</span><span class="cx"> public:
</span><span class="cx"> virtual bool isPlayingAudio() = 0;
</span><ins>+ virtual void setMuted(bool) = 0;
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> virtual ~AudioProducer() { }
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (175335 => 175336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp        2014-10-29 18:48:23 UTC (rev 175335)
+++ trunk/Source/WebCore/page/Page.cpp        2014-10-29 18:56:42 UTC (rev 175336)
</span><span class="lines">@@ -1211,6 +1211,12 @@
</span><span class="cx"> chrome().client().isPlayingAudioDidChange(m_isPlayingAudio);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Page::setMuted(bool muted)
+{
+ for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext())
+ frame->document()->setMuted(muted);
+}
+
</ins><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> void Page::checkSubframeCountConsistency() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (175335 => 175336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h        2014-10-29 18:48:23 UTC (rev 175335)
+++ trunk/Source/WebCore/page/Page.h        2014-10-29 18:56:42 UTC (rev 175336)
</span><span class="lines">@@ -438,6 +438,7 @@
</span><span class="cx">
</span><span class="cx"> bool isPlayingAudio() const { return m_isPlayingAudio; }
</span><span class="cx"> void updateIsPlayingAudio();
</span><ins>+ void setMuted(bool);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WEBCORE_EXPORT void initGroup();
</span></span></pre>
</div>
</div>
</body>
</html>