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

Unified Diff: chrome/browser/extensions/image_loading_tracker_unittest.cc

Issue 10086023: Expose array of bitmaps contained by gfx::Image similar to NSImage (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changes as requested Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/image_loading_tracker_unittest.cc
diff --git a/chrome/browser/extensions/image_loading_tracker_unittest.cc b/chrome/browser/extensions/image_loading_tracker_unittest.cc
index d07109e7cfbf2b716cdb53f13c35b9420f177fd0..d3a2232d9992fb49548bad412e9b6436179bbadf 100644
--- a/chrome/browser/extensions/image_loading_tracker_unittest.cc
+++ b/chrome/browser/extensions/image_loading_tracker_unittest.cc
@@ -17,6 +17,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/size.h"
using content::BrowserThread;
@@ -217,9 +218,10 @@ TEST_F(ImageLoadingTrackerTest, MultipleImages) {
EXPECT_EQ(1, image_loaded_count());
// Check that all images were loaded.
- ASSERT_EQ(2u, image_.GetNumberOfSkBitmaps());
- const SkBitmap* bmp1 = image_.GetSkBitmapAtIndex(0);
- const SkBitmap* bmp2 = image_.GetSkBitmapAtIndex(1);
+ const std::vector<const SkBitmap*>& bitmaps = image.ToImageSkia().bitmaps();
+ ASSERT_EQ(2u, bitmaps.size());
+ const SkBitmap* bmp1 = bitmaps[0];
+ const SkBitmap* bmp2 = bitmaps[1];
if (bmp1->width() > bmp2->width()) {
std::swap(bmp1, bmp2);
}
« no previous file with comments | « no previous file | chrome/browser/themes/browser_theme_pack.cc » ('j') | chrome/browser/web_applications/web_app_mac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698