Hookup RawVarData to SerializedVar

ppapi/proxy/handle_converter.cc

 // Copyright (c) 2013 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/proxy/handle_converter.h"
 
 #include <vector>
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "ppapi/proxy/ppapi_messages.h"
@@ skipping 26 matching lines @@
 // See ConvertHandlesImpl for how these get used.
 void ConvertHandlesInParam(const ppapi::proxy::SerializedHandle& handle,
                            Handles* handles,
                            IPC::Message* msg,
                            int* handle_index) {
   handles->push_back(handle);
   if (msg)
     WriteHandle((*handle_index)++, handle, msg);
 }
 
+void HandleWriter(int* handle_index,
+                  IPC::Message* m,
+                  const ppapi::proxy::SerializedHandle& handle) {
+  WriteHandle((*handle_index)++, handle, m);
+}
+
 void ConvertHandlesInParam(const ppapi::proxy::SerializedVar& var,
                            Handles* handles,
                            IPC::Message* msg,
                            int* handle_index) {
-  ppapi::proxy::SerializedHandle *handle = var.GetPluginShmemHandle();
-  if (handle) {
-    handles->push_back(*handle);
-    if (msg) {
-      var.WriteRawVarHeader(msg);
-      WriteHandle((*handle_index)++, *handle, msg);
-    }
-  }
+  if (!var.raw_var_data())
+    return;
+
+  std::vector<ppapi::proxy::SerializedHandle*> var_handles =
+      var.raw_var_data()->GetHandles();
+  if (var_handles.empty())
+    return;
+
+  for (size_t i = 0; i < var_handles.size(); ++i)
+    handles->push_back(*var_handles[i]);
+  if (msg)
+    var.raw_var_data()->Write(msg, base::Bind(&HandleWriter, handle_index));
 }
 
 // For PpapiMsg_ResourceReply and the reply to PpapiHostMsg_ResourceSyncCall,
 // the handles are carried inside the ResourceMessageReplyParams.
 // NOTE: We only translate handles from host->NaCl. The only kind of
 //       ResourceMessageParams that travels this direction is
 //       ResourceMessageReplyParams, so that's the only one we need to handle.
 void ConvertHandlesInParam(
     const ppapi::proxy::ResourceMessageReplyParams& params,
     Handles* handles,
@@ skipping 200 matching lines @@
   DCHECK(msg.is_sync());
 
   int msg_id = IPC::SyncMessage::GetMessageId(msg);
   DCHECK(pending_sync_msgs_.find(msg_id) == pending_sync_msgs_.end());
 
   pending_sync_msgs_[msg_id] = msg.type();
 }
 
 }  // namespace proxy
 }  // namespace ppapi