Title: [207898] trunk/Source/WebKit2
- Revision
- 207898
- Author
- [email protected]
- Date
- 2016-10-26 08:08:45 -0700 (Wed, 26 Oct 2016)
Log Message
[MediaStream] Add "has capture device" bit to media state flags
https://bugs.webkit.org/show_bug.cgi?id=163952
Unreviewed fix after r207839.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setMuted): Take an MutedStateFlags, not a bool.
* WebProcess/WebPage/WebPage.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (207897 => 207898)
--- trunk/Source/WebKit2/ChangeLog 2016-10-26 14:49:48 UTC (rev 207897)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-26 15:08:45 UTC (rev 207898)
@@ -1,3 +1,14 @@
+2016-10-26 Eric Carlson <[email protected]>
+
+ [MediaStream] Add "has capture device" bit to media state flags
+ https://bugs.webkit.org/show_bug.cgi?id=163952
+
+ Unreviewed fix after r207839.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setMuted): Take an MutedStateFlags, not a bool.
+ * WebProcess/WebPage/WebPage.h:
+
2016-10-26 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.15.1 release.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (207897 => 207898)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-26 14:49:48 UTC (rev 207897)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-26 15:08:45 UTC (rev 207898)
@@ -4389,9 +4389,9 @@
m_page->setMediaVolume(volume);
}
-void WebPage::setMuted(bool muted)
+void WebPage::setMuted(MediaProducer::MutedStateFlags state)
{
- m_page->setMuted(muted);
+ m_page->setMuted(state);
}
#if ENABLE(MEDIA_SESSION)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (207897 => 207898)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-10-26 14:49:48 UTC (rev 207897)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-10-26 15:08:45 UTC (rev 207898)
@@ -764,7 +764,7 @@
void removeResourceRequest(unsigned long);
void setMediaVolume(float);
- void setMuted(bool);
+ void setMuted(WebCore::MediaProducer::MutedStateFlags);
void setMayStartMediaWhenInWindow(bool);
#if ENABLE(MEDIA_SESSION)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
