From 0f9969980cd06a0cc87ec30e00d17d6e331324ad Mon Sep 17 00:00:00 2001 From: "jamesr@chromium.org" Date: Sat, 11 Jan 2014 02:26:37 +0000 Subject: 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 --- cc/test/ordered_texture_map.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'cc/test/ordered_texture_map.h') 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 texture); - void Replace(blink::WebGLId id, scoped_refptr texture); - void Remove(blink::WebGLId id); + void Append(GLuint id, scoped_refptr texture); + void Replace(GLuint id, scoped_refptr texture); + void Remove(GLuint id); size_t Size(); - bool ContainsId(blink::WebGLId id); + bool ContainsId(GLuint id); - scoped_refptr TextureForId(blink::WebGLId id); - blink::WebGLId IdAt(size_t index); + scoped_refptr TextureForId(GLuint id); + GLuint IdAt(size_t index); private: - typedef base::hash_map > + typedef base::hash_map > TextureMap; - typedef std::vector TextureList; + typedef std::vector TextureList; TextureMap textures_; TextureList ordered_textures_; -- cgit v1.1