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

Unified Diff: third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp

Issue 2342953002: Update EME errors to use TypeError (Closed)
Patch Set: changes Created 4 years, 2 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
Index: third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
diff --git a/third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp b/third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
index 9db401ad3c994f5bff6e88714bf7d54dd2d9c564..9f7e9c710b173e7829685c625b8a1ed9516b8641 100644
--- a/third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
+++ b/third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
@@ -8,7 +8,7 @@
#include "bindings/core/v8/ScriptPromise.h"
#include "bindings/core/v8/ScriptPromiseResolver.h"
#include "bindings/core/v8/ScriptState.h"
-#include "bindings/core/v8/V8Binding.h"
+#include "bindings/core/v8/V8ThrowException.h"
#include "core/dom/DOMException.h"
#include "core/dom/DOMTypedArray.h"
#include "core/dom/ExceptionCode.h"
@@ -58,7 +58,7 @@ typedef Function<void()> SuccessCallback;
typedef Function<void(ExceptionCode, const String&)> FailureCallback;
// Represents the result used when setContentDecryptionModule() is called.
-// Calls |success| if result is resolved, |failure| is result is rejected.
+// Calls |success| if result is resolved, |failure| if result is rejected.
class SetContentDecryptionModuleResult final
: public ContentDecryptionModuleResult {
public:
@@ -96,6 +96,7 @@ class SetContentDecryptionModuleResult final
result.appendNumber(systemCode);
result.append(')');
}
+
(*m_failureCallback)(WebCdmExceptionToExceptionCode(code),
result.toString());
}
@@ -250,7 +251,9 @@ void SetMediaKeysHandler::fail(ExceptionCode code, const String& errorMessage) {
!HTMLMediaElementEncryptedMedia::from(*m_element).m_isAttachingMediaKeys);
// Reject promise with an appropriate error.
- reject(DOMException::create(code, errorMessage));
+ ScriptState::Scope scope(getScriptState());
+ v8::Isolate* isolate = getScriptState()->isolate();
+ reject(V8ThrowException::createDOMException(isolate, code, errorMessage));
}
void SetMediaKeysHandler::clearFailed(ExceptionCode code,

Powered by Google App Engine
This is Rietveld 408576698