Move host resource from the proxy to the shared_impl.
This is needed by my new unified resoruce tracker, which will use this file from the shared_impl in the new resource base object.
I fixed up the namespaces for the callers. Longer term, I want to put the
proxy in the ppapi namespace which will eliminate some of this mess.
Review URL: http://codereview.chromium.org/7623018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96678 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ppapi/proxy/serialized_structs.h b/ppapi/proxy/serialized_structs.h
index dd833963..dac6540 100644
--- a/ppapi/proxy/serialized_structs.h
+++ b/ppapi/proxy/serialized_structs.h
@@ -15,8 +15,8 @@
#include "ppapi/c/pp_instance.h"
#include "ppapi/c/pp_point.h"
#include "ppapi/c/pp_rect.h"
-#include "ppapi/proxy/host_resource.h"
#include "ppapi/proxy/serialized_var.h"
+#include "ppapi/shared_impl/host_resource.h"
struct PP_FontDescription_Dev;
@@ -75,7 +75,7 @@
struct PPBFileRef_CreateInfo {
PPBFileRef_CreateInfo(); // Initializes to 0.
- HostResource resource;
+ ppapi::HostResource resource;
int file_system_type; // One of PP_FileSystemType values.
SerializedVar path;
SerializedVar name;
@@ -86,7 +86,7 @@
~PPBFlash_DrawGlyphs_Params();
PP_Instance instance;
- HostResource image_data;
+ ppapi::HostResource image_data;
SerializedFontDescription font_desc;
uint32_t color;
PP_Point position;
@@ -97,7 +97,7 @@
};
struct PPBAudio_NotifyAudioStreamCreated_Params {
- pp::proxy::HostResource audio_id;
+ ppapi::HostResource audio_id;
int32_t result_code; // Will be != PP_OK on failure
IPC::PlatformFileForTransit socket_handle;
base::SharedMemoryHandle handle;
@@ -106,7 +106,7 @@
struct PPBURLLoader_UpdateProgress_Params {
PP_Instance instance;
- pp::proxy::HostResource resource;
+ ppapi::HostResource resource;
int64_t bytes_sent;
int64_t total_bytes_to_be_sent;
int64_t bytes_received;
@@ -114,7 +114,7 @@
};
struct PPPVideoCapture_Buffer {
- pp::proxy::HostResource resource;
+ ppapi::HostResource resource;
uint32_t size;
base::SharedMemoryHandle handle;
};
