Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1568)

Unified Diff: Source/modules/mediasource/MediaSourceBase.cpp

Issue 19724003: Revert "Transition modules/** to use ExceptionState" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/mediasource/MediaSourceBase.h ('k') | Source/modules/mediasource/SourceBuffer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/mediasource/MediaSourceBase.cpp
diff --git a/Source/modules/mediasource/MediaSourceBase.cpp b/Source/modules/mediasource/MediaSourceBase.cpp
index faf5f22fa4bbb791948db22b6e57ca514125d25b..c983d8aeed89d5015ff416f89bb6148b9d83c13b 100644
--- a/Source/modules/mediasource/MediaSourceBase.cpp
+++ b/Source/modules/mediasource/MediaSourceBase.cpp
@@ -31,10 +31,9 @@
#include "config.h"
#include "modules/mediasource/MediaSourceBase.h"
-#include "bindings/v8/ExceptionState.h"
-#include "bindings/v8/ExceptionStatePlaceholder.h"
#include "core/dom/Event.h"
#include "core/dom/ExceptionCode.h"
+#include "core/dom/ExceptionCodePlaceholder.h"
#include "core/dom/GenericEventQueue.h"
#include "core/platform/Logging.h"
#include "core/platform/graphics/SourceBufferPrivate.h"
@@ -113,7 +112,7 @@ PassRefPtr<TimeRanges> MediaSourceBase::buffered() const
for (size_t i = 0; i < ranges.size(); ++i) {
unsigned length = ranges[i]->length();
if (length)
- highestEndTime = std::max(highestEndTime, ranges[i]->end(length - 1, ASSERT_NO_EXCEPTION_STATE));
+ highestEndTime = std::max(highestEndTime, ranges[i]->end(length - 1, ASSERT_NO_EXCEPTION));
}
// Return an empty range if all ranges are empty.
@@ -131,7 +130,7 @@ PassRefPtr<TimeRanges> MediaSourceBase::buffered() const
// 5.2 If readyState is "ended", then set the end time on the last range in source ranges to highest end time.
if (ended && sourceRanges->length())
- sourceRanges->add(sourceRanges->start(sourceRanges->length() - 1, ASSERT_NO_EXCEPTION_STATE), highestEndTime);
+ sourceRanges->add(sourceRanges->start(sourceRanges->length() - 1, ASSERT_NO_EXCEPTION), highestEndTime);
// 5.3 Let new intersection ranges equal the the intersection between the intersection ranges and the source ranges.
// 5.4 Replace the ranges in intersection ranges with the new intersection ranges.
@@ -141,14 +140,14 @@ PassRefPtr<TimeRanges> MediaSourceBase::buffered() const
return intersectionRanges.release();
}
-void MediaSourceBase::setDuration(double duration, ExceptionState& es)
+void MediaSourceBase::setDuration(double duration, ExceptionCode& ec)
{
if (duration < 0.0 || std::isnan(duration)) {
- es.throwDOMException(InvalidAccessError);
+ ec = InvalidAccessError;
return;
}
if (!isOpen()) {
- es.throwDOMException(InvalidStateError);
+ ec = InvalidStateError;
return;
}
m_private->setDuration(duration);
@@ -175,7 +174,7 @@ void MediaSourceBase::setReadyState(const AtomicString& state)
onReadyStateChange(oldState, state);
}
-void MediaSourceBase::endOfStream(const AtomicString& error, ExceptionState& es)
+void MediaSourceBase::endOfStream(const AtomicString& error, ExceptionCode& ec)
{
DEFINE_STATIC_LOCAL(const AtomicString, network, ("network", AtomicString::ConstructFromLiteral));
DEFINE_STATIC_LOCAL(const AtomicString, decode, ("decode", AtomicString::ConstructFromLiteral));
@@ -184,7 +183,7 @@ void MediaSourceBase::endOfStream(const AtomicString& error, ExceptionState& es)
// 1. If the readyState attribute is not in the "open" state then throw an
// InvalidStateError exception and abort these steps.
if (!isOpen()) {
- es.throwDOMException(InvalidStateError);
+ ec = InvalidStateError;
return;
}
@@ -197,7 +196,7 @@ void MediaSourceBase::endOfStream(const AtomicString& error, ExceptionState& es)
} else if (error == decode) {
eosStatus = MediaSourcePrivate::EosDecodeError;
} else {
- es.throwDOMException(InvalidAccessError);
+ ec = InvalidAccessError;
return;
}
@@ -255,7 +254,7 @@ void MediaSourceBase::stop()
m_private.clear();
}
-PassOwnPtr<SourceBufferPrivate> MediaSourceBase::createSourceBufferPrivate(const String& type, const MediaSourcePrivate::CodecsArray& codecs, ExceptionState& es)
+PassOwnPtr<SourceBufferPrivate> MediaSourceBase::createSourceBufferPrivate(const String& type, const MediaSourcePrivate::CodecsArray& codecs, ExceptionCode& ec)
{
OwnPtr<SourceBufferPrivate> sourceBufferPrivate;
switch (m_private->addSourceBuffer(type, codecs, &sourceBufferPrivate)) {
@@ -267,13 +266,13 @@ PassOwnPtr<SourceBufferPrivate> MediaSourceBase::createSourceBufferPrivate(const
// Step 2: If type contains a MIME type ... that is not supported with the types
// specified for the other SourceBuffer objects in sourceBuffers, then throw
// a NotSupportedError exception and abort these steps.
- es.throwDOMException(NotSupportedError);
+ ec = NotSupportedError;
return nullptr;
case MediaSourcePrivate::ReachedIdLimit:
// 2.2 https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#widl-MediaSource-addSourceBuffer-SourceBuffer-DOMString-type
// Step 3: If the user agent can't handle any more SourceBuffer objects then throw
// a QuotaExceededError exception and abort these steps.
- es.throwDOMException(QuotaExceededError);
+ ec = QuotaExceededError;
return nullptr;
}
« no previous file with comments | « Source/modules/mediasource/MediaSourceBase.h ('k') | Source/modules/mediasource/SourceBuffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698