Title: [256140] releases/WebKitGTK/webkit-2.28
- Revision
- 256140
- Author
- carlo...@webkit.org
- Date
- 2020-02-10 05:24:44 -0800 (Mon, 10 Feb 2020)
Log Message
Merge r256034 - Align getDisplayMedia() with spec
https://bugs.webkit.org/show_bug.cgi?id=207191
<rdar://problem/59151017>
Reviewed by Eric Carlson.
Source/WebCore:
Update WebIDL as per spec to have the correct default values for getDisplayMedia.
Covered by updated test.
* Modules/mediastream/MediaDevices.cpp:
(WebCore::MediaDevices::getDisplayMedia):
* Modules/mediastream/MediaDevices.h:
* Modules/mediastream/MediaDevices.idl:
LayoutTests:
* fast/mediastream/screencapture-user-gesture.html:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/LayoutTests/ChangeLog (256139 => 256140)
--- releases/WebKitGTK/webkit-2.28/LayoutTests/ChangeLog 2020-02-10 13:24:39 UTC (rev 256139)
+++ releases/WebKitGTK/webkit-2.28/LayoutTests/ChangeLog 2020-02-10 13:24:44 UTC (rev 256140)
@@ -1,3 +1,13 @@
+2020-02-07 youenn fablet <you...@apple.com>
+
+ Align getDisplayMedia() with spec
+ https://bugs.webkit.org/show_bug.cgi?id=207191
+ <rdar://problem/59151017>
+
+ Reviewed by Eric Carlson.
+
+ * fast/mediastream/screencapture-user-gesture.html:
+
2020-02-07 Patrick Griffis <pgrif...@igalia.com>
[GTK][WPE] Add same-site cookie support
Modified: releases/WebKitGTK/webkit-2.28/LayoutTests/fast/mediastream/screencapture-user-gesture.html (256139 => 256140)
--- releases/WebKitGTK/webkit-2.28/LayoutTests/fast/mediastream/screencapture-user-gesture.html 2020-02-10 13:24:39 UTC (rev 256139)
+++ releases/WebKitGTK/webkit-2.28/LayoutTests/fast/mediastream/screencapture-user-gesture.html 2020-02-10 13:24:44 UTC (rev 256140)
@@ -4,7 +4,7 @@
promise_test(() => {
let promise;
internals.withUserGesture(() => {
- promise = navigator.mediaDevices.getDisplayMedia({video : true});
+ promise = navigator.mediaDevices.getDisplayMedia();
});
return promise;
}, "Allow getDisplayMedia call in case of user gesture");
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog (256139 => 256140)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog 2020-02-10 13:24:39 UTC (rev 256139)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog 2020-02-10 13:24:44 UTC (rev 256140)
@@ -1,3 +1,19 @@
+2020-02-07 youenn fablet <you...@apple.com>
+
+ Align getDisplayMedia() with spec
+ https://bugs.webkit.org/show_bug.cgi?id=207191
+ <rdar://problem/59151017>
+
+ Reviewed by Eric Carlson.
+
+ Update WebIDL as per spec to have the correct default values for getDisplayMedia.
+ Covered by updated test.
+
+ * Modules/mediastream/MediaDevices.cpp:
+ (WebCore::MediaDevices::getDisplayMedia):
+ * Modules/mediastream/MediaDevices.h:
+ * Modules/mediastream/MediaDevices.idl:
+
2020-02-07 Patrick Griffis <pgrif...@igalia.com>
[GTK][WPE] Add same-site cookie support
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/Modules/mediastream/MediaDevices.cpp (256139 => 256140)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/Modules/mediastream/MediaDevices.cpp 2020-02-10 13:24:39 UTC (rev 256139)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/Modules/mediastream/MediaDevices.cpp 2020-02-10 13:24:44 UTC (rev 256140)
@@ -139,7 +139,7 @@
request->start();
}
-void MediaDevices::getDisplayMedia(const StreamConstraints& constraints, Promise&& promise)
+void MediaDevices::getDisplayMedia(const DisplayMediaStreamConstraints& constraints, Promise&& promise)
{
auto* document = this->document();
if (!document)
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/Modules/mediastream/MediaDevices.h (256139 => 256140)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/Modules/mediastream/MediaDevices.h 2020-02-10 13:24:39 UTC (rev 256139)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/Modules/mediastream/MediaDevices.h 2020-02-10 13:24:44 UTC (rev 256140)
@@ -79,7 +79,13 @@
Variant<bool, MediaTrackConstraints> audio;
};
void getUserMedia(const StreamConstraints&, Promise&&);
- void getDisplayMedia(const StreamConstraints&, Promise&&);
+
+ struct DisplayMediaStreamConstraints {
+ Variant<bool, MediaTrackConstraints> video;
+ Variant<bool, MediaTrackConstraints> audio;
+ };
+ void getDisplayMedia(const DisplayMediaStreamConstraints&, Promise&&);
+
void enumerateDevices(EnumerateDevicesPromise&&);
MediaTrackSupportedConstraints getSupportedConstraints();
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/Modules/mediastream/MediaDevices.idl (256139 => 256140)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/Modules/mediastream/MediaDevices.idl 2020-02-10 13:24:39 UTC (rev 256139)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/Modules/mediastream/MediaDevices.idl 2020-02-10 13:24:44 UTC (rev 256140)
@@ -39,11 +39,18 @@
MediaTrackSupportedConstraints getSupportedConstraints();
[PrivateIdentifier, PublicIdentifier] Promise<MediaStream> getUserMedia(optional MediaStreamConstraints constraints);
- [EnabledAtRuntime=ScreenCapture] Promise<MediaStream> getDisplayMedia(optional MediaStreamConstraints constraints);
+ [EnabledAtRuntime=ScreenCapture] Promise<MediaStream> getDisplayMedia(optional DisplayMediaStreamConstraints constraints);
};
[
Conditional=MEDIA_STREAM,
+] dictionary DisplayMediaStreamConstraints {
+ (boolean or MediaTrackConstraints) video = true;
+ (boolean or MediaTrackConstraints) audio = false;
+};
+
+[
+ Conditional=MEDIA_STREAM,
] dictionary MediaStreamConstraints {
(boolean or MediaTrackConstraints) video = false;
(boolean or MediaTrackConstraints) audio = false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
