Move host resource from the proxy to the shared_impl.

ppapi/proxy/ppapi_param_traits.cc

 // Copyright (c) 2011 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/ppapi_param_traits.h"
 
 #include <string.h>  // For memcpy
 
 #include "ppapi/c/pp_file_info.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/private/ppb_flash_tcp_socket.h"
-#include "ppapi/proxy/host_resource.h"
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/serialized_var.h"
 #include "ppapi/proxy/serialized_flash_menu.h"
+#include "ppapi/shared_impl/host_resource.h"
 
 namespace IPC {
 
 namespace {
 
 // Deserializes a vector from IPC. This special version must be used instead
 // of the default IPC version when the vector contains a SerializedVar, either
 // directly or indirectly (i.e. a vector of objects that have a SerializedVar
 // inside them).
 //
@@ skipping 163 matching lines @@
 void ParamTraits<PP_ObjectProperty>::Log(const param_type& p, std::string* l) {
 }
 
 // PPBFlash_DrawGlyphs_Params --------------------------------------------------
 
 // static
 void ParamTraits<pp::proxy::PPBFlash_DrawGlyphs_Params>::Write(
     Message* m,
     const param_type& p) {
   ParamTraits<PP_Instance>::Write(m, p.instance);
-  ParamTraits<pp::proxy::HostResource>::Write(m, p.image_data);
+  ParamTraits<ppapi::HostResource>::Write(m, p.image_data);
   ParamTraits<pp::proxy::SerializedFontDescription>::Write(m, p.font_desc);
   ParamTraits<uint32_t>::Write(m, p.color);
   ParamTraits<PP_Point>::Write(m, p.position);
   ParamTraits<PP_Rect>::Write(m, p.clip);
   ParamTraits<float>::Write(m, p.transformation[0][0]);
   ParamTraits<float>::Write(m, p.transformation[0][1]);
   ParamTraits<float>::Write(m, p.transformation[0][2]);
   ParamTraits<float>::Write(m, p.transformation[1][0]);
   ParamTraits<float>::Write(m, p.transformation[1][1]);
   ParamTraits<float>::Write(m, p.transformation[1][2]);
   ParamTraits<float>::Write(m, p.transformation[2][0]);
   ParamTraits<float>::Write(m, p.transformation[2][1]);
   ParamTraits<float>::Write(m, p.transformation[2][2]);
   ParamTraits<std::vector<uint16_t> >::Write(m, p.glyph_indices);
   ParamTraits<std::vector<PP_Point> >::Write(m, p.glyph_advances);
 }
 
 // static
 bool ParamTraits<pp::proxy::PPBFlash_DrawGlyphs_Params>::Read(
     const Message* m,
     void** iter,
     param_type* r) {
   return
       ParamTraits<PP_Instance>::Read(m, iter, &r->instance) &&
-      ParamTraits<pp::proxy::HostResource>::Read(m, iter,
-                                                       &r->image_data) &&
+      ParamTraits<ppapi::HostResource>::Read(m, iter, &r->image_data) &&
       ParamTraits<pp::proxy::SerializedFontDescription>::Read(m, iter,
                                                               &r->font_desc) &&
       ParamTraits<uint32_t>::Read(m, iter, &r->color) &&
       ParamTraits<PP_Point>::Read(m, iter, &r->position) &&
       ParamTraits<PP_Rect>::Read(m, iter, &r->clip) &&
       ParamTraits<float>::Read(m, iter, &r->transformation[0][0]) &&
       ParamTraits<float>::Read(m, iter, &r->transformation[0][1]) &&
       ParamTraits<float>::Read(m, iter, &r->transformation[0][2]) &&
       ParamTraits<float>::Read(m, iter, &r->transformation[1][0]) &&
       ParamTraits<float>::Read(m, iter, &r->transformation[1][1]) &&
@@ skipping 11 matching lines @@
     const param_type& p,
     std::string* l) {
 }
 
 // PPBFileRef_CreateInfo -------------------------------------------------------
 
 // static
 void ParamTraits<pp::proxy::PPBFileRef_CreateInfo>::Write(
     Message* m,
     const param_type& p) {
-  ParamTraits<pp::proxy::HostResource>::Write(m, p.resource);
+  ParamTraits<ppapi::HostResource>::Write(m, p.resource);
   ParamTraits<int>::Write(m, p.file_system_type);
   ParamTraits<pp::proxy::SerializedVar>::Write(m, p.path);
   ParamTraits<pp::proxy::SerializedVar>::Write(m, p.name);
 }
 
 // static
 bool ParamTraits<pp::proxy::PPBFileRef_CreateInfo>::Read(const Message* m,
                                                          void** iter,
                                                          param_type* r) {
   return
-      ParamTraits<pp::proxy::HostResource>::Read(m, iter, &r->resource) &&
+      ParamTraits<ppapi::HostResource>::Read(m, iter, &r->resource) &&
       ParamTraits<int>::Read(m, iter, &r->file_system_type) &&
       ParamTraits<pp::proxy::SerializedVar>::Read(m, iter, &r->path) &&
       ParamTraits<pp::proxy::SerializedVar>::Read(m, iter, &r->name);
 }
 
 // static
 void ParamTraits<pp::proxy::PPBFileRef_CreateInfo>::Log(
     const param_type& p,
     std::string* l) {
 }
 
 // PPBURLLoader_UpdateProgress_Params ------------------------------------------
 
 // static
 void ParamTraits<pp::proxy::PPBURLLoader_UpdateProgress_Params>::Write(
     Message* m,
     const param_type& p) {
   ParamTraits<PP_Instance>::Write(m, p.instance);
-  ParamTraits<pp::proxy::HostResource>::Write(m, p.resource);
+  ParamTraits<ppapi::HostResource>::Write(m, p.resource);
   ParamTraits<int64_t>::Write(m, p.bytes_sent);
   ParamTraits<int64_t>::Write(m, p.total_bytes_to_be_sent);
   ParamTraits<int64_t>::Write(m, p.bytes_received);
   ParamTraits<int64_t>::Write(m, p.total_bytes_to_be_received);
 }
 
 // static
 bool ParamTraits<pp::proxy::PPBURLLoader_UpdateProgress_Params>::Read(
     const Message* m,
     void** iter,
     param_type* r) {
   return
       ParamTraits<PP_Instance>::Read(m, iter, &r->instance) &&
-      ParamTraits<pp::proxy::HostResource>::Read(m, iter, &r->resource) &&
+      ParamTraits<ppapi::HostResource>::Read(m, iter, &r->resource) &&
       ParamTraits<int64_t>::Read(m, iter, &r->bytes_sent) &&
       ParamTraits<int64_t>::Read(m, iter, &r->total_bytes_to_be_sent) &&
       ParamTraits<int64_t>::Read(m, iter, &r->bytes_received) &&
       ParamTraits<int64_t>::Read(m, iter, &r->total_bytes_to_be_received);
 }
 
 // static
 void ParamTraits<pp::proxy::PPBURLLoader_UpdateProgress_Params>::Log(
     const param_type& p,
     std::string* l) {
@@ skipping 52 matching lines @@
       ParamTraits<int32_t>::Read(m, iter, &r->letter_spacing) &&
       ParamTraits<int32_t>::Read(m, iter, &r->word_spacing);
 }
 
 // static
 void ParamTraits<pp::proxy::SerializedFontDescription>::Log(
     const param_type& p,
     std::string* l) {
 }
 
-// HostResource ----------------------------------------------------------
+// HostResource ----------------------------------------------------------------
 
 // static
-void ParamTraits<pp::proxy::HostResource>::Write(Message* m,
+void ParamTraits<ppapi::HostResource>::Write(Message* m,
                                                  const param_type& p) {
   ParamTraits<PP_Instance>::Write(m, p.instance());
   ParamTraits<PP_Resource>::Write(m, p.host_resource());
 }
 
 // static
-bool ParamTraits<pp::proxy::HostResource>::Read(const Message* m,
+bool ParamTraits<ppapi::HostResource>::Read(const Message* m,
                                                 void** iter,
                                                 param_type* r) {
   PP_Instance instance;
   PP_Resource resource;
   if (!ParamTraits<PP_Instance>::Read(m, iter, &instance) ||
       !ParamTraits<PP_Resource>::Read(m, iter, &resource))
     return false;
   r->SetHostResource(instance, resource);
   return true;
 }
 
 // static
-void ParamTraits<pp::proxy::HostResource>::Log(const param_type& p,
-                                               std::string* l) {
+void ParamTraits<ppapi::HostResource>::Log(const param_type& p,
+                                           std::string* l) {
 }
 
 // SerializedVar ---------------------------------------------------------------
 
 // static
 void ParamTraits<pp::proxy::SerializedVar>::Write(Message* m,
                                                   const param_type& p) {
   p.WriteToMessage(m);
 }
 
@@ skipping 67 matching lines @@
                                                        param_type* r) {
   return r->ReadFromMessage(m, iter);
 }
 
 // static
 void ParamTraits<pp::proxy::SerializedFlashMenu>::Log(const param_type& p,
                                                       std::string* l) {
 }
 
 }  // namespace IPC