[PPAPI] ResourceVar now holds a pending renderer and browser host ID.

ppapi/proxy/raw_var_data.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/raw_var_data.h"
 
 #include <stack>
 
 #include "base/containers/hash_tables.h"
 #include "base/stl_util.h"
@@ skipping 647 matching lines @@
     if (!m->ReadString(iter, &key))
       return false;
     if (!m->ReadUInt32(iter, &value))
       return false;
     children_.push_back(make_pair(key, value));
   }
   return true;
 }
 
 // ResourceRawVarData ----------------------------------------------------------
-ResourceRawVarData::ResourceRawVarData() {
-}
+ResourceRawVarData::ResourceRawVarData()
+    : pp_resource_(0),
+      pending_renderer_host_id_(0),
+      pending_browser_host_id_(0) {}
 
 ResourceRawVarData::~ResourceRawVarData() {
 }
 
 PP_VarType ResourceRawVarData::Type() {
   return PP_VARTYPE_RESOURCE;
 }
 
 bool ResourceRawVarData::Init(const PP_Var& var, PP_Instance /*instance*/) {
   DCHECK(var.type == PP_VARTYPE_RESOURCE);
   ResourceVar* resource_var = ResourceVar::FromPPVar(var);
   if (!resource_var)
     return false;
   pp_resource_ = resource_var->GetPPResource();
   const IPC::Message* message = resource_var->GetCreationMessage();
   if (message)
     creation_message_.reset(new IPC::Message(*message));
   else
     creation_message_.reset();
+  pending_renderer_host_id_ = resource_var->GetPendingRendererHostId();
+  pending_browser_host_id_ = resource_var->GetPendingBrowserHostId();
   initialized_ = true;
   return true;
 }
 
 PP_Var ResourceRawVarData::CreatePPVar(PP_Instance instance) {
   // If pp_resource_ is NULL, it could be because we are on the plugin side and
   // there is a pending resource host on the renderer.
   // TODO(mgiuca): Create a plugin-side resource in this case.
   // Currently, this should never occur. This will be needed when passing a
   // resource from the renderer to the plugin (http://crbug.com/177017).
   DCHECK(pp_resource_);
 
   return PpapiGlobals::Get()->GetVarTracker()->MakeResourcePPVar(pp_resource_);
 }
 
 void ResourceRawVarData::PopulatePPVar(const PP_Var& var,
                                        const std::vector<PP_Var>& graph) {
 }
 
 void ResourceRawVarData::Write(IPC::Message* m,
                                const HandleWriter& handle_writer) {
   m->WriteInt(static_cast<int>(pp_resource_));
+  m->WriteInt(static_cast<int>(pending_renderer_host_id_));
+  m->WriteInt(static_cast<int>(pending_browser_host_id_));

[dmichael (off chromium), 2013/09/25 21:25:15]

These are already int, right? So no need to static_cast.

[Matt Giuca, 2013/09/25 23:57:00]

Done. Good catch.

   m->WriteBool(creation_message_);
   if (creation_message_)
     IPC::ParamTraits<IPC::Message>::Write(m, *creation_message_);
 }
 
 bool ResourceRawVarData::Read(PP_VarType type,
                               const IPC::Message* m,
                               PickleIterator* iter) {
   int value;
   if (!m->ReadInt(iter, &value))
     return false;
   pp_resource_ = static_cast<PP_Resource>(value);
+  if (!m->ReadInt(iter, &pending_renderer_host_id_))
+    return false;
+  if (!m->ReadInt(iter, &pending_browser_host_id_))
+    return false;
   bool has_creation_message;
   if (!m->ReadBool(iter, &has_creation_message))
     return false;
   if (has_creation_message) {
     creation_message_.reset(new IPC::Message());
     if (!IPC::ParamTraits<IPC::Message>::Read(m, iter, creation_message_.get()))
       return false;
   } else {
     creation_message_.reset();
   }
   return true;
 }
 
 }  // namespace proxy
 }  // namespace ppapi