Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(189)

Side by Side Diff: ui/gfx/image/image_unittest.cc

Issue 10823012: Fix the errors of ui unittests caused by packing colors for Android (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Refine the patch with comments Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "testing/gtest/include/gtest/gtest.h" 5 #include "testing/gtest/include/gtest/gtest.h"
6 #include "ui/gfx/image/image.h" 6 #include "ui/gfx/image/image.h"
7 #include "ui/gfx/image/image_skia.h" 7 #include "ui/gfx/image/image_skia.h"
8 #include "ui/gfx/image/image_unittest_util.h" 8 #include "ui/gfx/image/image_unittest_util.h"
9 9
10 #if defined(TOOLKIT_GTK) 10 #if defined(TOOLKIT_GTK)
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 EXPECT_TRUE(ns_image); 192 EXPECT_TRUE(ns_image);
193 base::mac::NSObjectRelease(ns_image); 193 base::mac::NSObjectRelease(ns_image);
194 } 194 }
195 #endif 195 #endif
196 196
197 TEST_F(ImageTest, CheckSkiaColor) { 197 TEST_F(ImageTest, CheckSkiaColor) {
198 gfx::Image image(gt::CreatePlatformImage()); 198 gfx::Image image(gt::CreatePlatformImage());
199 const SkBitmap* bitmap = image.ToSkBitmap(); 199 const SkBitmap* bitmap = image.ToSkBitmap();
200 200
201 SkAutoLockPixels auto_lock(*bitmap); 201 SkAutoLockPixels auto_lock(*bitmap);
202 uint32_t* pixel = bitmap->getAddr32(10, 10); 202 SkColor color = bitmap->getColor(10, 10);
203 EXPECT_EQ(SK_ColorRED, *pixel); 203 EXPECT_EQ(SK_ColorRED, color);
204 } 204 }
205 205
206 TEST_F(ImageTest, SwapRepresentations) { 206 TEST_F(ImageTest, SwapRepresentations) {
207 const size_t kRepCount = kUsesSkiaNatively ? 1U : 2U; 207 const size_t kRepCount = kUsesSkiaNatively ? 1U : 2U;
208 208
209 gfx::Image image1(gt::CreateBitmap(25, 25)); 209 gfx::Image image1(gt::CreateBitmap(25, 25));
210 const SkBitmap* bitmap1 = image1.ToSkBitmap(); 210 const SkBitmap* bitmap1 = image1.ToSkBitmap();
211 EXPECT_EQ(1U, image1.RepresentationCount()); 211 EXPECT_EQ(1U, image1.RepresentationCount());
212 212
213 gfx::Image image2(gt::CreatePlatformImage()); 213 gfx::Image image2(gt::CreatePlatformImage());
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 image = gfx::Image(gfx::ImageSkiaRep(bitmap, ui::SCALE_FACTOR_100P)); 315 image = gfx::Image(gfx::ImageSkiaRep(bitmap, ui::SCALE_FACTOR_100P));
316 } 316 }
317 EXPECT_TRUE(!image.ToSkBitmap()->isNull()); 317 EXPECT_TRUE(!image.ToSkBitmap()->isNull());
318 } 318 }
319 319
320 // Integration tests with UI toolkit frameworks require linking against the 320 // Integration tests with UI toolkit frameworks require linking against the
321 // Views library and cannot be here (ui_unittests doesn't include it). They 321 // Views library and cannot be here (ui_unittests doesn't include it). They
322 // instead live in /chrome/browser/ui/tests/ui_gfx_image_unittest.cc. 322 // instead live in /chrome/browser/ui/tests/ui_gfx_image_unittest.cc.
323 323
324 } // namespace 324 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698