Refactor PPAPI proxy resource handling to maintain which host they came from,
and to map back to that host when calling functions on them. Adds a mapping
between resources generated by the hosts to a new list inside the plugin so
there can't be overlaps.
This means there are now two meanings for a PP_Resource, one in the plugin
process and one in the host process. This is potentially very confusing. I
introduced a new object called a HostResource that always represents a
"host" PP_Resource to try to prevent errors. In the plugin side of the proxy,
it only deals with PP_Resources valid in the plugin, and SerializedResources
valid in the host. It also encapsulates the associated instance, which
simplifies some code.
Each PluginResource object maintains its SerializedResource which the proxy
uses to send to the host for requests. This requires getting the PluginResource
object in more proxy calls.
This fixes a bug in var sending introduced in my previous patch. The var
releasing from EndSendPassRef used the host var rather than the plugin var. I
had to add more plumbing to get the dispatcher at this location and convert
to a plugin var.
I removed the separate file for ImageData and put it in ppb_image_data_proxy
like for the other resource types.
TEST=some unit tests included
BUG=none
Review URL: http://codereview.chromium.org/6334016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72879 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ppapi/proxy/ppapi_param_traits.h b/ppapi/proxy/ppapi_param_traits.h
index fea2594d..3a7358d 100644
--- a/ppapi/proxy/ppapi_param_traits.h
+++ b/ppapi/proxy/ppapi_param_traits.h
@@ -1,4 +1,4 @@
-// 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.
@@ -11,20 +11,24 @@
#include "ppapi/c/pp_input_event.h"
#include "ppapi/c/pp_rect.h"
#include "ppapi/c/pp_var.h"
-#include "ppapi/proxy/serialized_var.h" // TODO(brettw) eraseme.
struct PP_FileInfo_Dev;
struct PP_ObjectProperty;
namespace pp {
namespace proxy {
+
+struct PPBAudio_NotifyAudioStreamCreated_Params;
struct PPBFlash_DrawGlyphs_Params;
struct PPBFont_DrawTextAt_Params;
+struct PPBURLLoader_UpdateProgress_Params;
struct SerializedDirEntry;
struct SerializedFontDescription;
+class HostResource;
class SerializedVar;
-}
-}
+
+} // namespace proxy
+} // namespace pp
namespace IPC {
@@ -84,6 +88,14 @@
static void Log(const param_type& p, std::string* l);
};
+template<> struct ParamTraits<
+ pp::proxy::PPBAudio_NotifyAudioStreamCreated_Params> {
+ typedef pp::proxy::PPBAudio_NotifyAudioStreamCreated_Params param_type;
+ static void Write(Message* m, const param_type& p);
+ static bool Read(const Message* m, void** iter, param_type* r);
+ static void Log(const param_type& p, std::string* l);
+};
+
template<>
struct ParamTraits<pp::proxy::PPBFlash_DrawGlyphs_Params> {
typedef pp::proxy::PPBFlash_DrawGlyphs_Params param_type;
@@ -101,6 +113,14 @@
};
template<>
+struct ParamTraits<pp::proxy::PPBURLLoader_UpdateProgress_Params> {
+ typedef pp::proxy::PPBURLLoader_UpdateProgress_Params param_type;
+ static void Write(Message* m, const param_type& p);
+ static bool Read(const Message* m, void** iter, param_type* r);
+ static void Log(const param_type& p, std::string* l);
+};
+
+template<>
struct ParamTraits<pp::proxy::SerializedDirEntry> {
typedef pp::proxy::SerializedDirEntry param_type;
static void Write(Message* m, const param_type& p);
@@ -117,6 +137,14 @@
};
template<>
+struct ParamTraits<pp::proxy::HostResource> {
+ typedef pp::proxy::HostResource param_type;
+ static void Write(Message* m, const param_type& p);
+ static bool Read(const Message* m, void** iter, param_type* r);
+ static void Log(const param_type& p, std::string* l);
+};
+
+template<>
struct ParamTraits<pp::proxy::SerializedVar> {
typedef pp::proxy::SerializedVar param_type;
static void Write(Message* m, const param_type& p);
