| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_PIXEL_BUFFER_TILE_TASK_WORKER_POOL_H_ | 5 #ifndef CC_RESOURCES_PIXEL_BUFFER_TILE_TASK_WORKER_POOL_H_ |
| 6 #define CC_RESOURCES_PIXEL_BUFFER_TILE_TASK_WORKER_POOL_H_ | 6 #define CC_RESOURCES_PIXEL_BUFFER_TILE_TASK_WORKER_POOL_H_ |
| 7 | 7 |
| 8 #include <deque> | 8 #include <deque> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/memory/weak_ptr.h" | 11 #include "base/memory/weak_ptr.h" |
| 12 #include "base/values.h" | 12 #include "base/values.h" |
| 13 #include "cc/base/delayed_unique_notifier.h" | 13 #include "cc/base/delayed_unique_notifier.h" |
| 14 #include "cc/output/context_provider.h" | 14 #include "cc/output/context_provider.h" |
| 15 #include "cc/resources/tile_task_runner.h" | 15 #include "cc/resources/tile_task_runner.h" |
| 16 #include "cc/resources/tile_task_worker_pool.h" | 16 #include "cc/resources/tile_task_worker_pool.h" |
| 17 | 17 |
| 18 namespace base { | 18 namespace base { |
| 19 namespace debug { | 19 namespace trace_event { |
| 20 class ConvertableToTraceFormat; | 20 class ConvertableToTraceFormat; |
| 21 class TracedValue; | 21 class TracedValue; |
| 22 } | 22 } |
| 23 |
| 24 // TODO(ssid): remove these aliases after the tracing clients are moved to the |
| 25 // new trace_event namespace. See crbug.com/451032. ETA: March 2015 |
| 26 namespace debug { |
| 27 using ::base::trace_event::ConvertableToTraceFormat; |
| 28 using ::base::trace_event::TracedValue; |
| 23 } | 29 } |
| 30 } // namespace base |
| 24 | 31 |
| 25 namespace cc { | 32 namespace cc { |
| 26 class ResourceProvider; | 33 class ResourceProvider; |
| 27 | 34 |
| 28 class CC_EXPORT PixelBufferTileTaskWorkerPool : public TileTaskWorkerPool, | 35 class CC_EXPORT PixelBufferTileTaskWorkerPool : public TileTaskWorkerPool, |
| 29 public TileTaskRunner, | 36 public TileTaskRunner, |
| 30 public TileTaskClient { | 37 public TileTaskClient { |
| 31 public: | 38 public: |
| 32 ~PixelBufferTileTaskWorkerPool() override; | 39 ~PixelBufferTileTaskWorkerPool() override; |
| 33 | 40 |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 | 139 |
| 133 base::WeakPtrFactory<PixelBufferTileTaskWorkerPool> | 140 base::WeakPtrFactory<PixelBufferTileTaskWorkerPool> |
| 134 task_set_finished_weak_ptr_factory_; | 141 task_set_finished_weak_ptr_factory_; |
| 135 | 142 |
| 136 DISALLOW_COPY_AND_ASSIGN(PixelBufferTileTaskWorkerPool); | 143 DISALLOW_COPY_AND_ASSIGN(PixelBufferTileTaskWorkerPool); |
| 137 }; | 144 }; |
| 138 | 145 |
| 139 } // namespace cc | 146 } // namespace cc |
| 140 | 147 |
| 141 #endif // CC_RESOURCES_PIXEL_BUFFER_TILE_TASK_WORKER_POOL_H_ | 148 #endif // CC_RESOURCES_PIXEL_BUFFER_TILE_TASK_WORKER_POOL_H_ |
| OLD | NEW |