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.h | |
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.h')
-rw-r--r-- | cc/test/ordered_texture_map.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cc/test/ordered_texture_map.h b/cc/test/ordered_texture_map.h index b826595..4797c59 100644 --- a/cc/test/ordered_texture_map.h +++ b/cc/test/ordered_texture_map.h @@ -9,7 +9,7 @@ #include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" -#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" +#include "third_party/khronos/GLES2/gl2.h" namespace cc { @@ -20,21 +20,21 @@ class OrderedTextureMap { OrderedTextureMap(); ~OrderedTextureMap(); - void Append(blink::WebGLId id, scoped_refptr<TestTexture> texture); - void Replace(blink::WebGLId id, scoped_refptr<TestTexture> texture); - void Remove(blink::WebGLId id); + void Append(GLuint id, scoped_refptr<TestTexture> texture); + void Replace(GLuint id, scoped_refptr<TestTexture> texture); + void Remove(GLuint id); size_t Size(); - bool ContainsId(blink::WebGLId id); + bool ContainsId(GLuint id); - scoped_refptr<TestTexture> TextureForId(blink::WebGLId id); - blink::WebGLId IdAt(size_t index); + scoped_refptr<TestTexture> TextureForId(GLuint id); + GLuint IdAt(size_t index); private: - typedef base::hash_map<blink::WebGLId, scoped_refptr<TestTexture> > + typedef base::hash_map<GLuint, scoped_refptr<TestTexture> > TextureMap; - typedef std::vector<blink::WebGLId> TextureList; + typedef std::vector<GLuint> TextureList; TextureMap textures_; TextureList ordered_textures_; |