| Index: ppapi/proxy/serialized_structs.cc
|
| diff --git a/ppapi/proxy/serialized_structs.cc b/ppapi/proxy/serialized_structs.cc
|
| index 255865a65dc6e2baa4c61dd58eb68633c233dd0f..c88b70cd42c8aee9d18e663c92e63149c17c288b 100644
|
| --- a/ppapi/proxy/serialized_structs.cc
|
| +++ b/ppapi/proxy/serialized_structs.cc
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "base/pickle.h"
|
| #include "build/build_config.h"
|
| -#include "ppapi/c/dev/ppb_font_dev.h"
|
| #include "ppapi/c/pp_file_info.h"
|
| #include "ppapi/c/pp_rect.h"
|
| #include "ppapi/c/trusted/ppb_browser_font_trusted.h"
|
| @@ -28,20 +27,6 @@ SerializedFontDescription::SerializedFontDescription()
|
|
|
| SerializedFontDescription::~SerializedFontDescription() {}
|
|
|
| -void SerializedFontDescription::SetFromPPFontDescription(
|
| - const PP_FontDescription_Dev& desc) {
|
| - StringVar* string_var = StringVar::FromPPVar(desc.face);
|
| - face = string_var ? string_var->value() : std::string();
|
| -
|
| - family = desc.family;
|
| - size = desc.size;
|
| - weight = desc.weight;
|
| - italic = desc.italic;
|
| - small_caps = desc.small_caps;
|
| - letter_spacing = desc.letter_spacing;
|
| - word_spacing = desc.word_spacing;
|
| -}
|
| -
|
| void SerializedFontDescription::SetFromPPBrowserFontDescription(
|
| const PP_BrowserFont_Trusted_Description& desc) {
|
| StringVar* string_var = StringVar::FromPPVar(desc.face);
|
| @@ -56,18 +41,6 @@ void SerializedFontDescription::SetFromPPBrowserFontDescription(
|
| word_spacing = desc.word_spacing;
|
| }
|
|
|
| -void SerializedFontDescription::SetToPPFontDescription(
|
| - PP_FontDescription_Dev* desc) const {
|
| - desc->face = StringVar::StringToPPVar(face);
|
| - desc->family = static_cast<PP_FontFamily_Dev>(family);
|
| - desc->size = size;
|
| - desc->weight = static_cast<PP_FontWeight_Dev>(weight);
|
| - desc->italic = italic;
|
| - desc->small_caps = small_caps;
|
| - desc->letter_spacing = letter_spacing;
|
| - desc->word_spacing = word_spacing;
|
| -}
|
| -
|
| void SerializedFontDescription::SetToPPBrowserFontDescription(
|
| PP_BrowserFont_Trusted_Description* desc) const {
|
| desc->face = StringVar::StringToPPVar(face);
|
|
|