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

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

Issue 16667019: Rename base/hash_tables to base/containers/hash_tables. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/resources/tile_manager.h ('k') | cc/trees/damage_tracker.h » ('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 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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_TEST_WEB_GRAPHICS_CONTEXT_3D_H_ 5 #ifndef CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_
6 #define CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_ 6 #define CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/hash_tables.h" 11 #include "base/containers/hash_tables.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/stl_util.h" 14 #include "base/stl_util.h"
15 #include "cc/base/scoped_ptr_hash_map.h" 15 #include "cc/base/scoped_ptr_hash_map.h"
16 #include "cc/debug/fake_web_graphics_context_3d.h" 16 #include "cc/debug/fake_web_graphics_context_3d.h"
17 #include "third_party/khronos/GLES2/gl2.h" 17 #include "third_party/khronos/GLES2/gl2.h"
18 18
19 namespace cc { 19 namespace cc {
20 20
21 class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D { 21 class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D {
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 private: 238 private:
239 DISALLOW_COPY_AND_ASSIGN(Image); 239 DISALLOW_COPY_AND_ASSIGN(Image);
240 }; 240 };
241 ScopedPtrHashMap<unsigned, Image> images_; 241 ScopedPtrHashMap<unsigned, Image> images_;
242 base::WeakPtrFactory<TestWebGraphicsContext3D> weak_ptr_factory_; 242 base::WeakPtrFactory<TestWebGraphicsContext3D> weak_ptr_factory_;
243 }; 243 };
244 244
245 } // namespace cc 245 } // namespace cc
246 246
247 #endif // CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_ 247 #endif // CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_
OLDNEW
« no previous file with comments | « cc/resources/tile_manager.h ('k') | cc/trees/damage_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698