Title: [188447] trunk/Source/WebKit2
- Revision
- 188447
- Author
- [email protected]
- Date
- 2015-08-14 01:47:38 -0700 (Fri, 14 Aug 2015)
Log Message
Unreviewed. Fix the build with !ENABLE(MEDIA_STREAM) after r188385.
* UIProcess/API/C/WKUserMediaPermissionRequest.cpp:
(WKUserMediaPermissionRequestDeviceNamesVideo):
(WKUserMediaPermissionRequestDeviceNamesAudio):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (188446 => 188447)
--- trunk/Source/WebKit2/ChangeLog 2015-08-14 08:45:07 UTC (rev 188446)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-14 08:47:38 UTC (rev 188447)
@@ -1,5 +1,13 @@
2015-08-14 Carlos Garcia Campos <[email protected]>
+ Unreviewed. Fix the build with !ENABLE(MEDIA_STREAM) after r188385.
+
+ * UIProcess/API/C/WKUserMediaPermissionRequest.cpp:
+ (WKUserMediaPermissionRequestDeviceNamesVideo):
+ (WKUserMediaPermissionRequestDeviceNamesAudio):
+
+2015-08-14 Carlos Garcia Campos <[email protected]>
+
Unreviewed. Fix GTK+ build after r188386.
* UIProcess/API/gtk/WebKitWindowProperties.cpp:
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKUserMediaPermissionRequest.cpp (188446 => 188447)
--- trunk/Source/WebKit2/UIProcess/API/C/WKUserMediaPermissionRequest.cpp 2015-08-14 08:45:07 UTC (rev 188446)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKUserMediaPermissionRequest.cpp 2015-08-14 08:47:38 UTC (rev 188447)
@@ -53,20 +53,24 @@
WKArrayRef WKUserMediaPermissionRequestDeviceNamesVideo(WKUserMediaPermissionRequestRef userMediaPermissionRef)
{
WKMutableArrayRef array = WKMutableArrayRef();
+#if ENABLE(MEDIA_STREAM)
for (auto& name : toImpl(userMediaPermissionRef)->videoDeviceUIDs()) {
String deviceName = toImpl(userMediaPermissionRef)->getDeviceNameForUID(name, WebCore::RealtimeMediaSource::Type::Video);
WKArrayAppendItem(array, toAPI(API::String::create(deviceName).ptr()));
}
+#endif
return array;
}
WKArrayRef WKUserMediaPermissionRequestDeviceNamesAudio(WKUserMediaPermissionRequestRef userMediaPermissionRef)
{
WKMutableArrayRef array = WKMutableArrayRef();
+#if ENABLE(MEDIA_STREAM)
for (auto& name : toImpl(userMediaPermissionRef)->audioDeviceUIDs()) {
String deviceName = toImpl(userMediaPermissionRef)->getDeviceNameForUID(name, WebCore::RealtimeMediaSource::Type::Audio);
WKArrayAppendItem(array, toAPI(API::String::create(deviceName).ptr()));
}
+#endif
return array;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
