Update EME errors to use TypeError

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

 /*
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/encryptedmedia/MediaKeys.h"
 
+#include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptState.h"
+#include "bindings/core/v8/V8Binding.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/html/HTMLMediaElement.h"
 #include "modules/encryptedmedia/EncryptedMediaUtils.h"
 #include "modules/encryptedmedia/MediaKeySession.h"
 #include "modules/encryptedmedia/SimpleContentDecryptionModuleResultPromise.h"
 #include "platform/Timer.h"
 #include "public/platform/WebContentDecryptionModule.h"
@@ skipping 128 matching lines @@
     // 4. Return session.
     return MediaKeySession::create(scriptState, this, sessionType);
 }
 
 ScriptPromise MediaKeys::setServerCertificate(ScriptState* scriptState, const DOMArrayPiece& serverCertificate)
 {
     // From https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html#dom-setservercertificate:
     // The setServerCertificate(serverCertificate) method provides a server
     // certificate to be used to encrypt messages to the license server.
     // It must run the following steps:
-    // 1. If serverCertificate is an empty array, return a promise rejected
-    //    with a new DOMException whose name is "InvalidAccessError".
+    // 1. If the Key System implementation represented by this object's cdm
+    //    implementation value does not support server certificates, return
+    //    a promise resolved with false.
+    //    (Let the CDM decide whether to support this or not.)

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

This is not spec compliant. The purpose of the spec algorithm steps is that null
can be passed to an implementation that does not support server certificates.
This allows simplification of some application designs. See
https://github.com/w3c/encrypted-media/issues/145.

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

Replaced it with a TODO since it's currently not determinable.

+    //
+    // 2. If serverCertificate is an empty array, return a promise rejected
+    //    with a new a newly created TypeError.
     if (!serverCertificate.byteLength()) {
-        return ScriptPromise::rejectWithDOMException(
-            scriptState, DOMException::create(InvalidAccessError, "The serverCertificate parameter is empty."));
+        return ScriptPromise::reject(
+            scriptState, v8::Exception::TypeError(v8String(scriptState->isolate(), "The serverCertificate parameter is empty.")));
     }
 
-    // 2. If the keySystem does not support server certificates, return a
-    //    promise rejected with a new DOMException whose name is
-    //    "NotSupportedError".
-    //    (Let the CDM decide whether to support this or not.)
-
     // 3. Let certificate be a copy of the contents of the serverCertificate
     //    parameter.
     DOMArrayBuffer* serverCertificateBuffer = DOMArrayBuffer::create(serverCertificate.data(), serverCertificate.byteLength());
 
     // 4. Let promise be a new promise.
     SetCertificateResultPromise* result = new SetCertificateResultPromise(scriptState);
     ScriptPromise promise = result->promise();
 
     // 5. Run the following steps asynchronously (documented in timerFired()).
     m_pendingActions.append(PendingAction::CreatePendingSetServerCertificate(result, serverCertificateBuffer));
@@ skipping 101 matching lines @@
 void MediaKeys::stop()
 {
     ActiveDOMObject::stop();
 
     if (m_timer.isActive())
         m_timer.stop();
     m_pendingActions.clear();
 }
 
 } // namespace blink