Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2168)

Unified Diff: ppapi/thunk/ppb_content_decryptor_private_thunk.cc

Issue 24192004: Changes to the EME Pepper API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/thunk/interfaces_ppb_private.h ('k') | ppapi/thunk/ppb_instance_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/thunk/ppb_content_decryptor_private_thunk.cc
diff --git a/ppapi/thunk/ppb_content_decryptor_private_thunk.cc b/ppapi/thunk/ppb_content_decryptor_private_thunk.cc
index 9450eedcbd6ae61f822263aa465bc99dba9aa6c4..7fe79e12848a1bb7d9952bbca120b72f1a67d627 100644
--- a/ppapi/thunk/ppb_content_decryptor_private_thunk.cc
+++ b/ppapi/thunk/ppb_content_decryptor_private_thunk.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
// From private/ppb_content_decryptor_private.idl,
-// modified Tue Apr 16 11:25:44 2013.
+// modified Tue Sep 17 11:31:05 2013.
#include "ppapi/c/pp_errors.h"
#include "ppapi/c/private/ppb_content_decryptor_private.h"
@@ -18,17 +18,6 @@ namespace thunk {
namespace {
-void NeedKey(PP_Instance instance,
- struct PP_Var key_system,
- struct PP_Var session_id,
- struct PP_Var init_data) {
- VLOG(4) << "PPB_ContentDecryptor_Private::NeedKey()";
- EnterInstance enter(instance);
- if (enter.failed())
- return;
- enter.functions()->NeedKey(instance, key_system, session_id, init_data);
-}
-
void KeyAdded(PP_Instance instance,
struct PP_Var key_system,
struct PP_Var session_id) {
@@ -144,9 +133,8 @@ void DeliverSamples(
decrypted_block_info);
}
-const PPB_ContentDecryptor_Private_0_6
- g_ppb_contentdecryptor_private_thunk_0_6 = {
- &NeedKey,
+const PPB_ContentDecryptor_Private_0_7
+ g_ppb_contentdecryptor_private_thunk_0_7 = {
&KeyAdded,
&KeyMessage,
&KeyError,
@@ -160,9 +148,9 @@ const PPB_ContentDecryptor_Private_0_6
} // namespace
-const PPB_ContentDecryptor_Private_0_6*
- GetPPB_ContentDecryptor_Private_0_6_Thunk() {
- return &g_ppb_contentdecryptor_private_thunk_0_6;
+const PPB_ContentDecryptor_Private_0_7*
+ GetPPB_ContentDecryptor_Private_0_7_Thunk() {
+ return &g_ppb_contentdecryptor_private_thunk_0_7;
}
} // namespace thunk
« no previous file with comments | « ppapi/thunk/interfaces_ppb_private.h ('k') | ppapi/thunk/ppb_instance_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698