| 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_RESOURCES_RESOURCE_PROVIDER_H_ | 5 #ifndef CC_RESOURCES_RESOURCE_PROVIDER_H_ |
| 6 #define CC_RESOURCES_RESOURCE_PROVIDER_H_ | 6 #define CC_RESOURCES_RESOURCE_PROVIDER_H_ |
| 7 | 7 |
| 8 #include <deque> | 8 #include <deque> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 353 bool locked_for_write; | 353 bool locked_for_write; |
| 354 bool external; | 354 bool external; |
| 355 bool exported; | 355 bool exported; |
| 356 bool marked_for_deletion; | 356 bool marked_for_deletion; |
| 357 bool pending_set_pixels; | 357 bool pending_set_pixels; |
| 358 bool set_pixels_completion_forced; | 358 bool set_pixels_completion_forced; |
| 359 bool allocated; | 359 bool allocated; |
| 360 bool enable_read_lock_fences; | 360 bool enable_read_lock_fences; |
| 361 scoped_refptr<Fence> read_lock_fence; | 361 scoped_refptr<Fence> read_lock_fence; |
| 362 gfx::Size size; | 362 gfx::Size size; |
| 363 base::SharedMemory* shared_memory; |
| 363 GLenum format; | 364 GLenum format; |
| 364 // TODO(skyostil): Use a separate sampler object for filter state. | 365 // TODO(skyostil): Use a separate sampler object for filter state. |
| 365 GLenum filter; | 366 GLenum filter; |
| 366 unsigned image_id; | 367 unsigned image_id; |
| 367 ResourceType type; | 368 ResourceType type; |
| 368 }; | 369 }; |
| 369 typedef base::hash_map<ResourceId, Resource> ResourceMap; | 370 typedef base::hash_map<ResourceId, Resource> ResourceMap; |
| 370 struct Child { | 371 struct Child { |
| 371 Child(); | 372 Child(); |
| 372 ~Child(); | 373 ~Child(); |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 base::ThreadChecker thread_checker_; | 423 base::ThreadChecker thread_checker_; |
| 423 | 424 |
| 424 scoped_refptr<Fence> current_read_lock_fence_; | 425 scoped_refptr<Fence> current_read_lock_fence_; |
| 425 | 426 |
| 426 DISALLOW_COPY_AND_ASSIGN(ResourceProvider); | 427 DISALLOW_COPY_AND_ASSIGN(ResourceProvider); |
| 427 }; | 428 }; |
| 428 | 429 |
| 429 } // namespace cc | 430 } // namespace cc |
| 430 | 431 |
| 431 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_ | 432 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_ |
| OLD | NEW |