diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-17 19:39:42 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-17 19:39:42 +0000 |
commit | ea47b6a802638fa18df618d5ba71dc4b5b3b4c48 (patch) | |
tree | 6c1cc5a5aac4c5c8dd81fbee7b2f87652ab1b823 /ui/gfx/image | |
parent | 48c18de8a9e3a35f5a829e7fb01e76d80e5b596e (diff) | |
download | chromium_src-ea47b6a802638fa18df618d5ba71dc4b5b3b4c48.zip chromium_src-ea47b6a802638fa18df618d5ba71dc4b5b3b4c48.tar.gz chromium_src-ea47b6a802638fa18df618d5ba71dc4b5b3b4c48.tar.bz2 |
Introduce ui.dll / libui.so for the component build.
R=ben@chromium.org
Review URL: http://codereview.chromium.org/7328011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92819 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/image')
-rw-r--r-- | ui/gfx/image/image.h | 6 | ||||
-rw-r--r-- | ui/gfx/image/image_util.h | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/ui/gfx/image/image.h b/ui/gfx/image/image.h index a57b519..6f6d161 100644 --- a/ui/gfx/image/image.h +++ b/ui/gfx/image/image.h @@ -23,8 +23,8 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" -#include "build/build_config.h" -#include "ui/gfx/native_widget_types.h" // Forward-declares GdkPixbuf and NSImage. +#include "ui/gfx/native_widget_types.h" +#include "ui/ui_api.h" class SkBitmap; @@ -40,7 +40,7 @@ class ImageRep; class ImageStorage; } -class Image { +class UI_API Image { public: enum RepresentationType { kImageRepGdk, diff --git a/ui/gfx/image/image_util.h b/ui/gfx/image/image_util.h index b207830..a702dae 100644 --- a/ui/gfx/image/image_util.h +++ b/ui/gfx/image/image_util.h @@ -9,6 +9,7 @@ #include <vector> #include "base/basictypes.h" +#include "ui/ui_api.h" namespace gfx { class Image; @@ -18,12 +19,13 @@ namespace gfx { // Creates an image from the given PNG-encoded input. The caller owns the // returned Image. If there was an error creating the image, returns NULL. -Image* ImageFromPNGEncodedData(const unsigned char* input, size_t input_size); +UI_API Image* ImageFromPNGEncodedData(const unsigned char* input, + size_t input_size); // Fills the |dst| vector with PNG-encoded bytes based on the given Image. // Returns true if the Image was encoded successfully. -bool PNGEncodedDataFromImage(const Image& image, - std::vector<unsigned char>* dst); +UI_API bool PNGEncodedDataFromImage(const Image& image, + std::vector<unsigned char>* dst); } |