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

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

Issue 869043008: Reland of Move tracing namespace from base::debug to base::trace_event. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Fix suppressions 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/bitmap_tile_task_worker_pool.h ('k') | cc/resources/picture_layer_tiling.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_ONE_COPY_TILE_TASK_WORKER_POOL_H_ 5 #ifndef CC_RESOURCES_ONE_COPY_TILE_TASK_WORKER_POOL_H_
6 #define CC_RESOURCES_ONE_COPY_TILE_TASK_WORKER_POOL_H_ 6 #define CC_RESOURCES_ONE_COPY_TILE_TASK_WORKER_POOL_H_
7 7
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "base/synchronization/lock.h" 9 #include "base/synchronization/lock.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "cc/base/scoped_ptr_deque.h" 11 #include "cc/base/scoped_ptr_deque.h"
12 #include "cc/output/context_provider.h" 12 #include "cc/output/context_provider.h"
13 #include "cc/resources/resource_provider.h" 13 #include "cc/resources/resource_provider.h"
14 #include "cc/resources/tile_task_runner.h" 14 #include "cc/resources/tile_task_runner.h"
15 #include "cc/resources/tile_task_worker_pool.h" 15 #include "cc/resources/tile_task_worker_pool.h"
16 16
17 namespace base { 17 namespace base {
18 namespace debug { 18 namespace trace_event {
19 class ConvertableToTraceFormat; 19 class ConvertableToTraceFormat;
20 class TracedValue; 20 class TracedValue;
21 } 21 }
22
23 // TODO(ssid): remove these aliases after the tracing clients are moved to the
24 // new trace_event namespace. See crbug.com/451032. ETA: March 2015
25 namespace debug {
26 using ::base::trace_event::ConvertableToTraceFormat;
27 using ::base::trace_event::TracedValue;
22 } 28 }
29 } // namespace base
23 30
24 namespace cc { 31 namespace cc {
25 class ResourcePool; 32 class ResourcePool;
26 class ScopedResource; 33 class ScopedResource;
27 34
28 typedef int64 CopySequenceNumber; 35 typedef int64 CopySequenceNumber;
29 36
30 class CC_EXPORT OneCopyTileTaskWorkerPool : public TileTaskWorkerPool, 37 class CC_EXPORT OneCopyTileTaskWorkerPool : public TileTaskWorkerPool,
31 public TileTaskRunner, 38 public TileTaskRunner,
32 public TileTaskClient { 39 public TileTaskClient {
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 // canceled when ScheduleTasks() is called. 140 // canceled when ScheduleTasks() is called.
134 base::WeakPtrFactory<OneCopyTileTaskWorkerPool> 141 base::WeakPtrFactory<OneCopyTileTaskWorkerPool>
135 task_set_finished_weak_ptr_factory_; 142 task_set_finished_weak_ptr_factory_;
136 143
137 DISALLOW_COPY_AND_ASSIGN(OneCopyTileTaskWorkerPool); 144 DISALLOW_COPY_AND_ASSIGN(OneCopyTileTaskWorkerPool);
138 }; 145 };
139 146
140 } // namespace cc 147 } // namespace cc
141 148
142 #endif // CC_RESOURCES_ONE_COPY_TILE_TASK_WORKER_POOL_H_ 149 #endif // CC_RESOURCES_ONE_COPY_TILE_TASK_WORKER_POOL_H_
OLDNEW
« no previous file with comments | « cc/resources/bitmap_tile_task_worker_pool.h ('k') | cc/resources/picture_layer_tiling.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698