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

Unified Diff: Source/modules/encryptedmedia/MediaKeySession.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/encryptedmedia/MediaKeySession.h ('k') | Source/modules/encryptedmedia/MediaKeys.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/encryptedmedia/MediaKeySession.cpp
diff --git a/Source/modules/encryptedmedia/MediaKeySession.cpp b/Source/modules/encryptedmedia/MediaKeySession.cpp
index 549945c2f23d4b3a0c75a1ba1ee230bcaee3fb4d..1a120badecf0c7ac7d6a25215e00dd6f45d41a8b 100644
--- a/Source/modules/encryptedmedia/MediaKeySession.cpp
+++ b/Source/modules/encryptedmedia/MediaKeySession.cpp
@@ -26,9 +26,7 @@
#include "config.h"
#include "modules/encryptedmedia/MediaKeySession.h"
-#include "bindings/v8/ExceptionState.h"
#include "core/dom/Event.h"
-#include "core/dom/ExceptionCode.h"
#include "core/dom/GenericEventQueue.h"
#include "core/html/MediaKeyError.h"
#include "core/platform/graphics/ContentDecryptionModule.h"
@@ -110,14 +108,14 @@ void MediaKeySession::keyRequestTimerFired(Timer<MediaKeySession>*)
}
}
-void MediaKeySession::update(Uint8Array* key, ExceptionState& es)
+void MediaKeySession::update(Uint8Array* key, ExceptionCode& ec)
{
// From <http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html#dom-addkey>:
// The addKey(key) method must run the following steps:
// 1. If the first or second argument [sic] is null or an empty array, throw an InvalidAccessError.
// NOTE: the reference to a "second argument" is a spec bug.
if (!key || !key->length()) {
- es.throwDOMException(InvalidAccessError);
+ ec = InvalidAccessError;
return;
}
« no previous file with comments | « Source/modules/encryptedmedia/MediaKeySession.h ('k') | Source/modules/encryptedmedia/MediaKeys.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698