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/V8Binding.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 WebContentDecryptionModuleExceptionNotSupportedError:
         return NotSupportedError;
     case WebContentDecryptionModuleExceptionInvalidStateError:
         return InvalidStateError;
     case WebContentDecryptionModuleExceptionInvalidAccessError:

[ddorwin, 2016/09/15 22:43:03]

Is this still used? Maybe treat it as a TypeError per the bug and make progress
towards deprecation (really, that should be caught at a lower level).

[jrummell, 2016/09/16 23:23:34]

CDM interface has kInvalidAccessError, so it could be returned. Updated
WebContentDecryptionModuleException to match the expected list, and updated the
CDM_9 interface bug (http://crbug.com/570216) to note that the extra errors
should be removed.

         return InvalidAccessError;
     case WebContentDecryptionModuleExceptionQuotaExceededError:
         return QuotaExceededError;
     case WebContentDecryptionModuleExceptionUnknownError:

[ddorwin, 2016/09/15 22:43:03]

Are these three still used? Remove/NOTREACHED and deprecate?

[jrummell, 2016/09/16 23:23:34]

Done.

         return UnknownError;

[ddorwin, 2016/09/15 22:43:03]

Remove this line since the comment below also applies, though is out of date.

[jrummell, 2016/09/16 23:23:34]

Removed the unnecessary values.

     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;
+    case WebContentDecryptionModuleExceptionTypeError:
+        // This is not a DOMException but rather a seperate TypeError. Use a
+        // different ExceptionCode for this so it can be checked for.
+        return TypeMismatchError;
     }
 
     NOTREACHED();
     return UnknownError;
 }
 
 ContentDecryptionModuleResultPromise::ContentDecryptionModuleResultPromise(ScriptState* scriptState)
     : m_resolver(ScriptPromiseResolver::create(scriptState))
 {
 }
@@ skipping 50 matching lines @@
     // already posted that need to happen only after the promise is resolved.)
     // TODO(jrummell): Make resolving a promise asynchronous as well (including
     // making sure events still happen after the promise is resolved).
     if (getExecutionContext()) {
         getExecutionContext()->postTask(BLINK_FROM_HERE, createSameThreadTask(&ContentDecryptionModuleResultPromise::rejectInternal, wrapPersistent(this), code, errorMessage));
     }
 }
 
 void ContentDecryptionModuleResultPromise::rejectInternal(ExceptionCode code, const String& errorMessage)
 {
-    m_resolver->reject(DOMException::create(code, errorMessage));
+    if (code == TypeMismatchError) {
+        if (m_resolver->getScriptState()->contextIsValid()) {
+            ScriptState::Scope scope(m_resolver->getScriptState());
+            v8::Isolate* isolate = m_resolver->getScriptState()->isolate();
+            m_resolver->reject(v8::Exception::TypeError(v8String(isolate, errorMessage)));
+        }
+    } else {
+        m_resolver->reject(DOMException::create(code, errorMessage));
+    }
+
     m_resolver.clear();
 }
 
 ExecutionContext* ContentDecryptionModuleResultPromise::getExecutionContext() const
 {
     return m_resolver->getExecutionContext();
 }
 
 DEFINE_TRACE(ContentDecryptionModuleResultPromise)
 {
     visitor->trace(m_resolver);
     ContentDecryptionModuleResult::trace(visitor);
 }
 
 } // namespace blink