Update EME errors to use TypeError

third_party/WebKit/Source/modules/encryptedmedia/ContentDecryptionModuleResultPromise.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/ContentDecryptionModuleResultPromise.h"
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptState.h"
+#include "bindings/core/v8/V8ThrowException.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "public/platform/WebString.h"
 #include "wtf/Assertions.h"
 
 namespace blink {
 
 ExceptionCode WebCdmExceptionToExceptionCode(
     WebContentDecryptionModuleException cdmException) {
   switch (cdmException) {
+    case WebContentDecryptionModuleExceptionTypeError:
+      return V8TypeError;
     case WebContentDecryptionModuleExceptionNotSupportedError:
       return NotSupportedError;
     case WebContentDecryptionModuleExceptionInvalidStateError:
       return InvalidStateError;
-    case WebContentDecryptionModuleExceptionInvalidAccessError:
-      return InvalidAccessError;
     case WebContentDecryptionModuleExceptionQuotaExceededError:
       return QuotaExceededError;
     case WebContentDecryptionModuleExceptionUnknownError:
       return UnknownError;
-    case WebContentDecryptionModuleExceptionClientError:
-    case WebContentDecryptionModuleExceptionOutputError:
-      // Currently no matching DOMException for these 2 errors.
-      // FIXME: Update DOMException to handle these if actually added to
-      // the EME spec.
-      return UnknownError;
   }
 
   NOTREACHED();
   return UnknownError;
 }
 
 ContentDecryptionModuleResultPromise::ContentDecryptionModuleResultPromise(
     ScriptState* scriptState)
     : m_resolver(ScriptPromiseResolver::create(scriptState)) {}
 
@@ skipping 45 matching lines @@
 }
 
 ScriptPromise ContentDecryptionModuleResultPromise::promise() {
   return m_resolver->promise();
 }
 
 void ContentDecryptionModuleResultPromise::reject(ExceptionCode code,
                                                   const String& errorMessage) {
   DCHECK(isValidToFulfillPromise());
 
-  m_resolver->reject(DOMException::create(code, errorMessage));
+  if (code == V8TypeError) {

[haraken, 2016/10/15 01:30:46]

Can you just use V8ThrowException::createDOMException?

[jrummell, 2016/10/17 18:57:24]

Done.

+    ScriptState::Scope scope(m_resolver->getScriptState());

[jrummell, 2016/10/14 20:43:47]

Without this line I get a crash in
v8::internal::HandleScope::Extend(v8::internal::Isolate*), so I assume the scope
is needed.

[haraken, 2016/10/15 01:30:46]

Yes, this is needed.

+    v8::Isolate* isolate = m_resolver->getScriptState()->isolate();
+    m_resolver->reject(
+        V8ThrowException::createTypeError(isolate, errorMessage));
+  } else {
+    m_resolver->reject(DOMException::create(code, errorMessage));
+  }
+
   m_resolver.clear();
 }
 
 ExecutionContext* ContentDecryptionModuleResultPromise::getExecutionContext()
     const {
   return m_resolver->getExecutionContext();
 }
 
 bool ContentDecryptionModuleResultPromise::isValidToFulfillPromise() {
   // getExecutionContext() is no longer valid once the context is destroyed.
   // activeDOMObjectsAreStopped() is called to see if the context is in the
   // process of being destroyed. If it is, there is no need to fulfill this
   // promise which is about to go away anyway.
   return getExecutionContext() &&
          !getExecutionContext()->activeDOMObjectsAreStopped();
 }
 
 DEFINE_TRACE(ContentDecryptionModuleResultPromise) {
   visitor->trace(m_resolver);
   ContentDecryptionModuleResult::trace(visitor);
 }
 
 }  // namespace blink