Diff
Modified: trunk/LayoutTests/ChangeLog (127087 => 127088)
--- trunk/LayoutTests/ChangeLog 2012-08-30 02:58:37 UTC (rev 127087)
+++ trunk/LayoutTests/ChangeLog 2012-08-30 03:12:25 UTC (rev 127088)
@@ -1,3 +1,21 @@
+2012-08-29 Aaron Colwell <[email protected]>
+
+ Add WebKit prefix to MediaSource, SourceBuffer, & SourceBufferList DOMWindow constructor attributes.
+ https://bugs.webkit.org/show_bug.cgi?id=95247
+
+ Reviewed by Eric Carlson.
+
+ Update MediaSource tests to include the WebKit prefix on MediaSource, SourceBuffer, & SourceBufferTest objects.
+
+ * http/tests/media/media-source/media-source.js:
+ * http/tests/media/media-source/video-media-source-add-and-remove-buffers.html:
+ * http/tests/media/media-source/video-media-source-async-events.html:
+ * http/tests/media/media-source/video-media-source-event-attributes.html:
+ * http/tests/media/media-source/video-media-source-objects-expected.txt:
+ * http/tests/media/media-source/video-media-source-objects.html:
+ * http/tests/media/media-source/video-media-source-play.html:
+ * http/tests/media/media-source/video-media-source-state-changes.html:
+
2012-08-29 Dominic Mazzoni <[email protected]>
AX: Canvas should have a distinct role
Modified: trunk/LayoutTests/http/tests/media/media-source/media-source.js (127087 => 127088)
--- trunk/LayoutTests/http/tests/media/media-source/media-source.js 2012-08-30 02:58:37 UTC (rev 127087)
+++ trunk/LayoutTests/http/tests/media/media-source/media-source.js 2012-08-30 03:12:25 UTC (rev 127088)
@@ -1,5 +1,5 @@
var MediaSourceTest = {};
-var mediaSource = new MediaSource();
+var mediaSource = new WebKitMediaSource();
MediaSourceTest.SegmentHelper = function(segmentInfo)
{
Modified: trunk/LayoutTests/http/tests/media/media-source/video-media-source-add-and-remove-buffers.html (127087 => 127088)
--- trunk/LayoutTests/http/tests/media/media-source/video-media-source-add-and-remove-buffers.html 2012-08-30 02:58:37 UTC (rev 127087)
+++ trunk/LayoutTests/http/tests/media/media-source/video-media-source-add-and-remove-buffers.html 2012-08-30 03:12:25 UTC (rev 127088)
@@ -168,7 +168,7 @@
{
findMediaElement();
- mediaSource = new MediaSource();
+ mediaSource = new WebKitMediaSource();
waitForEvent('webkitsourceopen', "", false, false, mediaSource);
segmentHelper.init(video, function(success)
Modified: trunk/LayoutTests/http/tests/media/media-source/video-media-source-async-events.html (127087 => 127088)
--- trunk/LayoutTests/http/tests/media/media-source/video-media-source-async-events.html 2012-08-30 02:58:37 UTC (rev 127087)
+++ trunk/LayoutTests/http/tests/media/media-source/video-media-source-async-events.html 2012-08-30 03:12:25 UTC (rev 127088)
@@ -64,7 +64,7 @@
function main()
{
var video = document.querySelector('#v');
- var mediaSource = new MediaSource();
+ var mediaSource = new WebKitMediaSource();
mediaSource.addEventListener('webkitsourceopen', onSourceOpen);
mediaSource.addEventListener('webkitsourceended', onSourceEnded);
Modified: trunk/LayoutTests/http/tests/media/media-source/video-media-source-event-attributes.html (127087 => 127088)
--- trunk/LayoutTests/http/tests/media/media-source/video-media-source-event-attributes.html 2012-08-30 02:58:37 UTC (rev 127087)
+++ trunk/LayoutTests/http/tests/media/media-source/video-media-source-event-attributes.html 2012-08-30 03:12:25 UTC (rev 127088)
@@ -31,7 +31,7 @@
{
consoleWrite("onLoad()");
video = document.getElementById('v');
- mediaSource = new MediaSource();
+ mediaSource = new WebKitMediaSource();
mediaSource.addEventListener('webkitsourceopen', onSourceOpen);
mediaSource.addEventListener('webkitsourceended', onSourceEnded);
mediaSource.addEventListener('webkitsourceclose', onSourceClose);
Modified: trunk/LayoutTests/http/tests/media/media-source/video-media-source-objects-expected.txt (127087 => 127088)
--- trunk/LayoutTests/http/tests/media/media-source/video-media-source-objects-expected.txt 2012-08-30 02:58:37 UTC (rev 127087)
+++ trunk/LayoutTests/http/tests/media/media-source/video-media-source-objects-expected.txt 2012-08-30 03:12:25 UTC (rev 127088)
@@ -3,7 +3,7 @@
EVENT(webkitsourceopen)
Test MediaSource object type
EXPECTED (mediaSource == '[object MediaSource]') OK
-EXPECTED (mediaSource instanceof window.MediaSource == 'true') OK
+EXPECTED (mediaSource instanceof window.WebKitMediaSource == 'true') OK
Add a SourceBuffer
EXPECTED (mediaSource.sourceBuffers.length == '0') OK
@@ -12,11 +12,11 @@
Test SourceBufferList object type:
EXPECTED (mediaSource.sourceBuffers == '[object SourceBufferList]') OK
-EXPECTED (mediaSource.sourceBuffers instanceof window.SourceBufferList == 'true') OK
+EXPECTED (mediaSource.sourceBuffers instanceof window.WebKitSourceBufferList == 'true') OK
Test SourceBuffer object type
-EXPECTED (segmentHelper.sourceBuffer instanceof window.SourceBuffer == 'true') OK
-EXPECTED (mediaSource.sourceBuffers[0] instanceof window.SourceBuffer == 'true') OK
+EXPECTED (segmentHelper.sourceBuffer instanceof window.WebKitSourceBuffer == 'true') OK
+EXPECTED (mediaSource.sourceBuffers[0] instanceof window.WebKitSourceBuffer == 'true') OK
Append init segment
EXPECTED (mediaSource.sourceBuffers[0].buffered.length == '0') OK
Modified: trunk/LayoutTests/http/tests/media/media-source/video-media-source-objects.html (127087 => 127088)
--- trunk/LayoutTests/http/tests/media/media-source/video-media-source-objects.html 2012-08-30 02:58:37 UTC (rev 127087)
+++ trunk/LayoutTests/http/tests/media/media-source/video-media-source-objects.html 2012-08-30 03:12:25 UTC (rev 127088)
@@ -11,7 +11,7 @@
{
consoleWrite("Test MediaSource object type");
testExpected("mediaSource", event.target);
- testExpected("mediaSource instanceof window.MediaSource", true);
+ testExpected("mediaSource instanceof window.WebKitMediaSource", true);
consoleWrite("");
consoleWrite("Add a SourceBuffer");
@@ -27,8 +27,8 @@
{
consoleWrite("");
consoleWrite("Test SourceBuffer object type");
- testExpected("segmentHelper.sourceBuffer instanceof window.SourceBuffer", true);
- testExpected("mediaSource.sourceBuffers[0] instanceof window.SourceBuffer", true);
+ testExpected("segmentHelper.sourceBuffer instanceof window.WebKitSourceBuffer", true);
+ testExpected("mediaSource.sourceBuffers[0] instanceof window.WebKitSourceBuffer", true);
consoleWrite("");
consoleWrite("Append init segment");
@@ -72,7 +72,7 @@
function afterSourceBufferRemoved()
{
consoleWrite("Test that addSourceBuffer() throws and error when the MediaSource is not associated with a media element.");
- var mediaSource2 = new MediaSource();
+ var mediaSource2 = new WebKitMediaSource();
video.src = ""
try {
mediaSource.addSourceBuffer('video/webm; codecs="vorbis,vp8"');
@@ -97,7 +97,7 @@
consoleWrite("");
consoleWrite("Test SourceBufferList object type:");
testExpected("mediaSource.sourceBuffers", event.target);
- testExpected("mediaSource.sourceBuffers instanceof window.SourceBufferList", true);
+ testExpected("mediaSource.sourceBuffers instanceof window.WebKitSourceBufferList", true);
afterSourceBufferAdded();
}
@@ -130,7 +130,7 @@
{
findMediaElement();
- mediaSource = new MediaSource();
+ mediaSource = new WebKitMediaSource();
waitForEventAndFail('error');
waitForEvent('webkitsourceopen', "", false, false, mediaSource);
Modified: trunk/LayoutTests/http/tests/media/media-source/video-media-source-play.html (127087 => 127088)
--- trunk/LayoutTests/http/tests/media/media-source/video-media-source-play.html 2012-08-30 02:58:37 UTC (rev 127087)
+++ trunk/LayoutTests/http/tests/media/media-source/video-media-source-play.html 2012-08-30 03:12:25 UTC (rev 127088)
@@ -23,7 +23,7 @@
{
findMediaElement();
- mediaSource = new MediaSource();
+ mediaSource = new WebKitMediaSource();
waitForEventAndFail('error');
waitForEvent('webkitsourceopen', "", false, false, mediaSource);
Modified: trunk/LayoutTests/http/tests/media/media-source/video-media-source-state-changes.html (127087 => 127088)
--- trunk/LayoutTests/http/tests/media/media-source/video-media-source-state-changes.html 2012-08-30 02:58:37 UTC (rev 127087)
+++ trunk/LayoutTests/http/tests/media/media-source/video-media-source-state-changes.html 2012-08-30 03:12:25 UTC (rev 127088)
@@ -216,7 +216,7 @@
{
findMediaElement();
- mediaSource = new MediaSource();
+ mediaSource = new WebKitMediaSource();
waitForEventAndFail('error');
waitForEvent('playing');
Modified: trunk/Source/WebCore/ChangeLog (127087 => 127088)
--- trunk/Source/WebCore/ChangeLog 2012-08-30 02:58:37 UTC (rev 127087)
+++ trunk/Source/WebCore/ChangeLog 2012-08-30 03:12:25 UTC (rev 127088)
@@ -1,3 +1,16 @@
+2012-08-29 Aaron Colwell <[email protected]>
+
+ Add WebKit prefix to MediaSource, SourceBuffer, & SourceBufferList DOMWindow constructor attributes.
+ https://bugs.webkit.org/show_bug.cgi?id=95247
+
+ Reviewed by Eric Carlson.
+
+ Add WebKit prefix to MediaSource, SourceBuffer, and SourceBufferList object constructor attributes.
+
+ Covered by existing layout tests..
+
+ * page/DOMWindow.idl:
+
2012-08-29 Nate Chapin <[email protected]>
ProgressTracker never completes if iframe detached during parsing
Modified: trunk/Source/WebCore/page/DOMWindow.idl (127087 => 127088)
--- trunk/Source/WebCore/page/DOMWindow.idl 2012-08-30 02:58:37 UTC (rev 127087)
+++ trunk/Source/WebCore/page/DOMWindow.idl 2012-08-30 03:12:25 UTC (rev 127088)
@@ -786,9 +786,9 @@
attribute [Conditional=MUTATION_OBSERVERS] MutationObserverConstructor WebKitMutationObserver;
- attribute [Conditional=MEDIA_SOURCE, V8EnabledAtRuntime=mediaSource] MediaSourceConstructor MediaSource;
- attribute [Conditional=MEDIA_SOURCE, V8EnabledAtRuntime=mediaSource] SourceBufferConstructor SourceBuffer;
- attribute [Conditional=MEDIA_SOURCE, V8EnabledAtRuntime=mediaSource] SourceBufferListConstructor SourceBufferList;
+ attribute [Conditional=MEDIA_SOURCE, V8EnabledAtRuntime=mediaSource] MediaSourceConstructor WebKitMediaSource;
+ attribute [Conditional=MEDIA_SOURCE, V8EnabledAtRuntime=mediaSource] SourceBufferConstructor WebKitSourceBuffer;
+ attribute [Conditional=MEDIA_SOURCE, V8EnabledAtRuntime=mediaSource] SourceBufferListConstructor WebKitSourceBufferList;
#endif // defined(LANGUAGE_JAVASCRIPT)
