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 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
435 | 435 |
436 void WaitReadLockIfNeeded(ResourceId id); | 436 void WaitReadLockIfNeeded(ResourceId id); |
437 | 437 |
438 static GLint GetActiveTextureUnit(gpu::gles2::GLES2Interface* gl); | 438 static GLint GetActiveTextureUnit(gpu::gles2::GLES2Interface* gl); |
439 | 439 |
440 OutputSurface* output_surface() { return output_surface_; } | 440 OutputSurface* output_surface() { return output_surface_; } |
441 | 441 |
442 void ValidateResource(ResourceId id) const; | 442 void ValidateResource(ResourceId id) const; |
443 | 443 |
444 // base::trace_event::MemoryDumpProvider implementation. | 444 // base::trace_event::MemoryDumpProvider implementation. |
445 bool OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd) override; | 445 bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args, |
| 446 base::trace_event::ProcessMemoryDump* pmd) override; |
446 | 447 |
447 protected: | 448 protected: |
448 ResourceProvider(OutputSurface* output_surface, | 449 ResourceProvider(OutputSurface* output_surface, |
449 SharedBitmapManager* shared_bitmap_manager, | 450 SharedBitmapManager* shared_bitmap_manager, |
450 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, | 451 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, |
451 BlockingTaskRunner* blocking_main_thread_task_runner, | 452 BlockingTaskRunner* blocking_main_thread_task_runner, |
452 int highp_threshold_min, | 453 int highp_threshold_min, |
453 bool use_rgba_4444_texture_format, | 454 bool use_rgba_4444_texture_format, |
454 size_t id_allocation_chunk_size, | 455 size_t id_allocation_chunk_size, |
455 bool use_persistent_map_for_gpu_memory_buffers); | 456 bool use_persistent_map_for_gpu_memory_buffers); |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
610 bool use_persistent_map_for_gpu_memory_buffers_; | 611 bool use_persistent_map_for_gpu_memory_buffers_; |
611 // Fence used for CopyResource if CHROMIUM_sync_query is not supported. | 612 // Fence used for CopyResource if CHROMIUM_sync_query is not supported. |
612 scoped_refptr<SynchronousFence> synchronous_fence_; | 613 scoped_refptr<SynchronousFence> synchronous_fence_; |
613 | 614 |
614 DISALLOW_COPY_AND_ASSIGN(ResourceProvider); | 615 DISALLOW_COPY_AND_ASSIGN(ResourceProvider); |
615 }; | 616 }; |
616 | 617 |
617 } // namespace cc | 618 } // namespace cc |
618 | 619 |
619 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_ | 620 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_ |
OLD | NEW |