cc/test/ordered_texture_map.cc - Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002)

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: cc/test/ordered_texture_map.cc

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: fixed bad android build patch Created 5 years, 9 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: cc/test/ordered_texture_map.cc

diff --git a/cc/test/ordered_texture_map.cc b/cc/test/ordered_texture_map.cc

index ee3e2f3be865aebf002fa0921ec905018015d4ba..649700c49795a8eb12ff29626e0c1ea1f1b1d14f 100644

--- a/cc/test/ordered_texture_map.cc

+++ b/cc/test/ordered_texture_map.cc

@@ -32,7 +32,10 @@ void OrderedTextureMap::Replace(GLuint id,

void OrderedTextureMap::Remove(GLuint id) {

TextureMap::iterator map_it = textures_.find(id);

- DCHECK(map_it != textures_.end());

+ // for some test we generate dummy tex id, which are not registered,

+ // nothing to remove in that case.

+ if (map_it == textures_.end())

+ return;

textures_.erase(map_it);

TextureList::iterator list_it =

« no previous file with comments | « cc/test/fake_content_layer_client.cc ('k') | cc/test/render_pass_test_common.cc » ('j') | no next file with comments »