Diff
Modified: trunk/Source/WebCore/ChangeLog (175350 => 175351)
--- 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)
@@ -1,3 +1,13 @@
+2014-10-28 Ada Chan <[email protected]>
+
+ Implement WKPageSetMuted(bool).
+ https://bugs.webkit.org/show_bug.cgi?id=138158
+
+ Reviewed by Anders Carlsson.
+
+ * WebCore.exp.in:
+ * page/Page.h:
+
2014-10-29 Alexey Proskuryakov <[email protected]>
Notify Settings object when its Page object goes away.
Modified: trunk/Source/WebCore/WebCore.exp.in (175350 => 175351)
--- 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)
@@ -1172,6 +1172,7 @@
__ZN7WebCore4Page36suspendActiveDOMObjectsAndAnimationsEv
__ZN7WebCore4Page37setInLowQualityImageInterpolationModeEb
__ZN7WebCore4Page8goToItemEPNS_11HistoryItemENS_13FrameLoadTypeE
+__ZN7WebCore4Page8setMutedEb
__ZN7WebCore4Page9initGroupEv
__ZN7WebCore4PageC1ERNS0_11PageClientsE
__ZN7WebCore4PageD1Ev
Modified: trunk/Source/WebCore/page/Page.h (175350 => 175351)
--- 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)
@@ -438,7 +438,7 @@
bool isPlayingAudio() const { return m_isPlayingAudio; }
void updateIsPlayingAudio();
- void setMuted(bool);
+ WEBCORE_EXPORT void setMuted(bool);
private:
WEBCORE_EXPORT void initGroup();
Modified: trunk/Source/WebKit2/ChangeLog (175350 => 175351)
--- 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)
@@ -1,3 +1,21 @@
+2014-10-28 Ada Chan <[email protected]>
+
+ 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:
+
2014-10-29 Anders Carlsson <[email protected]>
Clear ViewSnapshots when back/forward list items are removed from their list
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (175350 => 175351)
--- 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)
@@ -1806,6 +1806,11 @@
toImpl(page)->setMediaVolume(volume);
}
+void WKPageSetMuted(WKPageRef page, bool muted)
+{
+ toImpl(page)->setMuted(muted);
+}
+
void WKPagePostMessageToInjectedBundle(WKPageRef pageRef, WKStringRef messageNameRef, WKTypeRef messageBodyRef)
{
toImpl(pageRef)->postMessageToInjectedBundle(toImpl(messageNameRef)->string(), toImpl(messageBodyRef));
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h (175350 => 175351)
--- 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)
@@ -109,6 +109,7 @@
WK_EXPORT void WKPageSetAddsVisitedLinks(WKPageRef page, bool visitedLinks);
WK_EXPORT bool WKPageIsPlayingAudio(WKPageRef page);
+WK_EXPORT void WKPageSetMuted(WKPageRef page, bool muted);
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (175350 => 175351)
--- 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)
@@ -3383,6 +3383,14 @@
m_process->send(Messages::WebPage::SetMediaVolume(volume), m_pageID);
}
+void WebPageProxy::setMuted(bool muted)
+{
+ if (!isValid())
+ return;
+
+ m_process->send(Messages::WebPage::SetMuted(muted), m_pageID);
+}
+
void WebPageProxy::setMayStartMediaWhenInWindow(bool mayStartMedia)
{
if (mayStartMedia == m_mayStartMediaWhenInWindow)
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (175350 => 175351)
--- 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)
@@ -837,6 +837,7 @@
void printMainFrame();
void setMediaVolume(float);
+ void setMuted(bool);
void setMayStartMediaWhenInWindow(bool);
bool mayStartMediaWhenInWindow() const { return m_mayStartMediaWhenInWindow; }
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (175350 => 175351)
--- 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)
@@ -3914,6 +3914,11 @@
m_page->setMediaVolume(volume);
}
+void WebPage::setMuted(bool muted)
+{
+ m_page->setMuted(muted);
+}
+
void WebPage::setMayStartMediaWhenInWindow(bool mayStartMedia)
{
if (mayStartMedia == m_mayStartMediaWhenInWindow)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (175350 => 175351)
--- 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)
@@ -701,6 +701,7 @@
void removeResourceRequest(unsigned long);
void setMediaVolume(float);
+ void setMuted(bool);
void setMayStartMediaWhenInWindow(bool);
void updateMainFrameScrollOffsetPinning();
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (175350 => 175351)
--- 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)
@@ -287,6 +287,7 @@
# Media
SetMediaVolume(float volume)
+ SetMuted(bool muted)
SetMayStartMediaWhenInWindow(bool mayStartMedia)
// FIXME: This a dummy message, to avoid breaking the build for platforms that don't require
