Update MediaKeys interface for EME

content/renderer/media/cdm_result_promise.cc

+// 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 "content/renderer/media/cdm_result_promise.h"
+
+#include "base/bind.h"
+#include "base/logging.h"
+#include "third_party/WebKit/public/platform/WebString.h"
+
+namespace content {
+
+static blink::WebContentDecryptionModuleException ConvertException(
+    media::MediaKeys::Exception exception_code) {
+  switch (exception_code) {
+    case media::MediaKeys::NOT_SUPPORTED_ERROR:
+      return blink::WebContentDecryptionModuleExceptionNotSupportedError;
+    case media::MediaKeys::INVALID_STATE_ERROR:
+      return blink::WebContentDecryptionModuleExceptionInvalidStateError;
+    case media::MediaKeys::INVALID_ACCESS_ERROR:
+      return blink::WebContentDecryptionModuleExceptionInvalidAccessError;
+    case media::MediaKeys::QUOTA_EXCEEDED_ERROR:
+      return blink::WebContentDecryptionModuleExceptionQuotaExceededError;
+    case media::MediaKeys::UNKNOWN_ERROR:
+      return blink::WebContentDecryptionModuleExceptionUnknownError;
+    case media::MediaKeys::CLIENT_ERROR:
+      return blink::WebContentDecryptionModuleExceptionClientError;
+    case media::MediaKeys::OUTPUT_ERROR:
+      return blink::WebContentDecryptionModuleExceptionOutputError;
+    default:
+      NOTREACHED();
+      return blink::WebContentDecryptionModuleExceptionUnknownError;
+  }
+}
+
+template <typename T>
+CdmResultPromise<T>::CdmResultPromise(
+    blink::WebContentDecryptionModuleResult result)
+    : media::CdmPromiseTemplate<T>(
+          base::Bind(&CdmResultPromise::OnResolve, base::Unretained(this)),
+          base::Bind(&CdmResultPromise::OnReject, base::Unretained(this))),

[xhwang, 2014/09/25 05:11:46]

This patten is a bit tricky. Might worth some documentation on how it works and
why Unretained(this) is okay (because it's the same object...)

Actually, CdmPromiseTemplate doesn't do much work: it calls the resolve/reject
cb and report UMA. Can we make it an interface and move the work here? Then we
don't need to use the base class to do work and the code would be simpler (I
hope)... But I might be missing something here... let's discuss.

[jrummell, 2014/09/25 20:33:24]

Discussed offline. Will be cleaned up in a future CL.

+      webCDMResult_(result) {
+}
+
+template <typename T>
+CdmResultPromise<T>::CdmResultPromise(
+    blink::WebContentDecryptionModuleResult result,
+    const std::string& uma_name)
+    : media::CdmPromiseTemplate<T>(
+          base::Bind(&CdmResultPromise::OnResolve, base::Unretained(this)),
+          base::Bind(&CdmResultPromise::OnReject, base::Unretained(this)),
+          uma_name),
+      webCDMResult_(result) {
+}

[xhwang, 2014/09/25 05:11:46]

Is it possible to only keep the version with uma_name? If uma_name is empty,
then we don't report UMA...
Will that work?

[jrummell, 2014/09/25 20:33:24]

CdmPromise() does a DCHECK on uma_name if specified. Will clean it up in the
future CL.

+
+template <>
+void CdmResultPromise<std::string>::OnResolve(const std::string& result) {
+  // This must be overridden in a subclass.
+  NOTIMPLEMENTED();

[xhwang, 2014/09/25 05:11:46]

NOTREACHED

[jrummell, 2014/09/25 20:33:24]

Done.

+}
+
+template <>
+void CdmResultPromise<media::KeyIdsVector>::OnResolve(
+    const media::KeyIdsVector& result) {
+  // TODO(jrummell): Update blink::WebContentDecryptionModuleResult to
+  // handle the set of keys.
+  OnReject(media::MediaKeys::NOT_SUPPORTED_ERROR, 0, "Not implemented.");
+}
+
+template <typename T>
+void CdmResultPromise<T>::OnReject(media::MediaKeys::Exception exception_code,
+                                   uint32 system_code,
+                                   const std::string& error_message) {
+  webCDMResult_.completeWithError(ConvertException(exception_code),
+                                  system_code,
+                                  blink::WebString::fromUTF8(error_message));
+}
+
+CdmResultPromise<void>::CdmResultPromise(
+    blink::WebContentDecryptionModuleResult result)
+    : media::CdmPromiseTemplate<void>(
+          base::Bind(&CdmResultPromise::OnResolve, base::Unretained(this)),
+          base::Bind(&CdmResultPromise::OnReject, base::Unretained(this))),
+      webCDMResult_(result) {
+}
+
+CdmResultPromise<void>::CdmResultPromise(
+    blink::WebContentDecryptionModuleResult result,
+    const std::string& uma_name)
+    : media::CdmPromiseTemplate<void>(
+          base::Bind(&CdmResultPromise::OnResolve, base::Unretained(this)),
+          base::Bind(&CdmResultPromise::OnReject, base::Unretained(this)),
+          uma_name),
+      webCDMResult_(result) {
+}
+
+void CdmResultPromise<void>::OnResolve() {
+  webCDMResult_.complete();
+}
+
+void CdmResultPromise<void>::OnReject(
+    media::MediaKeys::Exception exception_code,
+    uint32 system_code,
+    const std::string& error_message) {
+  webCDMResult_.completeWithError(ConvertException(exception_code),
+                                  system_code,
+                                  blink::WebString::fromUTF8(error_message));
+}
+
+// Explicit template instantiation for the templates needed.
+template class CdmResultPromise<std::string>;

[ddorwin, 2014/09/25 00:07:15]

ditto - and this might allow us to avoid anyone accidentally using line 59.

[ddorwin, 2014/09/25 00:16:38]

Nevermind, that doesn't work with the implementation in a .cc file.

+template class CdmResultPromise<media::KeyIdsVector>;

[ddorwin, 2014/09/25 00:07:15]

ditto

[ddorwin, 2014/09/25 00:16:38]

Nevermind.

+
+}  // namespace content