| Index: services/ui/public/cpp/property_type_converters.h
|
| diff --git a/services/ui/public/cpp/property_type_converters.h b/services/ui/public/cpp/property_type_converters.h
|
| index b249725fa521cd5f62d76f6c1171199d64399e66..ef59467375785c6a3839355607efb0e4d5f88a7e 100644
|
| --- a/services/ui/public/cpp/property_type_converters.h
|
| +++ b/services/ui/public/cpp/property_type_converters.h
|
| @@ -10,6 +10,7 @@
|
|
|
| #include "base/strings/string16.h"
|
| #include "mojo/public/cpp/bindings/type_converter.h"
|
| +#include "services/ui/public/cpp/ui_export.h"
|
|
|
| class SkBitmap;
|
|
|
| @@ -27,67 +28,67 @@ namespace mojo {
|
| // replaced with the skia.Bitmap mojom struct serialization.
|
|
|
| template <>
|
| -struct TypeConverter<std::vector<uint8_t>, gfx::Rect> {
|
| +struct UI_EXPORT TypeConverter<std::vector<uint8_t>, gfx::Rect> {
|
| static std::vector<uint8_t> Convert(const gfx::Rect& input);
|
| };
|
| template <>
|
| -struct TypeConverter<gfx::Rect, std::vector<uint8_t>> {
|
| +struct UI_EXPORT TypeConverter<gfx::Rect, std::vector<uint8_t>> {
|
| static gfx::Rect Convert(const std::vector<uint8_t>& input);
|
| };
|
|
|
| template <>
|
| -struct TypeConverter<std::vector<uint8_t>, gfx::Size> {
|
| +struct UI_EXPORT TypeConverter<std::vector<uint8_t>, gfx::Size> {
|
| static std::vector<uint8_t> Convert(const gfx::Size& input);
|
| };
|
| template <>
|
| -struct TypeConverter<gfx::Size, std::vector<uint8_t>> {
|
| +struct UI_EXPORT TypeConverter<gfx::Size, std::vector<uint8_t>> {
|
| static gfx::Size Convert(const std::vector<uint8_t>& input);
|
| };
|
|
|
| template <>
|
| -struct TypeConverter<std::vector<uint8_t>, int32_t> {
|
| +struct UI_EXPORT TypeConverter<std::vector<uint8_t>, int32_t> {
|
| static std::vector<uint8_t> Convert(const int32_t& input);
|
| };
|
| template <>
|
| -struct TypeConverter<int32_t, std::vector<uint8_t>> {
|
| +struct UI_EXPORT TypeConverter<int32_t, std::vector<uint8_t>> {
|
| static int32_t Convert(const std::vector<uint8_t>& input);
|
| };
|
|
|
| template <>
|
| -struct TypeConverter<std::vector<uint8_t>, base::string16> {
|
| +struct UI_EXPORT TypeConverter<std::vector<uint8_t>, base::string16> {
|
| static std::vector<uint8_t> Convert(const base::string16& input);
|
| };
|
| template <>
|
| -struct TypeConverter<base::string16, std::vector<uint8_t>> {
|
| +struct UI_EXPORT TypeConverter<base::string16, std::vector<uint8_t>> {
|
| static base::string16 Convert(const std::vector<uint8_t>& input);
|
| };
|
|
|
| template <>
|
| -struct TypeConverter<std::vector<uint8_t>, std::string> {
|
| +struct UI_EXPORT TypeConverter<std::vector<uint8_t>, std::string> {
|
| static std::vector<uint8_t> Convert(const std::string& input);
|
| };
|
| template <>
|
| -struct TypeConverter<std::string, std::vector<uint8_t>> {
|
| +struct UI_EXPORT TypeConverter<std::string, std::vector<uint8_t>> {
|
| static std::string Convert(const std::vector<uint8_t>& input);
|
| };
|
|
|
| // NOTE: These methods only serialize and deserialize the common case of RGBA
|
| // 8888 bitmaps with premultiplied alpha.
|
| template <>
|
| -struct TypeConverter<std::vector<uint8_t>, SkBitmap> {
|
| +struct UI_EXPORT TypeConverter<std::vector<uint8_t>, SkBitmap> {
|
| static std::vector<uint8_t> Convert(const SkBitmap& input);
|
| };
|
| template <>
|
| -struct TypeConverter<SkBitmap, std::vector<uint8_t>> {
|
| +struct UI_EXPORT TypeConverter<SkBitmap, std::vector<uint8_t>> {
|
| static SkBitmap Convert(const std::vector<uint8_t>& input);
|
| };
|
|
|
| template <>
|
| -struct TypeConverter<std::vector<uint8_t>, bool> {
|
| +struct UI_EXPORT TypeConverter<std::vector<uint8_t>, bool> {
|
| static std::vector<uint8_t> Convert(bool input);
|
| };
|
| template <>
|
| -struct TypeConverter<bool, std::vector<uint8_t>> {
|
| +struct UI_EXPORT TypeConverter<bool, std::vector<uint8_t>> {
|
| static bool Convert(const std::vector<uint8_t>& input);
|
| };
|
|
|
|
|