chrome/browser/extensions/image_loading_tracker_unittest.cc - Issue 10245003: Makes ImageSkia more like SkBitmap

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10245003: Makes ImageSkia more like SkBitmap (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Updated comment Created 8 years, 7 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:

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 430693695cf008e5036af2268d0ba2e3057238f8..edbbceedf72cec5471acecb2366383e17e5795c0 100644

--- a/chrome/browser/extensions/image_loading_tracker_unittest.cc

+++ b/chrome/browser/extensions/image_loading_tracker_unittest.cc

@@ -218,11 +218,10 @@ TEST_F(ImageLoadingTrackerTest, MultipleImages) {

EXPECT_EQ(1, image_loaded_count());

// Check that all images were loaded.

- const std::vector<const SkBitmap*>& bitmaps =

- image_.ToImageSkia()->bitmaps();

+ const std::vector<SkBitmap> bitmaps = image_.ToImageSkia()->bitmaps();

ASSERT_EQ(2u, bitmaps.size());

- const SkBitmap* bmp1 = bitmaps[0];

- const SkBitmap* bmp2 = bitmaps[1];

+ const SkBitmap* bmp1 = &bitmaps[0];

+ const SkBitmap* bmp2 = &bitmaps[1];

if (bmp1->width() > bmp2->width()) {

std::swap(bmp1, bmp2);

}