<!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>[175351] trunk/Source</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/175351">175351</a></dd>
<dt>Author</dt> <dd>adachan@apple.com</dd>
<dt>Date</dt> <dd>2014-10-29 15:59:15 -0700 (Wed, 29 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement WKPageSetMuted(bool).
https://bugs.webkit.org/show_bug.cgi?id=138158
Reviewed by Anders Carlsson.
Source/WebCore:
* WebCore.exp.in:
* page/Page.h:
Source/WebKit2:
* UIProcess/API/C/WKPage.cpp:
(WKPageSetMuted):
* UIProcess/API/C/WKPagePrivate.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::setMuted):
* UIProcess/WebPageProxy.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setMuted):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagePrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175350 => 175351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-29 22:43:47 UTC (rev 175350)
+++ trunk/Source/WebCore/ChangeLog 2014-10-29 22:59:15 UTC (rev 175351)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-10-28 Ada Chan <adachan@apple.com>
+
+ Implement WKPageSetMuted(bool).
+ https://bugs.webkit.org/show_bug.cgi?id=138158
+
+ Reviewed by Anders Carlsson.
+
+ * WebCore.exp.in:
+ * page/Page.h:
+
</ins><span class="cx"> 2014-10-29 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Notify Settings object when its Page object goes away.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (175350 => 175351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-10-29 22:43:47 UTC (rev 175350)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-10-29 22:59:15 UTC (rev 175351)
</span><span class="lines">@@ -1172,6 +1172,7 @@
</span><span class="cx"> __ZN7WebCore4Page36suspendActiveDOMObjectsAndAnimationsEv
</span><span class="cx"> __ZN7WebCore4Page37setInLowQualityImageInterpolationModeEb
</span><span class="cx"> __ZN7WebCore4Page8goToItemEPNS_11HistoryItemENS_13FrameLoadTypeE
</span><ins>+__ZN7WebCore4Page8setMutedEb
</ins><span class="cx"> __ZN7WebCore4Page9initGroupEv
</span><span class="cx"> __ZN7WebCore4PageC1ERNS0_11PageClientsE
</span><span class="cx"> __ZN7WebCore4PageD1Ev
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (175350 => 175351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2014-10-29 22:43:47 UTC (rev 175350)
+++ trunk/Source/WebCore/page/Page.h 2014-10-29 22:59:15 UTC (rev 175351)
</span><span class="lines">@@ -438,7 +438,7 @@
</span><span class="cx">
</span><span class="cx"> bool isPlayingAudio() const { return m_isPlayingAudio; }
</span><span class="cx"> void updateIsPlayingAudio();
</span><del>- void setMuted(bool);
</del><ins>+ WEBCORE_EXPORT void setMuted(bool);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WEBCORE_EXPORT void initGroup();
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175350 => 175351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-10-29 22:43:47 UTC (rev 175350)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-29 22:59:15 UTC (rev 175351)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-10-28 Ada Chan <adachan@apple.com>
+
+ Implement WKPageSetMuted(bool).
+ https://bugs.webkit.org/show_bug.cgi?id=138158
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetMuted):
+ * UIProcess/API/C/WKPagePrivate.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::setMuted):
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setMuted):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
</ins><span class="cx"> 2014-10-29 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Clear ViewSnapshots when back/forward list items are removed from their list
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (175350 => 175351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-10-29 22:43:47 UTC (rev 175350)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-10-29 22:59:15 UTC (rev 175351)
</span><span class="lines">@@ -1806,6 +1806,11 @@
</span><span class="cx"> toImpl(page)->setMediaVolume(volume);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKPageSetMuted(WKPageRef page, bool muted)
+{
+ toImpl(page)->setMuted(muted);
+}
+
</ins><span class="cx"> void WKPagePostMessageToInjectedBundle(WKPageRef pageRef, WKStringRef messageNameRef, WKTypeRef messageBodyRef)
</span><span class="cx"> {
</span><span class="cx"> toImpl(pageRef)->postMessageToInjectedBundle(toImpl(messageNameRef)->string(), toImpl(messageBodyRef));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h (175350 => 175351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2014-10-29 22:43:47 UTC (rev 175350)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2014-10-29 22:59:15 UTC (rev 175351)
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx"> WK_EXPORT void WKPageSetAddsVisitedLinks(WKPageRef page, bool visitedLinks);
</span><span class="cx">
</span><span class="cx"> WK_EXPORT bool WKPageIsPlayingAudio(WKPageRef page);
</span><ins>+WK_EXPORT void WKPageSetMuted(WKPageRef page, bool muted);
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (175350 => 175351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-10-29 22:43:47 UTC (rev 175350)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-10-29 22:59:15 UTC (rev 175351)
</span><span class="lines">@@ -3383,6 +3383,14 @@
</span><span class="cx"> m_process->send(Messages::WebPage::SetMediaVolume(volume), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::setMuted(bool muted)
+{
+ if (!isValid())
+ return;
+
+ m_process->send(Messages::WebPage::SetMuted(muted), m_pageID);
+}
+
</ins><span class="cx"> void WebPageProxy::setMayStartMediaWhenInWindow(bool mayStartMedia)
</span><span class="cx"> {
</span><span class="cx"> if (mayStartMedia == m_mayStartMediaWhenInWindow)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (175350 => 175351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-10-29 22:43:47 UTC (rev 175350)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-10-29 22:59:15 UTC (rev 175351)
</span><span class="lines">@@ -837,6 +837,7 @@
</span><span class="cx"> void printMainFrame();
</span><span class="cx">
</span><span class="cx"> void setMediaVolume(float);
</span><ins>+ void setMuted(bool);
</ins><span class="cx"> void setMayStartMediaWhenInWindow(bool);
</span><span class="cx"> bool mayStartMediaWhenInWindow() const { return m_mayStartMediaWhenInWindow; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (175350 => 175351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-10-29 22:43:47 UTC (rev 175350)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-10-29 22:59:15 UTC (rev 175351)
</span><span class="lines">@@ -3914,6 +3914,11 @@
</span><span class="cx"> m_page->setMediaVolume(volume);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPage::setMuted(bool muted)
+{
+ m_page->setMuted(muted);
+}
+
</ins><span class="cx"> void WebPage::setMayStartMediaWhenInWindow(bool mayStartMedia)
</span><span class="cx"> {
</span><span class="cx"> if (mayStartMedia == m_mayStartMediaWhenInWindow)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (175350 => 175351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-10-29 22:43:47 UTC (rev 175350)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-10-29 22:59:15 UTC (rev 175351)
</span><span class="lines">@@ -701,6 +701,7 @@
</span><span class="cx"> void removeResourceRequest(unsigned long);
</span><span class="cx">
</span><span class="cx"> void setMediaVolume(float);
</span><ins>+ void setMuted(bool);
</ins><span class="cx"> void setMayStartMediaWhenInWindow(bool);
</span><span class="cx">
</span><span class="cx"> void updateMainFrameScrollOffsetPinning();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (175350 => 175351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-10-29 22:43:47 UTC (rev 175350)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-10-29 22:59:15 UTC (rev 175351)
</span><span class="lines">@@ -287,6 +287,7 @@
</span><span class="cx">
</span><span class="cx"> # Media
</span><span class="cx"> SetMediaVolume(float volume)
</span><ins>+ SetMuted(bool muted)
</ins><span class="cx"> SetMayStartMediaWhenInWindow(bool mayStartMedia)
</span><span class="cx">
</span><span class="cx"> // FIXME: This a dummy message, to avoid breaking the build for platforms that don't require
</span></span></pre>
</div>
</div>
</body>
</html>