diff options
author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-11 02:26:37 +0000 |
---|---|---|
committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-11 02:26:37 +0000 |
commit | 0f9969980cd06a0cc87ec30e00d17d6e331324ad (patch) | |
tree | 7a68afcd82b625f3d01530b6ac8e1197b0d2753e /cc/test/ordered_texture_map.cc | |
parent | d7c9dc2d8a1b1b1ada826785f8693b3b55c17e4d (diff) | |
download | chromium_src-0f9969980cd06a0cc87ec30e00d17d6e331324ad.zip chromium_src-0f9969980cd06a0cc87ec30e00d17d6e331324ad.tar.gz chromium_src-0f9969980cd06a0cc87ec30e00d17d6e331324ad.tar.bz2 |
Remove unnecessary use of blink typedefs
This replaces uses of blink's WebGraphicsContext3D.h typedefs for GL numeric
types with the types from the khronos headers.
BUG=181120
Review URL: https://codereview.chromium.org/133023002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/ordered_texture_map.cc')
-rw-r--r-- | cc/test/ordered_texture_map.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cc/test/ordered_texture_map.cc b/cc/test/ordered_texture_map.cc index 9775e83..ee3e2f3 100644 --- a/cc/test/ordered_texture_map.cc +++ b/cc/test/ordered_texture_map.cc @@ -13,7 +13,7 @@ OrderedTextureMap::OrderedTextureMap() {} OrderedTextureMap::~OrderedTextureMap() {} -void OrderedTextureMap::Append(blink::WebGLId id, +void OrderedTextureMap::Append(GLuint id, scoped_refptr<TestTexture> texture) { DCHECK(texture.get()); DCHECK(!ContainsId(id)); @@ -22,7 +22,7 @@ void OrderedTextureMap::Append(blink::WebGLId id, ordered_textures_.push_back(id); } -void OrderedTextureMap::Replace(blink::WebGLId id, +void OrderedTextureMap::Replace(GLuint id, scoped_refptr<TestTexture> texture) { DCHECK(texture.get()); DCHECK(ContainsId(id)); @@ -30,7 +30,7 @@ void OrderedTextureMap::Replace(blink::WebGLId id, textures_[id] = texture; } -void OrderedTextureMap::Remove(blink::WebGLId id) { +void OrderedTextureMap::Remove(GLuint id) { TextureMap::iterator map_it = textures_.find(id); DCHECK(map_it != textures_.end()); textures_.erase(map_it); @@ -43,18 +43,18 @@ void OrderedTextureMap::Remove(blink::WebGLId id) { size_t OrderedTextureMap::Size() { return ordered_textures_.size(); } -bool OrderedTextureMap::ContainsId(blink::WebGLId id) { +bool OrderedTextureMap::ContainsId(GLuint id) { return textures_.find(id) != textures_.end(); } -scoped_refptr<TestTexture> OrderedTextureMap::TextureForId(blink::WebGLId id) { +scoped_refptr<TestTexture> OrderedTextureMap::TextureForId(GLuint id) { DCHECK(ContainsId(id)); scoped_refptr<TestTexture> texture = textures_[id]; DCHECK(texture.get()); return texture; } -blink::WebGLId OrderedTextureMap::IdAt(size_t index) { +GLuint OrderedTextureMap::IdAt(size_t index) { DCHECK(index < Size()); return ordered_textures_[index]; } |