| Index: ppapi/proxy/serialized_structs.h
|
| diff --git a/ppapi/proxy/serialized_structs.h b/ppapi/proxy/serialized_structs.h
|
| index ac9494d329639304d16b51ec046b56fcc9342705..1779fd8b72fb07abfe7c28111b6e007cb7317cdb 100644
|
| --- a/ppapi/proxy/serialized_structs.h
|
| +++ b/ppapi/proxy/serialized_structs.h
|
| @@ -16,7 +16,7 @@
|
| #include "ppapi/c/pp_instance.h"
|
| #include "ppapi/c/pp_point.h"
|
| #include "ppapi/c/pp_rect.h"
|
| -#include "ppapi/proxy/serialized_var.h"
|
| +#include "ppapi/proxy/ppapi_proxy_export.h"
|
| #include "ppapi/shared_impl/host_resource.h"
|
|
|
| class Pickle;
|
| @@ -25,39 +25,23 @@ struct PP_FontDescription_Dev;
|
| namespace ppapi {
|
| namespace proxy {
|
|
|
| -class Dispatcher;
|
| -
|
| -// PP_FontDescript_Dev has to be redefined with a SerializedVar in place of
|
| -// the PP_Var used for the face name.
|
| +// PP_FontDescript_Dev has to be redefined with a string in place of the PP_Var
|
| +// used for the face name.
|
| struct PPAPI_PROXY_EXPORT SerializedFontDescription {
|
| SerializedFontDescription();
|
| ~SerializedFontDescription();
|
|
|
| // Converts a PP_FontDescription_Dev to a SerializedFontDescription.
|
| //
|
| - // If source_owns_ref is true, the reference owned by the
|
| - // PP_FontDescription_Dev will be unchanged and the caller is responsible for
|
| - // freeing it. When false, the SerializedFontDescription will take ownership
|
| - // of the ref. This is the difference between serializing as an input value
|
| - // (owns_ref = true) and an output value (owns_ref = true).
|
| - void SetFromPPFontDescription(Dispatcher* dispatcher,
|
| - const PP_FontDescription_Dev& desc,
|
| - bool source_owns_ref);
|
| + // The reference of |face| owned by the PP_FontDescription_Dev will be
|
| + // unchanged and the caller is responsible for freeing it.
|
| + void SetFromPPFontDescription(const PP_FontDescription_Dev& desc);
|
|
|
| // Converts to a PP_FontDescription_Dev. The face name will have one ref
|
| - // assigned to it on behalf of the caller.
|
| - //
|
| - // If dest_owns_ref is set, the resulting PP_FontDescription_Dev will keep a
|
| - // reference to any strings we made on its behalf even when the
|
| - // SerializedFontDescription goes away. When false, ownership of the ref will
|
| - // stay with the SerializedFontDescription and the PP_FontDescription_Dev
|
| - // will just refer to that one. This is the difference between deserializing
|
| - // as an input value (owns_ref = false) and an output value (owns_ref = true).
|
| - void SetToPPFontDescription(Dispatcher* dispatcher,
|
| - PP_FontDescription_Dev* desc,
|
| - bool dest_owns_ref) const;
|
| -
|
| - SerializedVar face;
|
| + // assigned to it. The caller is responsible for freeing it.
|
| + void SetToPPFontDescription(PP_FontDescription_Dev* desc) const;
|
| +
|
| + std::string face;
|
| int32_t family;
|
| uint32_t size;
|
| int32_t weight;
|
|
|