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

Side by Side Diff: chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm

Issue 545513002: tryAllocPixels returns bool, allocPixels requires success (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
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 "chrome/browser/ui/cocoa/table_row_nsimage_cache.h" 5 #include "chrome/browser/ui/cocoa/table_row_nsimage_cache.h"
6 6
7 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
8 #include "third_party/skia/include/core/SkBitmap.h" 8 #include "third_party/skia/include/core/SkBitmap.h"
9 #include "ui/gfx/image/image_skia.h" 9 #include "ui/gfx/image/image_skia.h"
10 10
(...skipping 13 matching lines...) Expand all
24 virtual gfx::ImageSkia GetIcon(int index) const OVERRIDE { 24 virtual gfx::ImageSkia GetIcon(int index) const OVERRIDE {
25 return gfx::ImageSkia::CreateFrom1xBitmap(rows_[index]); 25 return gfx::ImageSkia::CreateFrom1xBitmap(rows_[index]);
26 } 26 }
27 27
28 private: 28 private:
29 std::vector<SkBitmap> rows_; 29 std::vector<SkBitmap> rows_;
30 }; 30 };
31 31
32 SkBitmap MakeImage(int width, int height) { 32 SkBitmap MakeImage(int width, int height) {
33 SkBitmap image; 33 SkBitmap image;
34 EXPECT_TRUE(image.allocN32Pixels(width, height)); 34 image.allocN32Pixels(width, height);
35 image.eraseARGB(255, 255, 0, 0); 35 image.eraseARGB(255, 255, 0, 0);
36 return image; 36 return image;
37 } 37 }
38 38
39 // Define this as a macro so that the original variable names can be used in 39 // Define this as a macro so that the original variable names can be used in
40 // test output. 40 // test output.
41 #define COMPARE_SK_NS_IMG_SIZES(skia, cocoa) \ 41 #define COMPARE_SK_NS_IMG_SIZES(skia, cocoa) \
42 EXPECT_EQ(skia.width(), [cocoa size].width); \ 42 EXPECT_EQ(skia.width(), [cocoa size].width); \
43 EXPECT_EQ(skia.height(), [cocoa size].height); 43 EXPECT_EQ(skia.height(), [cocoa size].height);
44 44
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 cache.OnItemsRemoved(1, 3); 191 cache.OnItemsRemoved(1, 3);
192 192
193 image0 = cache.GetImageForRow(0); 193 image0 = cache.GetImageForRow(0);
194 image1 = cache.GetImageForRow(1); 194 image1 = cache.GetImageForRow(1);
195 195
196 COMPARE_SK_NS_IMG_SIZES(rows->at(0), image0); 196 COMPARE_SK_NS_IMG_SIZES(rows->at(0), image0);
197 COMPARE_SK_NS_IMG_SIZES(rows->at(1), image1); 197 COMPARE_SK_NS_IMG_SIZES(rows->at(1), image1);
198 } 198 }
199 199
200 } // namespace 200 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698