Update EME errors to use TypeError

third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #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"
 #include "core/html/HTMLMediaElement.h"
 #include "modules/encryptedmedia/ContentDecryptionModuleResultPromise.h"
 #include "modules/encryptedmedia/EncryptedMediaUtils.h"
 #include "modules/encryptedmedia/MediaEncryptedEvent.h"
 #include "modules/encryptedmedia/MediaKeys.h"
 #include "platform/ContentDecryptionModuleResult.h"
 #include "wtf/Functional.h"
@@ skipping 28 matching lines @@
     Member<HTMLMediaElement> m_element;
     Member<MediaKeys> m_newMediaKeys;
     bool m_madeReservation;
     Timer<SetMediaKeysHandler> m_timer;
 };
 
 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)
         : m_successCallback(std::move(success))
         , m_failureCallback(std::move(failure))
     {
     }
 
     // ContentDecryptionModuleResult implementation.
     void complete() override
@@ skipping 19 matching lines @@
         // is empty, we'll report "Rejected with system code (systemCode)".
         StringBuilder result;
         result.append(message);
         if (systemCode != 0) {
             if (result.isEmpty())
                 result.append("Rejected with system code");
             result.append(" (");
             result.appendNumber(systemCode);
             result.append(')');
         }
+
         (*m_failureCallback)(WebCdmExceptionToExceptionCode(code), result.toString());
     }
 
 private:
     std::unique_ptr<SuccessCallback> m_successCallback;
     std::unique_ptr<FailureCallback> m_failureCallback;
 };
 
 ScriptPromise SetMediaKeysHandler::create(ScriptState* scriptState, HTMLMediaElement& element, MediaKeys* mediaKeys)
 {
@@ skipping 123 matching lines @@
 
 void SetMediaKeysHandler::fail(ExceptionCode code, const String& errorMessage)
 {
     // Reset ownership of |m_newMediaKeys|.
     if (m_madeReservation)
         m_newMediaKeys->cancelReservation();
 
     // 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());

[haraken, 2016/09/16 23:55:21]

Ditto.

+        v8::Isolate* isolate = getScriptState()->isolate();
+        reject(V8ThrowException::createDOMException(isolate, code, errorMessage));
+    }
 }
 
 void SetMediaKeysHandler::clearFailed(ExceptionCode code, const String& errorMessage)
 {
     DVLOG(EME_LOG_LEVEL) << __func__ << "(" << code << ", " << errorMessage << ")";
     HTMLMediaElementEncryptedMedia& thisElement = HTMLMediaElementEncryptedMedia::from(*m_element);
 
     // 5.2.4 If the preceding step failed, let this object's attaching media
     //      keys value be false and reject promise with an appropriate
     //      error name.
@@ skipping 155 matching lines @@
 }
 
 DEFINE_TRACE(HTMLMediaElementEncryptedMedia)
 {
     visitor->trace(m_mediaElement);
     visitor->trace(m_mediaKeys);
     Supplement<HTMLMediaElement>::trace(visitor);
 }
 
 } // namespace blink