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

Side by Side Diff: cc/resources/pixel_buffer_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/resources/picture_layer_tiling_set.h ('k') | cc/resources/tile_manager.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 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 trace_event { 19 namespace debug {
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;
29 } 23 }
30 } // namespace base
31 24
32 namespace cc { 25 namespace cc {
33 class ResourceProvider; 26 class ResourceProvider;
34 27
35 class CC_EXPORT PixelBufferTileTaskWorkerPool : public TileTaskWorkerPool, 28 class CC_EXPORT PixelBufferTileTaskWorkerPool : public TileTaskWorkerPool,
36 public TileTaskRunner, 29 public TileTaskRunner,
37 public TileTaskClient { 30 public TileTaskClient {
38 public: 31 public:
39 ~PixelBufferTileTaskWorkerPool() override; 32 ~PixelBufferTileTaskWorkerPool() override;
40 33
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 132
140 base::WeakPtrFactory<PixelBufferTileTaskWorkerPool> 133 base::WeakPtrFactory<PixelBufferTileTaskWorkerPool>
141 task_set_finished_weak_ptr_factory_; 134 task_set_finished_weak_ptr_factory_;
142 135
143 DISALLOW_COPY_AND_ASSIGN(PixelBufferTileTaskWorkerPool); 136 DISALLOW_COPY_AND_ASSIGN(PixelBufferTileTaskWorkerPool);
144 }; 137 };
145 138
146 } // namespace cc 139 } // namespace cc
147 140
148 #endif // CC_RESOURCES_PIXEL_BUFFER_TILE_TASK_WORKER_POOL_H_ 141 #endif // CC_RESOURCES_PIXEL_BUFFER_TILE_TASK_WORKER_POOL_H_
OLDNEW
« no previous file with comments | « cc/resources/picture_layer_tiling_set.h ('k') | cc/resources/tile_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698