Connect WebMediaPlayerImpl to WebContentDecryptionModuleImpl for EME WD (Chromium side)

content/renderer/media/webcontentdecryptionmodule_impl.h

Index: content/renderer/media/webcontentdecryptionmodule_impl.h
diff --git a/content/renderer/media/webcontentdecryptionmodule_impl.h b/content/renderer/media/webcontentdecryptionmodule_impl.h
index ecd5198efda32c69c9fad9cc9ad1117707ceb0db..59bec53c59721936ce5e4d741c363d6fafbfaf6d 100644
--- a/content/renderer/media/webcontentdecryptionmodule_impl.h
+++ b/content/renderer/media/webcontentdecryptionmodule_impl.h
@@ -12,6 +12,7 @@
 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"
 
 namespace media {
+class Decryptor;
 class MediaKeys;
 }
 
@@ -28,6 +29,11 @@ class WebContentDecryptionModuleImpl
 
   virtual ~WebContentDecryptionModuleImpl();
 
+  // Return the Decryptor associated with this CDM.

[xhwang, 2013/12/30 19:50:49]

nit: Return_s_

[xhwang, 2013/12/30 19:50:49]

What if the current CDM doesn't have a decryptor, e.g. gtv?

https://code.google.com/p/chromium/codesearch#chromium/src/content/renderer/m...

[jrummell, 2014/01/08 19:12:31]

Done.

[jrummell, 2014/01/08 19:12:31]

Comment added.

+  // TODO(jrummell): Figure out lifetimes, as WMPI may still use the decryptor
+  // after WebContentDecryptionModule is freed. http://crbug.com/330324
+  media::Decryptor* GetDecryptor();
+
   // blink::WebContentDecryptionModule implementation.
   virtual blink::WebContentDecryptionModuleSession* createSession(
       blink::WebContentDecryptionModuleSession::Client* client);
@@ -46,6 +52,12 @@ class WebContentDecryptionModuleImpl
   DISALLOW_COPY_AND_ASSIGN(WebContentDecryptionModuleImpl);
 };
 
+// Allow typecasting from blink type as this is the only implementation.
+inline WebContentDecryptionModuleImpl* toWebContentDecryptionModuleImpl(

[xhwang, 2013/12/30 19:50:49]

s/to/To?

[jrummell, 2014/01/08 19:12:31]

Done.

+    blink::WebContentDecryptionModule* cdm) {
+  return static_cast<WebContentDecryptionModuleImpl*>(cdm);
+}
+
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBCONTENTDECRYPTIONMODULE_IMPL_H_