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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Fix Clipboard.java 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/test/fake_content_layer_client.cc ('k') | cc/test/render_pass_test_common.cc » ('j') | mojo/public/cpp/system/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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') | mojo/public/cpp/system/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698