Title: [117102] trunk
- Revision
- 117102
- Author
- [email protected]
- Date
- 2012-05-15 11:15:42 -0700 (Tue, 15 May 2012)
Log Message
MediaStream API: Setting onended on a LocalMediaStream triggers an assertion in V8
https://bugs.webkit.org/show_bug.cgi?id=86459
Reviewed by Adam Barth.
Source/WebCore:
LocalMediaStream inherits from MediaStream, but only MediaStream have the
EventTarget idl attribute. Adding the attribute to LocalMediaStream as well fixes the issue.
Test: fast/mediastream/LocalMediaStream-onended.html
* Modules/mediastream/LocalMediaStream.idl:
LayoutTests:
* fast/mediastream/LocalMediaStream-onended-expected.txt: Added.
* fast/mediastream/LocalMediaStream-onended.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (117101 => 117102)
--- trunk/LayoutTests/ChangeLog 2012-05-15 18:14:12 UTC (rev 117101)
+++ trunk/LayoutTests/ChangeLog 2012-05-15 18:15:42 UTC (rev 117102)
@@ -1,3 +1,13 @@
+2012-05-15 Tommy Widenflycht <[email protected]>
+
+ MediaStream API: Setting onended on a LocalMediaStream triggers an assertion in V8
+ https://bugs.webkit.org/show_bug.cgi?id=86459
+
+ Reviewed by Adam Barth.
+
+ * fast/mediastream/LocalMediaStream-onended-expected.txt: Added.
+ * fast/mediastream/LocalMediaStream-onended.html: Added.
+
2012-05-15 Brady Eidson <[email protected]>
Skip a webarchive test I added that fails on WK2.
Added: trunk/LayoutTests/fast/mediastream/LocalMediaStream-onended-expected.txt (0 => 117102)
--- trunk/LayoutTests/fast/mediastream/LocalMediaStream-onended-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/mediastream/LocalMediaStream-onended-expected.txt 2012-05-15 18:15:42 UTC (rev 117102)
@@ -0,0 +1,10 @@
+Tests LocalMediaStream::onended callback.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS streamEnded was called.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/fast/mediastream/LocalMediaStream-onended.html (0 => 117102)
--- trunk/LayoutTests/fast/mediastream/LocalMediaStream-onended.html (rev 0)
+++ trunk/LayoutTests/fast/mediastream/LocalMediaStream-onended.html 2012-05-15 18:15:42 UTC (rev 117102)
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href=""
+<script src=""
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script>
+description("Tests LocalMediaStream::onended callback.");
+
+function error() {
+ testFailed('Stream generation failed.');
+ finishJSTest();
+}
+
+function getUserMedia(dictionary, callback) {
+ try {
+ navigator.webkitGetUserMedia(dictionary, callback, error);
+ } catch (e) {
+ testFailed('webkitGetUserMedia threw exception :' + e);
+ finishJSTest();
+ }
+}
+
+function streamEnded() {
+ testPassed('streamEnded was called.');
+ finishJSTest();
+}
+
+function gotStream(s) {
+ stream = s;
+ try {
+ stream._onended_ = streamEnded;
+ stream.stop();
+ } catch (e) {
+ testFailed('LocalMediaStream threw exception :' + e);
+ finishJSTest();
+ }
+}
+
+getUserMedia({audio:true, video:true}, gotStream);
+
+window.jsTestIsAsync = true;
+window.successfullyParsed = true;
+</script>
+<script src=""
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (117101 => 117102)
--- trunk/Source/WebCore/ChangeLog 2012-05-15 18:14:12 UTC (rev 117101)
+++ trunk/Source/WebCore/ChangeLog 2012-05-15 18:15:42 UTC (rev 117102)
@@ -1,3 +1,17 @@
+2012-05-15 Tommy Widenflycht <[email protected]>
+
+ MediaStream API: Setting onended on a LocalMediaStream triggers an assertion in V8
+ https://bugs.webkit.org/show_bug.cgi?id=86459
+
+ Reviewed by Adam Barth.
+
+ LocalMediaStream inherits from MediaStream, but only MediaStream have the
+ EventTarget idl attribute. Adding the attribute to LocalMediaStream as well fixes the issue.
+
+ Test: fast/mediastream/LocalMediaStream-onended.html
+
+ * Modules/mediastream/LocalMediaStream.idl:
+
2012-05-15 Terry Anderson <[email protected]>
[chromium] Remove unused code for tap target fuzzing
Modified: trunk/Source/WebCore/Modules/mediastream/LocalMediaStream.idl (117101 => 117102)
--- trunk/Source/WebCore/Modules/mediastream/LocalMediaStream.idl 2012-05-15 18:14:12 UTC (rev 117101)
+++ trunk/Source/WebCore/Modules/mediastream/LocalMediaStream.idl 2012-05-15 18:15:42 UTC (rev 117102)
@@ -26,6 +26,7 @@
interface [
Conditional=MEDIA_STREAM,
+ EventTarget,
JSGenerateToNativeObject,
JSGenerateToJSObject
] LocalMediaStream : MediaStream {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
