Title: [207828] trunk/Source/WebKit2
- Revision
- 207828
- Author
- [email protected]
- Date
- 2016-10-25 11:00:59 -0700 (Tue, 25 Oct 2016)
Log Message
[MediaStream] Add "has capture device" bit to media state flags
https://bugs.webkit.org/show_bug.cgi?id=163952
Reviewed by Sam Weinig.
* UIProcess/API/C/WKPage.cpp:
(WKPageGetMediaState): Support MediaProducer::HasMediaCaptureDevice.
* UIProcess/API/C/WKPagePrivate.h: Define kWKMediaHasCaptureDevice.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (207827 => 207828)
--- trunk/Source/WebKit2/ChangeLog 2016-10-25 17:34:07 UTC (rev 207827)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-25 18:00:59 UTC (rev 207828)
@@ -1,3 +1,14 @@
+2016-10-25 Eric Carlson <[email protected]>
+
+ [MediaStream] Add "has capture device" bit to media state flags
+ https://bugs.webkit.org/show_bug.cgi?id=163952
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageGetMediaState): Support MediaProducer::HasMediaCaptureDevice.
+ * UIProcess/API/C/WKPagePrivate.h: Define kWKMediaHasCaptureDevice.
+
2016-10-25 Chris Dumez <[email protected]>
Unreviewed, rolling out r207494.
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (207827 => 207828)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-10-25 17:34:07 UTC (rev 207827)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-10-25 18:00:59 UTC (rev 207828)
@@ -2748,6 +2748,8 @@
state |= kWKMediaIsPlayingAudio;
if (coreState & WebCore::MediaProducer::IsPlayingVideo)
state |= kWKMediaIsPlayingVideo;
+ if (coreState & WebCore::MediaProducer::HasMediaCaptureDevice)
+ state |= kWKMediaHasCaptureDevice;
if (coreState & WebCore::MediaProducer::HasActiveMediaCaptureDevice)
state |= kWKMediaHasActiveCaptureDevice;
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h (207827 => 207828)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2016-10-25 17:34:07 UTC (rev 207827)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2016-10-25 18:00:59 UTC (rev 207828)
@@ -134,6 +134,7 @@
kWKMediaIsPlayingAudio = 1 << 0,
kWKMediaIsPlayingVideo = 1 << 1,
kWKMediaHasActiveCaptureDevice = 1 << 2,
+ kWKMediaHasCaptureDevice = 1 << 3,
};
typedef uint32_t WKMediaState;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
