Rename EME WD call parameters

ppapi/cpp/private/content_decryptor_private.cc

 // 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.
 
 #include "ppapi/cpp/private/content_decryptor_private.h"
 
 #include <cstring>  // memcpy
 
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/c/private/ppb_content_decryptor_private.h"
@@ skipping 21 matching lines @@
 
   pp::Var key_system_var(pp::PASS_REF, key_system_arg);
   if (!key_system_var.is_string())
     return;
 
   static_cast<ContentDecryptor_Private*>(object)->Initialize(
       key_system_var.AsString());
 }
 
 void CreateSession(PP_Instance instance,
-                   uint32_t reference_id,
+                   uint32_t session_id,
                    PP_Var type_arg,
                    PP_Var init_data_arg) {
   void* object =
       Instance::GetPerInstanceObject(instance, kPPPContentDecryptorInterface);
   if (!object)
     return;
 
   pp::Var type_var(pp::PASS_REF, type_arg);
   if (!type_var.is_string())
     return;
 
   pp::Var init_data_var(pp::PASS_REF, init_data_arg);
   if (!init_data_var.is_array_buffer())
     return;
   pp::VarArrayBuffer init_data_array_buffer(init_data_var);
 
-  static_cast<ContentDecryptor_Private*>(object)->CreateSession(
-      reference_id, type_var.AsString(), init_data_array_buffer);
+  static_cast<ContentDecryptor_Private*>(object)
+      ->CreateSession(session_id, type_var.AsString(), init_data_array_buffer);

[ddorwin, 2013/12/05 00:44:52]

Weird break. Did a tool do this?

[jrummell, 2013/12/06 23:42:35]

clang-format.

 }
 
 void UpdateSession(PP_Instance instance,
-                   uint32_t reference_id,
+                   uint32_t session_id,
                    PP_Var response_arg) {
   void* object =
       Instance::GetPerInstanceObject(instance, kPPPContentDecryptorInterface);
   if (!object)
     return;
 
   pp::Var response_var(pp::PASS_REF, response_arg);
   if (!response_var.is_array_buffer())
     return;
   pp::VarArrayBuffer response(response_var);
 
   static_cast<ContentDecryptor_Private*>(object)
-      ->UpdateSession(reference_id, response);
+      ->UpdateSession(session_id, response);
 }
 
-void ReleaseSession(PP_Instance instance, uint32_t reference_id) {
+void ReleaseSession(PP_Instance instance, uint32_t session_id) {
   void* object =
       Instance::GetPerInstanceObject(instance, kPPPContentDecryptorInterface);
   if (!object)
     return;
 
-  static_cast<ContentDecryptor_Private*>(object)->ReleaseSession(reference_id);
+  static_cast<ContentDecryptor_Private*>(object)->ReleaseSession(session_id);
 }
 
 
 void Decrypt(PP_Instance instance,
              PP_Resource encrypted_resource,
              const PP_EncryptedBlockInfo* encrypted_block_info) {
   pp::Buffer_Dev encrypted_block(encrypted_resource);
 
   void* object =
       Instance::GetPerInstanceObject(instance, kPPPContentDecryptorInterface);
@@ skipping 102 matching lines @@
                                     &ppp_content_decryptor);
   instance->AddPerInstanceObject(kPPPContentDecryptorInterface, this);
 }
 
 ContentDecryptor_Private::~ContentDecryptor_Private() {
   Instance::RemovePerInstanceObject(associated_instance_,
                                     kPPPContentDecryptorInterface,
                                     this);
 }
 
-void ContentDecryptor_Private::SessionCreated(uint32_t reference_id,
-                                              const std::string& session_id) {
+void ContentDecryptor_Private::SessionCreated(
+    uint32_t session_id,
+    const std::string& web_session_id) {
   if (has_interface<PPB_ContentDecryptor_Private>()) {
-    pp::Var session_id_var(session_id);
+    pp::Var web_session_id_var(web_session_id);
     get_interface<PPB_ContentDecryptor_Private>()->SessionCreated(
         associated_instance_.pp_instance(),
-        reference_id,
-        session_id_var.pp_var());
+        session_id,
+        web_session_id_var.pp_var());
   }
 }
 
-void ContentDecryptor_Private::SessionMessage(uint32_t reference_id,
+void ContentDecryptor_Private::SessionMessage(uint32_t session_id,
                                               pp::VarArrayBuffer message,
                                               const std::string& default_url) {
   if (has_interface<PPB_ContentDecryptor_Private>()) {
     pp::Var default_url_var(default_url);
     get_interface<PPB_ContentDecryptor_Private>()->SessionMessage(
         associated_instance_.pp_instance(),
-        reference_id,
+        session_id,
         message.pp_var(),
         default_url_var.pp_var());
   }
 }
 
-void ContentDecryptor_Private::SessionReady(uint32_t reference_id) {
+void ContentDecryptor_Private::SessionReady(uint32_t session_id) {
   if (has_interface<PPB_ContentDecryptor_Private>()) {
     get_interface<PPB_ContentDecryptor_Private>()->SessionReady(
-        associated_instance_.pp_instance(), reference_id);
+        associated_instance_.pp_instance(), session_id);
   }
 }
 
-void ContentDecryptor_Private::SessionClosed(uint32_t reference_id) {
+void ContentDecryptor_Private::SessionClosed(uint32_t session_id) {
   if (has_interface<PPB_ContentDecryptor_Private>()) {
     get_interface<PPB_ContentDecryptor_Private>()->SessionClosed(
-        associated_instance_.pp_instance(), reference_id);
+        associated_instance_.pp_instance(), session_id);
   }
 }
 
-void ContentDecryptor_Private::SessionError(uint32_t reference_id,
+void ContentDecryptor_Private::SessionError(uint32_t session_id,
                                             int32_t media_error,
                                             int32_t system_code) {
   if (has_interface<PPB_ContentDecryptor_Private>()) {
     get_interface<PPB_ContentDecryptor_Private>()->SessionError(
         associated_instance_.pp_instance(),
-        reference_id,
+        session_id,
         media_error,
         system_code);
   }
 }
 
 void ContentDecryptor_Private::DeliverBlock(
     pp::Buffer_Dev decrypted_block,
     const PP_DecryptedBlockInfo& decrypted_block_info) {
   if (has_interface<PPB_ContentDecryptor_Private>()) {
     get_interface<PPB_ContentDecryptor_Private>()->DeliverBlock(
@@ skipping 54 matching lines @@
     const PP_DecryptedSampleInfo& decrypted_sample_info) {
   if (has_interface<PPB_ContentDecryptor_Private>()) {
     get_interface<PPB_ContentDecryptor_Private>()->DeliverSamples(
         associated_instance_.pp_instance(),
         audio_frames.pp_resource(),
         &decrypted_sample_info);
   }
 }
 
 }  // namespace pp