| Index: Source/modules/mediasource/MediaSource.cpp
|
| diff --git a/Source/modules/mediasource/MediaSource.cpp b/Source/modules/mediasource/MediaSource.cpp
|
| index 091985ba36f60bf8abae51a9fabdfdf56c07de9c..50444b6bd6b48a2a5f0e3c1fa47efb492feb4d1e 100644
|
| --- a/Source/modules/mediasource/MediaSource.cpp
|
| +++ b/Source/modules/mediasource/MediaSource.cpp
|
| @@ -70,7 +70,7 @@ MediaSource::~MediaSource()
|
| ASSERT(isClosed());
|
| }
|
|
|
| -SourceBuffer* MediaSource::addSourceBuffer(const String& type, ExceptionState& es)
|
| +SourceBuffer* MediaSource::addSourceBuffer(const String& type, ExceptionState& exceptionState)
|
| {
|
| LOG(Media, "MediaSource::addSourceBuffer(%s) %p", type.ascii().data(), this);
|
|
|
| @@ -78,31 +78,31 @@ SourceBuffer* MediaSource::addSourceBuffer(const String& type, ExceptionState& e
|
| // 1. If type is null or an empty then throw an InvalidAccessError exception and
|
| // abort these steps.
|
| if (type.isNull() || type.isEmpty()) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidAccessError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidAccessError);
|
| return 0;
|
| }
|
|
|
| // 2. If type contains a MIME type that is not supported ..., then throw a
|
| // NotSupportedError exception and abort these steps.
|
| if (!isTypeSupported(type)) {
|
| - es.throwUninformativeAndGenericDOMException(NotSupportedError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(NotSupportedError);
|
| return 0;
|
| }
|
|
|
| // 4. If the readyState attribute is not in the "open" state then throw an
|
| // InvalidStateError exception and abort these steps.
|
| if (!isOpen()) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidStateError);
|
| return 0;
|
| }
|
|
|
| // 5. Create a new SourceBuffer object and associated resources.
|
| ContentType contentType(type);
|
| Vector<String> codecs = contentType.codecs();
|
| - OwnPtr<WebSourceBuffer> webSourceBuffer = createWebSourceBuffer(contentType.type(), codecs, es);
|
| + OwnPtr<WebSourceBuffer> webSourceBuffer = createWebSourceBuffer(contentType.type(), codecs, exceptionState);
|
|
|
| if (!webSourceBuffer) {
|
| - ASSERT(es.code() == NotSupportedError || es.code() == QuotaExceededError);
|
| + ASSERT(exceptionState.code() == NotSupportedError || exceptionState.code() == QuotaExceededError);
|
| // 2. If type contains a MIME type that is not supported ..., then throw a NotSupportedError exception and abort these steps.
|
| // 3. If the user agent can't handle any more SourceBuffer objects then throw a QuotaExceededError exception and abort these steps
|
| return 0;
|
| @@ -116,7 +116,7 @@ SourceBuffer* MediaSource::addSourceBuffer(const String& type, ExceptionState& e
|
| return buffer.get();
|
| }
|
|
|
| -void MediaSource::removeSourceBuffer(SourceBuffer* buffer, ExceptionState& es)
|
| +void MediaSource::removeSourceBuffer(SourceBuffer* buffer, ExceptionState& exceptionState)
|
| {
|
| LOG(Media, "MediaSource::removeSourceBuffer() %p", this);
|
| RefPtr<SourceBuffer> protect(buffer);
|
| @@ -125,14 +125,14 @@ void MediaSource::removeSourceBuffer(SourceBuffer* buffer, ExceptionState& es)
|
| // 1. If sourceBuffer is null then throw an InvalidAccessError exception and
|
| // abort these steps.
|
| if (!buffer) {
|
| - es.throwUninformativeAndGenericDOMException(InvalidAccessError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(InvalidAccessError);
|
| return;
|
| }
|
|
|
| // 2. If sourceBuffer specifies an object that is not in sourceBuffers then
|
| // throw a NotFoundError exception and abort these steps.
|
| if (!m_sourceBuffers->length() || !m_sourceBuffers->contains(buffer)) {
|
| - es.throwUninformativeAndGenericDOMException(NotFoundError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(NotFoundError);
|
| return;
|
| }
|
|
|
|
|