| OLD | NEW |
| 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 CC_RESOURCE_PROVIDER_H_ | 5 #ifndef CC_RESOURCE_PROVIDER_H_ |
| 6 #define CC_RESOURCE_PROVIDER_H_ | 6 #define CC_RESOURCE_PROVIDER_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/hash_tables.h" | 9 #include "base/hash_tables.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 unsigned glUploadQueryId; | 243 unsigned glUploadQueryId; |
| 244 Mailbox mailbox; | 244 Mailbox mailbox; |
| 245 uint8_t* pixels; | 245 uint8_t* pixels; |
| 246 uint8_t* pixelBuffer; | 246 uint8_t* pixelBuffer; |
| 247 int lockForReadCount; | 247 int lockForReadCount; |
| 248 bool lockedForWrite; | 248 bool lockedForWrite; |
| 249 bool external; | 249 bool external; |
| 250 bool exported; | 250 bool exported; |
| 251 bool markedForDeletion; | 251 bool markedForDeletion; |
| 252 bool pendingSetPixels; | 252 bool pendingSetPixels; |
| 253 bool allocated; |
| 253 gfx::Size size; | 254 gfx::Size size; |
| 254 GLenum format; | 255 GLenum format; |
| 255 // TODO(skyostil): Use a separate sampler object for filter state. | 256 // TODO(skyostil): Use a separate sampler object for filter state. |
| 256 GLenum filter; | 257 GLenum filter; |
| 257 ResourceType type; | 258 ResourceType type; |
| 258 }; | 259 }; |
| 259 typedef base::hash_map<ResourceId, Resource> ResourceMap; | 260 typedef base::hash_map<ResourceId, Resource> ResourceMap; |
| 260 struct Child { | 261 struct Child { |
| 261 Child(); | 262 Child(); |
| 262 ~Child(); | 263 ~Child(); |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 GLenum m_bestTextureFormat; | 295 GLenum m_bestTextureFormat; |
| 295 | 296 |
| 296 base::ThreadChecker m_threadChecker; | 297 base::ThreadChecker m_threadChecker; |
| 297 | 298 |
| 298 DISALLOW_COPY_AND_ASSIGN(ResourceProvider); | 299 DISALLOW_COPY_AND_ASSIGN(ResourceProvider); |
| 299 }; | 300 }; |
| 300 | 301 |
| 301 } | 302 } |
| 302 | 303 |
| 303 #endif // CC_RESOURCE_PROVIDER_H_ | 304 #endif // CC_RESOURCE_PROVIDER_H_ |
| OLD | NEW |