Update PPP side of Pepper CDM API to support video decoding.

webkit/plugins/ppapi/ppapi_plugin_instance.h

 // Copyright (c) 2012 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 WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
 #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 233 matching lines @@
   int PrintBegin(const WebKit::WebPrintParams& print_params);
   bool PrintPage(int page_number, WebKit::WebCanvas* canvas);
   void PrintEnd();
 
   bool CanRotateView();
   void RotateView(WebKit::WebPlugin::RotationType type);
 
   void Graphics3DContextLost();
 
   // Provides access to PPP_ContentDecryptor_Private.
+  // Note: These methods can be used with unecrypted data.

[ddorwin, 2012/10/02 05:36:50]

Really, it's jus the D&D method(s) that this makes sense for. And it should be
that unencrypted data may be _passed_ to them.

[Tom Finegan, 2012/10/04 02:22:12]

Done, I think. Moved comment above PluginInstance::DecryptAndDecode in the cc
file. If that needs to change, we can fix it when we do the audio side.

[ddorwin, 2012/10/04 16:37:09]

The cc comment is fine, but I meant this comment should be above
DecryptAndDecodeFrame (and DecryptAndDecodeSample). Not a big deal; we can fix
it later.

   // TODO(tomfinegan): Move decryptor methods to delegate class.
   void set_decrypt_client(media::DecryptorClient* client);
   bool GenerateKeyRequest(const std::string& key_system,
                           const std::string& init_data);
   bool AddKey(const std::string& session_id,
               const std::string& key,
               const std::string& init_data);
   bool CancelKeyRequest(const std::string& session_id);
   bool Decrypt(const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
                const media::Decryptor::DecryptCB& decrypt_cb);
   // TODO(xhwang): Update this when we need to support decrypt and decode.
-  bool DecryptAndDecode(
-      const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
+  bool DecryptAndDecodeFrame(
+      const scoped_refptr<media::DecoderBuffer>& encrypted_frame,
       const media::Decryptor::DecryptCB& decrypt_cb);
 
   // There are 2 implementations of the fullscreen interface
   // PPB_FlashFullscreen is used by Pepper Flash.
   // PPB_Fullscreen is intended for other applications including NaCl.
   // The two interface are mutually exclusive.
 
   // Implementation of PPB_FlashFullscreen.
 
   // Because going to fullscreen is asynchronous (but going out is not), there
@@ skipping 483 matching lines @@
   typedef std::map<uint32_t, media::Decryptor::DecryptCB> DecryptionCBMap;
   DecryptionCBMap pending_decryption_cbs_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginInstance);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_