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

Side by Side Diff: cc/prioritized_texture_manager.h

Issue 11227005: Reland "cc: Remove CC*.h temporary includes, part 1/4." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: the fix Created 8 years, 2 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/prioritized_texture.h ('k') | cc/prioritized_texture_unittest.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 CCPrioritizedTextureManager_h 5 #ifndef CCPrioritizedTextureManager_h
6 #define CCPrioritizedTextureManager_h 6 #define CCPrioritizedTextureManager_h
7 7
8 #include "CCPrioritizedTexture.h"
9 #include "CCPriorityCalculator.h"
10 #include "IntRect.h"
11 #include "IntSize.h"
8 #include "base/basictypes.h" 12 #include "base/basictypes.h"
9 #include "base/hash_tables.h" 13 #include "base/hash_tables.h"
10 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "cc/texture.h"
11 #include "third_party/khronos/GLES2/gl2.h" 16 #include "third_party/khronos/GLES2/gl2.h"
12 #include "CCPrioritizedTexture.h"
13 #include "CCPriorityCalculator.h"
14 #include "CCTexture.h"
15 #include "IntRect.h"
16 #include "IntSize.h"
17 #include <wtf/Vector.h> 17 #include <wtf/Vector.h>
18 #include <list> 18 #include <list>
19 19
20 #if defined(COMPILER_GCC) 20 #if defined(COMPILER_GCC)
21 namespace BASE_HASH_NAMESPACE { 21 namespace BASE_HASH_NAMESPACE {
22 template<> 22 template<>
23 struct hash<cc::CCPrioritizedTexture*> { 23 struct hash<cc::CCPrioritizedTexture*> {
24 size_t operator()(cc::CCPrioritizedTexture* ptr) const { 24 size_t operator()(cc::CCPrioritizedTexture* ptr) const {
25 return hash<size_t>()(reinterpret_cast<size_t>(ptr)); 25 return hash<size_t>()(reinterpret_cast<size_t>(ptr));
26 } 26 }
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 BackingList m_evictedBackings; 162 BackingList m_evictedBackings;
163 163
164 TextureVector m_tempTextureVector; 164 TextureVector m_tempTextureVector;
165 165
166 DISALLOW_COPY_AND_ASSIGN(CCPrioritizedTextureManager); 166 DISALLOW_COPY_AND_ASSIGN(CCPrioritizedTextureManager);
167 }; 167 };
168 168
169 } // namespace cc 169 } // namespace cc
170 170
171 #endif 171 #endif
OLDNEW
« no previous file with comments | « cc/prioritized_texture.h ('k') | cc/prioritized_texture_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698