| 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 67ddefcc2ce88b3337d2c891e33e5aed2c5baa82..8f692c82499fee968b34d5e05ecb0c2cc53f9c08 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"
|
| @@ -57,7 +57,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:
|
| SetContentDecryptionModuleResult(std::unique_ptr<SuccessCallback> success, std::unique_ptr<FailureCallback> failure)
|
| @@ -97,6 +97,7 @@ public:
|
| result.appendNumber(systemCode);
|
| result.append(')');
|
| }
|
| +
|
| (*m_failureCallback)(WebCdmExceptionToExceptionCode(code), result.toString());
|
| }
|
|
|
| @@ -240,8 +241,13 @@ void SetMediaKeysHandler::fail(ExceptionCode code, const String& errorMessage)
|
| // Make sure attaching media keys value is false.
|
| DCHECK(!HTMLMediaElementEncryptedMedia::from(*m_element).m_isAttachingMediaKeys);
|
|
|
| - // Reject promise with an appropriate error.
|
| - reject(DOMException::create(code, errorMessage));
|
| + // Reject promise with an appropriate error. Since |code| may represent
|
| + // a TypeError, use V8ThrowException::createDOMException() to handle it.
|
| + if (getScriptState()->contextIsValid()) {
|
| + ScriptState::Scope scope(getScriptState());
|
| + v8::Isolate* isolate = getScriptState()->isolate();
|
| + reject(V8ThrowException::createDOMException(isolate, code, errorMessage));
|
| + }
|
| }
|
|
|
| void SetMediaKeysHandler::clearFailed(ExceptionCode code, const String& errorMessage)
|
|
|