| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_BITMAP_TILE_TASK_WORKER_POOL_H_ | 5 #ifndef CC_RESOURCES_BITMAP_TILE_TASK_WORKER_POOL_H_ |
| 6 #define CC_RESOURCES_BITMAP_TILE_TASK_WORKER_POOL_H_ | 6 #define CC_RESOURCES_BITMAP_TILE_TASK_WORKER_POOL_H_ |
| 7 | 7 |
| 8 #include "base/memory/weak_ptr.h" | 8 #include "base/memory/weak_ptr.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "cc/resources/tile_task_runner.h" | 10 #include "cc/resources/tile_task_runner.h" |
| 11 #include "cc/resources/tile_task_worker_pool.h" | 11 #include "cc/resources/tile_task_worker_pool.h" |
| 12 | 12 |
| 13 namespace base { | 13 namespace base { |
| 14 namespace debug { | 14 namespace trace_event { |
| 15 class ConvertableToTraceFormat; | 15 class ConvertableToTraceFormat; |
| 16 } | 16 } |
| 17 |
| 18 // TODO(ssid): remove these aliases after the tracing clients are moved to the |
| 19 // new trace_event namespace. See crbug.com/451032. ETA: March 2015 |
| 20 namespace debug { |
| 21 using ::base::trace_event::ConvertableToTraceFormat; |
| 17 } | 22 } |
| 23 } // namespace base |
| 18 | 24 |
| 19 namespace cc { | 25 namespace cc { |
| 20 class ResourceProvider; | 26 class ResourceProvider; |
| 21 | 27 |
| 22 class CC_EXPORT BitmapTileTaskWorkerPool : public TileTaskWorkerPool, | 28 class CC_EXPORT BitmapTileTaskWorkerPool : public TileTaskWorkerPool, |
| 23 public TileTaskRunner, | 29 public TileTaskRunner, |
| 24 public TileTaskClient { | 30 public TileTaskClient { |
| 25 public: | 31 public: |
| 26 ~BitmapTileTaskWorkerPool() override; | 32 ~BitmapTileTaskWorkerPool() override; |
| 27 | 33 |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 | 77 |
| 72 base::WeakPtrFactory<BitmapTileTaskWorkerPool> | 78 base::WeakPtrFactory<BitmapTileTaskWorkerPool> |
| 73 task_set_finished_weak_ptr_factory_; | 79 task_set_finished_weak_ptr_factory_; |
| 74 | 80 |
| 75 DISALLOW_COPY_AND_ASSIGN(BitmapTileTaskWorkerPool); | 81 DISALLOW_COPY_AND_ASSIGN(BitmapTileTaskWorkerPool); |
| 76 }; | 82 }; |
| 77 | 83 |
| 78 } // namespace cc | 84 } // namespace cc |
| 79 | 85 |
| 80 #endif // CC_RESOURCES_BITMAP_TILE_TASK_WORKER_POOL_H_ | 86 #endif // CC_RESOURCES_BITMAP_TILE_TASK_WORKER_POOL_H_ |
| OLD | NEW |