Update MediaKeys interface for EME

content/renderer/media/webcontentdecryptionmodule_impl.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULE_IMPL_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
+#include "content/renderer/media/webcontentdecryptionmoduleresult_helper.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"
 
 namespace blink {
 #if defined(ENABLE_PEPPER_CDMS)
 class WebLocalFrame;
 #endif
 class WebSecurityOrigin;
 }
 
 namespace media {
@@ skipping 34 matching lines @@
   // CDM ID is associated, such as when Clear Key is used.
   int GetCdmId() const;
 #endif  // defined(ENABLE_BROWSER_CDMS)
 
   // blink::WebContentDecryptionModule implementation.
   virtual blink::WebContentDecryptionModuleSession* createSession();
   // TODO(jrummell): Remove this method once blink updated.
   virtual blink::WebContentDecryptionModuleSession* createSession(
       blink::WebContentDecryptionModuleSession::Client* client);
 
+  virtual void setServerCertificate(
+      const uint8* server_certificate,
+      size_t server_certificate_length,
+      blink::WebContentDecryptionModuleResult result);
+
  private:
   // Takes reference to |adapter|.
   WebContentDecryptionModuleImpl(scoped_refptr<CdmSessionAdapter> adapter);
 
+  // Used when setServerCertificate() promise is resolved/rejected.

[ddorwin, 2014/09/10 22:58:38]

Why isn't this handled as a "Result"?

[jrummell, 2014/09/11 21:21:55]

On the Chromium side we switch to CdmPromise, so these are simply the functions
that are called when the promise is resolved/rejected. Renaming the methods
below.

+  void CertificateSet(uint32 result_index);

[ddorwin, 2014/09/10 22:58:38]

On...?
ditto below

[jrummell, 2014/09/11 21:21:55]

Done.

+  void SessionError(uint32 result_index,

[ddorwin, 2014/09/10 22:58:39]

Why does the CDM object handle a session error?

[jrummell, 2014/09/11 21:21:55]

This is the promise rejected. Renamed.

+                    media::MediaKeys::Exception exception_code,
+                    uint32 system_code,
+                    const std::string& error_message);
+
   scoped_refptr<CdmSessionAdapter> adapter_;
 
+  // Keep track of all the outstanding WebContentDecryptionModuleResult objects.
+  WebContentDecryptionModuleResultHelper outstanding_results_;
+
+  // Since promises will live until they are fired, use a weak reference when
+  // creating a promise in case this class disappears before the promise
+  // actually fires.
+  base::WeakPtrFactory<WebContentDecryptionModuleImpl> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(WebContentDecryptionModuleImpl);
 };
 
 // Allow typecasting from blink type as this is the only implementation.
 inline WebContentDecryptionModuleImpl* ToWebContentDecryptionModuleImpl(
     blink::WebContentDecryptionModule* cdm) {
   return static_cast<WebContentDecryptionModuleImpl*>(cdm);
 }
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULE_IMPL_H_