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

Side by Side Diff: cc/prioritized_texture.h

Issue 11232051: Remove static thread pointers from CC (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address code review comments and fix all cc_unittests 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
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 CCPrioritizedTexture_h 5 #ifndef CCPrioritizedTexture_h
6 #define CCPrioritizedTexture_h 6 #define CCPrioritizedTexture_h
7 7
8 #include "IntRect.h" 8 #include "IntRect.h"
9 #include "IntSize.h" 9 #include "IntSize.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/threading/thread_checker.h"
13 #include "cc/priority_calculator.h" 14 #include "cc/priority_calculator.h"
14 #include "cc/resource_provider.h" 15 #include "cc/resource_provider.h"
15 #include "cc/texture.h" 16 #include "cc/texture.h"
16 #include "third_party/khronos/GLES2/gl2.h" 17 #include "third_party/khronos/GLES2/gl2.h"
17 18
18 namespace cc { 19 namespace cc {
19 20
20 class PrioritizedTextureManager; 21 class PrioritizedTextureManager;
21 22
22 class PrioritizedTexture { 23 class PrioritizedTexture {
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 int m_priorityAtLastPriorityUpdate; 110 int m_priorityAtLastPriorityUpdate;
110 bool m_wasAbovePriorityCutoffAtLastPriorityUpdate; 111 bool m_wasAbovePriorityCutoffAtLastPriorityUpdate;
111 112
112 // Set if this is currently-drawing impl tree. 113 // Set if this is currently-drawing impl tree.
113 bool m_inDrawingImplTree; 114 bool m_inDrawingImplTree;
114 115
115 bool m_resourceHasBeenDeleted; 116 bool m_resourceHasBeenDeleted;
116 #ifndef NDEBUG 117 #ifndef NDEBUG
117 ResourceProvider* m_resourceProvider; 118 ResourceProvider* m_resourceProvider;
118 #endif 119 #endif
120 base::ThreadChecker m_threadChecker;
119 121
120 DISALLOW_COPY_AND_ASSIGN(Backing); 122 DISALLOW_COPY_AND_ASSIGN(Backing);
121 }; 123 };
122 124
123 PrioritizedTexture(PrioritizedTextureManager*, IntSize, GLenum format); 125 PrioritizedTexture(PrioritizedTextureManager*, IntSize, GLenum format);
124 126
125 bool isAbovePriorityCutoff() { return m_isAbovePriorityCutoff; } 127 bool isAbovePriorityCutoff() { return m_isAbovePriorityCutoff; }
126 void setAbovePriorityCutoff(bool isAbovePriorityCutoff) { m_isAbovePriorityC utoff = isAbovePriorityCutoff; } 128 void setAbovePriorityCutoff(bool isAbovePriorityCutoff) { m_isAbovePriorityC utoff = isAbovePriorityCutoff; }
127 void setManagerInternal(PrioritizedTextureManager* manager) { m_manager = ma nager; } 129 void setManagerInternal(PrioritizedTextureManager* manager) { m_manager = ma nager; }
128 130
(...skipping 12 matching lines...) Expand all
141 143
142 Backing* m_backing; 144 Backing* m_backing;
143 PrioritizedTextureManager* m_manager; 145 PrioritizedTextureManager* m_manager;
144 146
145 DISALLOW_COPY_AND_ASSIGN(PrioritizedTexture); 147 DISALLOW_COPY_AND_ASSIGN(PrioritizedTexture);
146 }; 148 };
147 149
148 } // namespace cc 150 } // namespace cc
149 151
150 #endif 152 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698