Refactor PPAPI proxy resource handling to maintain which host they came from,...

ppapi/proxy/serialized_structs.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef PPAPI_PROXY_SERIALIZED_STRUCTS_H_
 #define PPAPI_PROXY_SERIALIZED_STRUCTS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/shared_memory.h"
 #include "build/build_config.h"
+#include "ipc/ipc_platform_file.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_point.h"
 #include "ppapi/c/pp_rect.h"
-#include "ppapi/c/pp_resource.h"
+#include "ppapi/proxy/host_resource.h"
 #include "ppapi/proxy/serialized_var.h"
 
 struct PP_FontDescription_Dev;
 
 namespace pp {
 namespace proxy {
 
 class Dispatcher;
 
 // PP_FontDescript_Dev has to be redefined with a SerializedVar in place of
@@ skipping 39 matching lines @@
 struct SerializedDirEntry {
   std::string name;
   bool is_dir;
 };
 
 // Since there are so many parameters, DrawTextAt requires this separate
 // structure. This includes everything but the font name. Because the font name
 // is a var, it's much more convenient to use the normal way of passing a
 // PP_Var.
 struct PPBFont_DrawTextAt_Params {
-  PP_Resource font;
-  PP_Resource image_data;
+  HostResource font;
+  HostResource image_data;
   PP_Bool text_is_rtl;
   PP_Bool override_direction;
   PP_Point position;
   uint32_t color;
   PP_Rect clip;
   bool clip_is_null;
   PP_Bool image_data_is_opaque;
 };
 
 struct PPBFlash_DrawGlyphs_Params {
   PPBFlash_DrawGlyphs_Params();
   ~PPBFlash_DrawGlyphs_Params();
 
   PP_Instance instance;
-  PP_Resource pp_image_data;
+  HostResource image_data;
   SerializedFontDescription font_desc;
   uint32_t color;
   PP_Point position;
   PP_Rect clip;
   float transformation[3][3];
   std::vector<uint16_t> glyph_indices;
   std::vector<PP_Point> glyph_advances;
 };
 
+struct PPBAudio_NotifyAudioStreamCreated_Params {
+  pp::proxy::HostResource audio_id;
+  int32_t result_code;  // Will be != PP_OK on failure
+  IPC::PlatformFileForTransit socket_handle;
+  base::SharedMemoryHandle handle;
+  int32_t length;
+};
+
+struct PPBURLLoader_UpdateProgress_Params {
+  PP_Instance instance;
+  pp::proxy::HostResource resource;
+  int64_t bytes_sent;
+  int64_t total_bytes_to_be_sent;
+  int64_t bytes_received;
+  int64_t total_bytes_to_be_received;
+};
+
 #if defined(OS_WIN)
 typedef HANDLE ImageHandle;
 #elif defined(OS_MACOSX)
 typedef base::SharedMemoryHandle ImageHandle;
 #else
 // On X Windows this is a SysV shared memory key.
 typedef int ImageHandle;
 #endif
 
 }  // namespace proxy
 }  // namespace pp
 
 #endif  // PPAPI_PROXY_SERIALIZED_STRUCTS_H_