Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(437)

Side by Side Diff: cc/resources/bitmap_tile_task_worker_pool.h

Issue 904573002: Revert of Move tracing namespace from base::debug to base::trace_event. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_trace_part1
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/quads/shared_quad_state.h ('k') | cc/resources/one_copy_tile_task_worker_pool.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 trace_event { 14 namespace debug {
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;
22 } 17 }
23 } // namespace base
24 18
25 namespace cc { 19 namespace cc {
26 class ResourceProvider; 20 class ResourceProvider;
27 21
28 class CC_EXPORT BitmapTileTaskWorkerPool : public TileTaskWorkerPool, 22 class CC_EXPORT BitmapTileTaskWorkerPool : public TileTaskWorkerPool,
29 public TileTaskRunner, 23 public TileTaskRunner,
30 public TileTaskClient { 24 public TileTaskClient {
31 public: 25 public:
32 ~BitmapTileTaskWorkerPool() override; 26 ~BitmapTileTaskWorkerPool() override;
33 27
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 71
78 base::WeakPtrFactory<BitmapTileTaskWorkerPool> 72 base::WeakPtrFactory<BitmapTileTaskWorkerPool>
79 task_set_finished_weak_ptr_factory_; 73 task_set_finished_weak_ptr_factory_;
80 74
81 DISALLOW_COPY_AND_ASSIGN(BitmapTileTaskWorkerPool); 75 DISALLOW_COPY_AND_ASSIGN(BitmapTileTaskWorkerPool);
82 }; 76 };
83 77
84 } // namespace cc 78 } // namespace cc
85 79
86 #endif // CC_RESOURCES_BITMAP_TILE_TASK_WORKER_POOL_H_ 80 #endif // CC_RESOURCES_BITMAP_TILE_TASK_WORKER_POOL_H_
OLDNEW
« no previous file with comments | « cc/quads/shared_quad_state.h ('k') | cc/resources/one_copy_tile_task_worker_pool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698