Modify the PPAPI CDM interface to pass more info.

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 <set>
 #include <string>
 #include <vector>
@@ skipping 35 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCanvas.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/gfx/rect.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/ppb_flash_impl.h"
 #include "webkit/plugins/ppapi/ppp_pdf.h"
 #include "webkit/plugins/webkit_plugins_export.h"
 
+struct PP_DecryptedBlockInfo;
 struct PP_Point;
 
 class SkBitmap;
 class TransportDIB;
 
 namespace WebKit {
 class WebInputEvent;
 class WebMouseEvent;
 class WebPluginContainer;
 struct WebCompositionUnderline;
@@ skipping 172 matching lines @@
   void RotateView(WebKit::WebPlugin::RotationType type);
 
   void Graphics3DContextLost();
 
   // Provides access to PPP_ContentDecryptor_Private.
   // TODO(tomfinegan): Move decryptor methods to delegate class.
   typedef base::Callback<void(void*, int)> DecryptedDataCB;
   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& key,
+              const std::string& init_data);
   bool CancelKeyRequest(const std::string& session_id);
   bool Decrypt(const base::StringPiece& encypted_block,
                const DecryptedDataCB& callback);
   bool DecryptAndDecode(const base::StringPiece& encypted_block,
                         const DecryptedDataCB& callback);
 
   // 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.
@@ skipping 179 matching lines @@
                           PP_Var session_id,
                           PP_Resource message,
                           PP_Var default_url) OVERRIDE;
   virtual void KeyError(PP_Instance instance,
                         PP_Var key_system,
                         PP_Var session_id,
                         int32_t media_error,
                         int32_t system_code) OVERRIDE;
   virtual void DeliverBlock(PP_Instance instance,
                             PP_Resource decrypted_block,
-                            int32_t request_id) OVERRIDE;
+                            const PP_DecryptedBlockInfo* block_info) OVERRIDE;
   virtual void DeliverFrame(PP_Instance instance,
                             PP_Resource decrypted_frame,
-                            int32_t request_id) OVERRIDE;
+                            const PP_DecryptedBlockInfo* block_info) OVERRIDE;
   virtual void DeliverSamples(PP_Instance instance,
                               PP_Resource decrypted_samples,
-                              int32_t request_id) OVERRIDE;
+                              const PP_DecryptedBlockInfo* block_info) OVERRIDE;
 
   // Reset this instance as proxied. Resets cached interfaces to point to the
   // proxy and re-sends DidCreate, DidChangeView, and HandleDocumentLoad (if
   // necessary).
   // This is for use with the NaCl proxy.
   bool ResetAsProxied();
 
  private:
   // See the static Create functions above for creating PluginInstance objects.
   // This constructor is private so that we can hide the PPP_Instance_Combined
@@ skipping 261 matching lines @@
   // the pointer so we can re-send it later if we are reset to talk to NaCl.
   scoped_refptr<PPB_URLLoader_Impl> document_loader_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginInstance);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_