Diff
Modified: trunk/LayoutTests/ChangeLog (210091 => 210092)
--- trunk/LayoutTests/ChangeLog 2016-12-22 01:26:09 UTC (rev 210091)
+++ trunk/LayoutTests/ChangeLog 2016-12-22 01:41:51 UTC (rev 210092)
@@ -1,3 +1,17 @@
+2016-12-21 Eric Carlson <[email protected]>
+
+ [MediaStream] Update media-stream-event-constructor test
+ https://bugs.webkit.org/show_bug.cgi?id=166398
+
+ Reviewed by Jer Noble.
+
+ Update and rebaseline test to reflect behavior changes that happened while the test was
+ skipped. Un-skip it on macOS.
+
+ * fast/events/constructors/media-stream-event-constructor-expected.txt:
+ * fast/events/constructors/media-stream-event-constructor.html:
+ * platform/mac/TestExpectations:
+
2016-12-21 John Wilander <[email protected]>
Switch to a blacklist model for restricted Accept headers in simple CORS requests
Modified: trunk/LayoutTests/fast/events/constructors/media-stream-event-constructor-expected.txt (210091 => 210092)
--- trunk/LayoutTests/fast/events/constructors/media-stream-event-constructor-expected.txt 2016-12-22 01:26:09 UTC (rev 210091)
+++ trunk/LayoutTests/fast/events/constructors/media-stream-event-constructor-expected.txt 2016-12-22 01:41:51 UTC (rev 210092)
@@ -11,19 +11,19 @@
PASS new MediaStreamEvent('eventType', { cancelable: false }).cancelable is false
PASS new MediaStreamEvent('eventType', { cancelable: true }).cancelable is true
PASS new MediaStreamEvent('eventType', { stream: mediaStream }).stream is mediaStream
-PASS new MediaStreamEvent('eventType', { stream: testObject }).stream is null
-PASS new MediaStreamEvent('eventType', { stream: document }).stream is null
+PASS new MediaStreamEvent('eventType', { stream: testObject }).stream threw exception TypeError: Type error.
+PASS new MediaStreamEvent('eventType', { stream: document }).stream threw exception TypeError: Type error.
PASS new MediaStreamEvent('eventType', { stream: undefined }).stream is null
PASS new MediaStreamEvent('eventType', { stream: null }).stream is null
-PASS new MediaStreamEvent('eventType', { stream: false }).stream is null
-PASS new MediaStreamEvent('eventType', { stream: true }).stream is null
-PASS new MediaStreamEvent('eventType', { stream: '' }).stream is null
-PASS new MediaStreamEvent('eventType', { stream: 'chocolate' }).stream is null
-PASS new MediaStreamEvent('eventType', { stream: 12345 }).stream is null
-PASS new MediaStreamEvent('eventType', { stream: 18446744073709551615 }).stream is null
-PASS new MediaStreamEvent('eventType', { stream: NaN }).stream is null
-PASS new MediaStreamEvent('eventType', { stream: {valueOf: function () { return mediaStream; } } }).stream == mediaStream is false
-PASS new MediaStreamEvent('eventType', { get stream() { return 123; } }).stream is null
+PASS new MediaStreamEvent('eventType', { stream: false }).stream threw exception TypeError: Type error.
+PASS new MediaStreamEvent('eventType', { stream: true }).stream threw exception TypeError: Type error.
+PASS new MediaStreamEvent('eventType', { stream: '' }).stream threw exception TypeError: Type error.
+PASS new MediaStreamEvent('eventType', { stream: 'chocolate' }).stream threw exception TypeError: Type error.
+PASS new MediaStreamEvent('eventType', { stream: 12345 }).stream threw exception TypeError: Type error.
+PASS new MediaStreamEvent('eventType', { stream: 18446744073709551615 }).stream threw exception TypeError: Type error.
+PASS new MediaStreamEvent('eventType', { stream: NaN }).stream threw exception TypeError: Type error.
+PASS new MediaStreamEvent('eventType', { stream: {valueOf: function () { return mediaStream; } } }).stream threw exception TypeError: Type error.
+PASS new MediaStreamEvent('eventType', { get stream() { return 123; } }).stream threw exception TypeError: Type error.
PASS new MediaStreamEvent('eventType', { get stream() { throw 'MediaStreamEvent Error'; } }) threw exception MediaStreamEvent Error.
PASS new MediaStreamEvent('eventType', { bubbles: true, cancelable: true, stream: mediaStream }).bubbles is true
PASS new MediaStreamEvent('eventType', { bubbles: true, cancelable: true, stream: mediaStream }).cancelable is true
Modified: trunk/LayoutTests/fast/events/constructors/media-stream-event-constructor.html (210091 => 210092)
--- trunk/LayoutTests/fast/events/constructors/media-stream-event-constructor.html 2016-12-22 01:26:09 UTC (rev 210091)
+++ trunk/LayoutTests/fast/events/constructors/media-stream-event-constructor.html 2016-12-22 01:41:51 UTC (rev 210092)
@@ -29,20 +29,20 @@
shouldBe("new MediaStreamEvent('eventType', { stream: mediaStream }).stream", "mediaStream");
// Invalid objects.
-shouldBe("new MediaStreamEvent('eventType', { stream: testObject }).stream", "null");
-shouldBe("new MediaStreamEvent('eventType', { stream: document }).stream", "null");
+shouldThrowErrorName("new MediaStreamEvent('eventType', { stream: testObject }).stream", "TypeError");
+shouldThrowErrorName("new MediaStreamEvent('eventType', { stream: document }).stream", "TypeError");
shouldBe("new MediaStreamEvent('eventType', { stream: undefined }).stream", "null");
shouldBe("new MediaStreamEvent('eventType', { stream: null }).stream", "null");
-shouldBe("new MediaStreamEvent('eventType', { stream: false }).stream", "null");
-shouldBe("new MediaStreamEvent('eventType', { stream: true }).stream", "null");
-shouldBe("new MediaStreamEvent('eventType', { stream: '' }).stream", "null");
-shouldBe("new MediaStreamEvent('eventType', { stream: 'chocolate' }).stream", "null");
-shouldBe("new MediaStreamEvent('eventType', { stream: 12345 }).stream", "null");
-shouldBe("new MediaStreamEvent('eventType', { stream: 18446744073709551615 }).stream", "null");
-shouldBe("new MediaStreamEvent('eventType', { stream: NaN }).stream", "null");
+shouldThrowErrorName("new MediaStreamEvent('eventType', { stream: false }).stream", "TypeError");
+shouldThrowErrorName("new MediaStreamEvent('eventType', { stream: true }).stream", "TypeError");
+shouldThrowErrorName("new MediaStreamEvent('eventType', { stream: '' }).stream", "TypeError");
+shouldThrowErrorName("new MediaStreamEvent('eventType', { stream: 'chocolate' }).stream", "TypeError");
+shouldThrowErrorName("new MediaStreamEvent('eventType', { stream: 12345 }).stream", "TypeError");
+shouldThrowErrorName("new MediaStreamEvent('eventType', { stream: 18446744073709551615 }).stream", "TypeError");
+shouldThrowErrorName("new MediaStreamEvent('eventType', { stream: NaN }).stream", "TypeError");
// Note that valueOf() is not called, when the left hand side is evaluated.
-shouldBeFalse("new MediaStreamEvent('eventType', { stream: {valueOf: function () { return mediaStream; } } }).stream == mediaStream");
-shouldBe("new MediaStreamEvent('eventType', { get stream() { return 123; } }).stream", "null");
+shouldThrowErrorName("new MediaStreamEvent('eventType', { stream: {valueOf: function () { return mediaStream; } } }).stream", "TypeError");
+shouldThrowErrorName("new MediaStreamEvent('eventType', { get stream() { return 123; } }).stream", "TypeError");
shouldThrow("new MediaStreamEvent('eventType', { get stream() { throw 'MediaStreamEvent Error'; } })");
// All initializers are passed.
Modified: trunk/LayoutTests/platform/mac/TestExpectations (210091 => 210092)
--- trunk/LayoutTests/platform/mac/TestExpectations 2016-12-22 01:26:09 UTC (rev 210091)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-12-22 01:41:51 UTC (rev 210092)
@@ -162,7 +162,6 @@
fast/mediastream/MediaStreamTrack.html
# WebRTC is not supported yet.
-fast/events/constructors/media-stream-event-constructor.html
fast/mediastream/RTCPeerConnection-dtmf.html [ Skip ]
fast/mediastream/RTCPeerConnection-events.html [ Skip ]
fast/mediastream/RTCPeerConnection-ice.html [ Skip ]
Modified: trunk/Source/WebCore/ChangeLog (210091 => 210092)
--- trunk/Source/WebCore/ChangeLog 2016-12-22 01:26:09 UTC (rev 210091)
+++ trunk/Source/WebCore/ChangeLog 2016-12-22 01:41:51 UTC (rev 210092)
@@ -1,3 +1,14 @@
+2016-12-21 Eric Carlson <[email protected]>
+
+ [MediaStream] Update media-stream-event-constructor test
+ https://bugs.webkit.org/show_bug.cgi?id=166398
+
+ Reviewed by Jer Noble.
+
+ No new tests, updated existing test.
+
+ * Modules/mediastream/MediaStreamEvent.idl: Mark eventInitDict as optional.
+
2016-12-21 Jiewen Tan <[email protected]>
WebKit should set Original URL of a download request correctly
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamEvent.idl (210091 => 210092)
--- trunk/Source/WebCore/Modules/mediastream/MediaStreamEvent.idl 2016-12-22 01:26:09 UTC (rev 210091)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamEvent.idl 2016-12-22 01:41:51 UTC (rev 210092)
@@ -24,7 +24,7 @@
[
Conditional=WEB_RTC,
- Constructor(DOMString type, MediaStreamEventInit eventInitDict),
+ Constructor(DOMString type, optional MediaStreamEventInit eventInitDict),
EnabledAtRuntime=mediaStream,
] interface MediaStreamEvent : Event {
readonly attribute MediaStream? stream;
