Source/core/tests/CachedImageTest.cpp - Issue 14569024: Merge 149966 "Fix multipart images, regressed in r148560".

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: Source/core/tests/CachedImageTest.cpp

Issue 14569024: Merge 149966 "Fix multipart images, regressed in r148560". (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1500/

Patch Set: Created 7 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:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « Source/core/loader/cache/CachedImage.cpp ('k') | no next file » | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (c) 2013, Google Inc. All rights reserved.	2 * Copyright (c) 2013, Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 95 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
106 ASSERT_FALSE(cachedImage->errorOccurred());	106 ASSERT_FALSE(cachedImage->errorOccurred());

107 ASSERT_TRUE(cachedImage->hasImage());	107 ASSERT_TRUE(cachedImage->hasImage());

108 ASSERT_FALSE(cachedImage->image()->isNull());	108 ASSERT_FALSE(cachedImage->image()->isNull());

109 ASSERT_EQ(cachedImage->image()->width(), 1);	109 ASSERT_EQ(cachedImage->image()->width(), 1);

110 ASSERT_EQ(cachedImage->image()->height(), 1);	110 ASSERT_EQ(cachedImage->image()->height(), 1);

111 ASSERT_EQ(client.imageChangedCount(), 2);	111 ASSERT_EQ(client.imageChangedCount(), 2);

112 ASSERT_TRUE(client.notifyFinishedCalled());	112 ASSERT_TRUE(client.notifyFinishedCalled());

113 }	113 }

114	114

115 } // namespace	115 } // namespace

OLD	NEW