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

Side by Side Diff: cc/test/ordered_texture_map.h

Issue 133023002: Remove unnecessary use of blink typedefs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/test/fake_web_graphics_context_3d.cc ('k') | cc/test/ordered_texture_map.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_TEST_ORDERED_TEXTURE_MAP_H_ 5 #ifndef CC_TEST_ORDERED_TEXTURE_MAP_H_
6 #define CC_TEST_ORDERED_TEXTURE_MAP_H_ 6 #define CC_TEST_ORDERED_TEXTURE_MAP_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" 12 #include "third_party/khronos/GLES2/gl2.h"
13 13
14 namespace cc { 14 namespace cc {
15 15
16 struct TestTexture; 16 struct TestTexture;
17 17
18 class OrderedTextureMap { 18 class OrderedTextureMap {
19 public: 19 public:
20 OrderedTextureMap(); 20 OrderedTextureMap();
21 ~OrderedTextureMap(); 21 ~OrderedTextureMap();
22 22
23 void Append(blink::WebGLId id, scoped_refptr<TestTexture> texture); 23 void Append(GLuint id, scoped_refptr<TestTexture> texture);
24 void Replace(blink::WebGLId id, scoped_refptr<TestTexture> texture); 24 void Replace(GLuint id, scoped_refptr<TestTexture> texture);
25 void Remove(blink::WebGLId id); 25 void Remove(GLuint id);
26 26
27 size_t Size(); 27 size_t Size();
28 28
29 bool ContainsId(blink::WebGLId id); 29 bool ContainsId(GLuint id);
30 30
31 scoped_refptr<TestTexture> TextureForId(blink::WebGLId id); 31 scoped_refptr<TestTexture> TextureForId(GLuint id);
32 blink::WebGLId IdAt(size_t index); 32 GLuint IdAt(size_t index);
33 33
34 private: 34 private:
35 typedef base::hash_map<blink::WebGLId, scoped_refptr<TestTexture> > 35 typedef base::hash_map<GLuint, scoped_refptr<TestTexture> >
36 TextureMap; 36 TextureMap;
37 typedef std::vector<blink::WebGLId> TextureList; 37 typedef std::vector<GLuint> TextureList;
38 38
39 TextureMap textures_; 39 TextureMap textures_;
40 TextureList ordered_textures_; 40 TextureList ordered_textures_;
41 }; 41 };
42 42
43 } // namespace cc 43 } // namespace cc
44 44
45 #endif // CC_TEST_ORDERED_TEXTURE_MAP_H_ 45 #endif // CC_TEST_ORDERED_TEXTURE_MAP_H_
OLDNEW
« no previous file with comments | « cc/test/fake_web_graphics_context_3d.cc ('k') | cc/test/ordered_texture_map.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698