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 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
337 bool locked_for_write; | 337 bool locked_for_write; |
338 bool external; | 338 bool external; |
339 bool exported; | 339 bool exported; |
340 bool marked_for_deletion; | 340 bool marked_for_deletion; |
341 bool pending_set_pixels; | 341 bool pending_set_pixels; |
342 bool set_pixels_completion_forced; | 342 bool set_pixels_completion_forced; |
343 bool allocated; | 343 bool allocated; |
344 bool enable_read_lock_fences; | 344 bool enable_read_lock_fences; |
345 scoped_refptr<Fence> read_lock_fence; | 345 scoped_refptr<Fence> read_lock_fence; |
346 gfx::Size size; | 346 gfx::Size size; |
347 base::SharedMemory* shared_memory; | |
danakj
2013/05/23 15:34:33
Why is this not a scoped_ptr?
slavi
2013/05/28 18:55:13
I tried that first but the Resource struct needs t
| |
347 GLenum format; | 348 GLenum format; |
348 // TODO(skyostil): Use a separate sampler object for filter state. | 349 // TODO(skyostil): Use a separate sampler object for filter state. |
349 GLenum filter; | 350 GLenum filter; |
350 ResourceType type; | 351 ResourceType type; |
351 }; | 352 }; |
352 typedef base::hash_map<ResourceId, Resource> ResourceMap; | 353 typedef base::hash_map<ResourceId, Resource> ResourceMap; |
353 struct Child { | 354 struct Child { |
354 Child(); | 355 Child(); |
355 ~Child(); | 356 ~Child(); |
356 | 357 |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
405 base::ThreadChecker thread_checker_; | 406 base::ThreadChecker thread_checker_; |
406 | 407 |
407 scoped_refptr<Fence> current_read_lock_fence_; | 408 scoped_refptr<Fence> current_read_lock_fence_; |
408 | 409 |
409 DISALLOW_COPY_AND_ASSIGN(ResourceProvider); | 410 DISALLOW_COPY_AND_ASSIGN(ResourceProvider); |
410 }; | 411 }; |
411 | 412 |
412 } // namespace cc | 413 } // namespace cc |
413 | 414 |
414 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_ | 415 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_ |
OLD | NEW |