Diff
Modified: trunk/LayoutTests/ChangeLog (170917 => 170918)
--- trunk/LayoutTests/ChangeLog 2014-07-09 15:49:08 UTC (rev 170917)
+++ trunk/LayoutTests/ChangeLog 2014-07-09 16:29:32 UTC (rev 170918)
@@ -1,3 +1,16 @@
+2014-07-09 Jer Noble <jer.no...@apple.com>
+
+ [MSE] http/tests/media/media-source/mediasource-endofstream-invaliderror.html is failing.
+ https://bugs.webkit.org/show_bug.cgi?id=134413
+
+ Reviewed by Eric Carlson.
+
+ Fix an inadevntant editing error in mediasource-endofstream-invaliderror.html, and fix missing
+ whitespace at the end of http/tests/media/media-source/mediasource-endofstream-invaliderror-expected.txt.
+
+ * http/tests/media/media-source/mediasource-endofstream-invaliderror-expected.txt:
+ * http/tests/media/media-source/mediasource-endofstream-invaliderror.html:
+
2014-07-09 Carlos Alberto Lopez Perez <clo...@igalia.com>
[GTK] Unreviewed GTK gardening.
Modified: trunk/LayoutTests/http/tests/media/media-source/mediasource-endofstream-invaliderror-expected.txt (170917 => 170918)
--- trunk/LayoutTests/http/tests/media/media-source/mediasource-endofstream-invaliderror-expected.txt 2014-07-09 15:49:08 UTC (rev 170917)
+++ trunk/LayoutTests/http/tests/media/media-source/mediasource-endofstream-invaliderror-expected.txt 2014-07-09 16:29:32 UTC (rev 170918)
@@ -2,3 +2,4 @@
PASS Test MediaSource.endOfStream() with invalid non-empty error string.
PASS Test MediaSource.endOfStream() with invalid empty error string.
PASS Test MediaSource.endOfStream() with invalid null error parameter.
+
Modified: trunk/LayoutTests/http/tests/media/media-source/mediasource-endofstream-invaliderror.html (170917 => 170918)
--- trunk/LayoutTests/http/tests/media/media-source/mediasource-endofstream-invaliderror.html 2014-07-09 15:49:08 UTC (rev 170917)
+++ trunk/LayoutTests/http/tests/media/media-source/mediasource-endofstream-invaliderror.html 2014-07-09 16:29:32 UTC (rev 170918)
@@ -30,7 +30,7 @@
function() { mediaSource.endOfStream(''); },
'endOfStream(\'\') throws TypeError');
- assert_equals(mediaSource.readyState, 'open');a
+ assert_equals(mediaSource.readyState, 'open');
test.done();
}, 'Test MediaSource.endOfStream() with invalid empty error string.');
Modified: trunk/Source/WebCore/ChangeLog (170917 => 170918)
--- trunk/Source/WebCore/ChangeLog 2014-07-09 15:49:08 UTC (rev 170917)
+++ trunk/Source/WebCore/ChangeLog 2014-07-09 16:29:32 UTC (rev 170918)
@@ -1,3 +1,17 @@
+2014-07-09 Jer Noble <jer.no...@apple.com>
+
+ [MSE] http/tests/media/media-source/mediasource-endofstream-invaliderror.html is failing.
+ https://bugs.webkit.org/show_bug.cgi?id=134413
+
+ Reviewed by Eric Carlson.
+
+ Update MediaSource.endOfStream() to take an optional enum instead of an optional String.
+
+ * Modules/mediasource/MediaSource.cpp:
+ (WebCore::MediaSource::endOfStream):
+ * Modules/mediasource/MediaSource.h:
+ * Modules/mediasource/MediaSource.idl:
+
2014-07-08 Brady Eidson <beid...@apple.com>
DOMWindows should register themselves with the GamepadManager when they have event listeners
Modified: trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp (170917 => 170918)
--- trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2014-07-09 15:49:08 UTC (rev 170917)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2014-07-09 16:29:32 UTC (rev 170918)
@@ -307,6 +307,11 @@
return sourceBuffer->updating();
}
+void MediaSource::endOfStream(ExceptionCode& ec)
+{
+ endOfStream(emptyAtom, ec);
+}
+
void MediaSource::endOfStream(const AtomicString& error, ExceptionCode& ec)
{
// 2.2 https://dvcs.w3.org/hg/html-media/raw-file/tip/media-source/media-source.html#widl-MediaSource-endOfStream-void-EndOfStreamError-error
Modified: trunk/Source/WebCore/Modules/mediasource/MediaSource.h (170917 => 170918)
--- trunk/Source/WebCore/Modules/mediasource/MediaSource.h 2014-07-09 15:49:08 UTC (rev 170917)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSource.h 2014-07-09 16:29:32 UTC (rev 170918)
@@ -82,6 +82,7 @@
double currentTime() const;
const AtomicString& readyState() const { return m_readyState; }
void setReadyState(const AtomicString&);
+ void endOfStream(ExceptionCode&);
void endOfStream(const AtomicString& error, ExceptionCode&);
HTMLMediaElement* mediaElement() const { return m_mediaElement; }
Modified: trunk/Source/WebCore/Modules/mediasource/MediaSource.idl (170917 => 170918)
--- trunk/Source/WebCore/Modules/mediasource/MediaSource.idl 2014-07-09 15:49:08 UTC (rev 170917)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSource.idl 2014-07-09 16:29:32 UTC (rev 170918)
@@ -28,6 +28,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+enum EndOfStreamError {
+ "network",
+ "decode"
+};
+
[
Conditional=MEDIA_SOURCE,
ActiveDOMObject,
@@ -51,7 +56,7 @@
readonly attribute DOMString readyState;
- [RaisesException] void endOfStream([Default=NullString] optional DOMString error);
+ [RaisesException] void endOfStream(optional EndOfStreamError error);
static boolean isTypeSupported (DOMString type);
};
