summaryrefslogtreecommitdiffstats
path: root/ui/gfx/image
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-29 20:08:19 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-29 20:08:19 +0000
commit7ff3773c5d5eb95544cf53e3fb203c19cca6ad40 (patch)
treeba10aaaf5c7423d7b660941501bf3d5ba423f844 /ui/gfx/image
parentfdce4788af32cb9af8d77361cfddb96249263437 (diff)
downloadchromium_src-7ff3773c5d5eb95544cf53e3fb203c19cca6ad40.zip
chromium_src-7ff3773c5d5eb95544cf53e3fb203c19cca6ad40.tar.gz
chromium_src-7ff3773c5d5eb95544cf53e3fb203c19cca6ad40.tar.bz2
Add service to update GAIA info
BUG=91241 TEST= Review URL: http://codereview.chromium.org/8587024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112006 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/image')
-rw-r--r--ui/gfx/image/image_unittest_util.cc36
-rw-r--r--ui/gfx/image/image_unittest_util.h6
2 files changed, 42 insertions, 0 deletions
diff --git a/ui/gfx/image/image_unittest_util.cc b/ui/gfx/image/image_unittest_util.cc
index 8690542..60b16fd 100644
--- a/ui/gfx/image/image_unittest_util.cc
+++ b/ui/gfx/image/image_unittest_util.cc
@@ -28,6 +28,42 @@ SkBitmap* CreateBitmap(int width, int height) {
return bitmap;
}
+gfx::Image CreateImage() {
+ return gfx::Image(CreateBitmap(100, 50));
+}
+
+bool IsEqual(const gfx::Image& image1, const gfx::Image& image2) {
+ const SkBitmap& bmp1 = *image1.ToSkBitmap();
+ const SkBitmap& bmp2 = *image2.ToSkBitmap();
+
+ if (bmp1.width() != bmp2.width() ||
+ bmp1.height() != bmp2.height() ||
+ bmp1.config() != SkBitmap::kARGB_8888_Config ||
+ bmp2.config() != SkBitmap::kARGB_8888_Config) {
+ return false;
+ }
+
+ SkAutoLockPixels lock1(bmp1);
+ SkAutoLockPixels lock2(bmp2);
+ if (!bmp1.getPixels() || !bmp2.getPixels())
+ return false;
+
+ for (int y = 0; y < bmp1.height(); ++y) {
+ for (int x = 0; x < bmp1.width(); ++x) {
+ if (*bmp1.getAddr32(x,y) != *bmp2.getAddr32(x,y))
+ return false;
+ }
+ }
+
+ return true;
+}
+
+bool IsEmpty(const gfx::Image& image) {
+ const SkBitmap& bmp = *image.ToSkBitmap();
+ return bmp.isNull() ||
+ (bmp.width() == 0 && bmp.height() == 0);
+}
+
PlatformImage CreatePlatformImage() {
scoped_ptr<SkBitmap> bitmap(CreateBitmap(25, 25));
#if defined(OS_MACOSX)
diff --git a/ui/gfx/image/image_unittest_util.h b/ui/gfx/image/image_unittest_util.h
index e46c412..fb471b9 100644
--- a/ui/gfx/image/image_unittest_util.h
+++ b/ui/gfx/image/image_unittest_util.h
@@ -23,6 +23,12 @@ typedef const SkBitmap* PlatformImage;
SkBitmap* CreateBitmap(int width, int height);
+gfx::Image CreateImage();
+
+bool IsEqual(const gfx::Image& image1, const gfx::Image& image2);
+
+bool IsEmpty(const gfx::Image& image);
+
PlatformImage CreatePlatformImage();
gfx::Image::RepresentationType GetPlatformRepresentationType();