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

Side by Side Diff: content/renderer/scheduler/renderer_scheduler_impl.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 | « content/child/child_thread_impl.h ('k') | content/renderer/scheduler/task_queue_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 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 CONTENT_RENDERER_SCHEDULER_RENDERER_SCHEDULER_IMPL_H_ 5 #ifndef CONTENT_RENDERER_SCHEDULER_RENDERER_SCHEDULER_IMPL_H_
6 #define CONTENT_RENDERER_SCHEDULER_RENDERER_SCHEDULER_IMPL_H_ 6 #define CONTENT_RENDERER_SCHEDULER_RENDERER_SCHEDULER_IMPL_H_
7 7
8 #include "base/atomicops.h" 8 #include "base/atomicops.h"
9 #include "base/synchronization/lock.h" 9 #include "base/synchronization/lock.h"
10 #include "base/threading/thread_checker.h" 10 #include "base/threading/thread_checker.h"
11 #include "cc/test/test_now_source.h" 11 #include "cc/test/test_now_source.h"
12 #include "content/renderer/scheduler/cancelable_closure_holder.h" 12 #include "content/renderer/scheduler/cancelable_closure_holder.h"
13 #include "content/renderer/scheduler/renderer_scheduler.h" 13 #include "content/renderer/scheduler/renderer_scheduler.h"
14 #include "content/renderer/scheduler/single_thread_idle_task_runner.h" 14 #include "content/renderer/scheduler/single_thread_idle_task_runner.h"
15 #include "content/renderer/scheduler/task_queue_manager.h" 15 #include "content/renderer/scheduler/task_queue_manager.h"
16 16
17 namespace base { 17 namespace base {
18 namespace debug { 18 namespace trace_event {
19 class ConvertableToTraceFormat; 19 class ConvertableToTraceFormat;
20 } 20 }
21
22 // TODO(ssid): remove these aliases after the tracing clients are moved to the
23 // new trace_event namespace. See crbug.com/451032. ETA: March 2015
24 namespace debug {
25 using ::base::trace_event::ConvertableToTraceFormat;
21 } 26 }
27 } // namespace base
22 28
23 namespace content { 29 namespace content {
24 30
25 class RendererTaskQueueSelector; 31 class RendererTaskQueueSelector;
26 32
27 class CONTENT_EXPORT RendererSchedulerImpl : public RendererScheduler { 33 class CONTENT_EXPORT RendererSchedulerImpl : public RendererScheduler {
28 public: 34 public:
29 RendererSchedulerImpl( 35 RendererSchedulerImpl(
30 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner); 36 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner);
31 ~RendererSchedulerImpl() override; 37 ~RendererSchedulerImpl() override;
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 151
146 base::WeakPtr<RendererSchedulerImpl> weak_renderer_scheduler_ptr_; 152 base::WeakPtr<RendererSchedulerImpl> weak_renderer_scheduler_ptr_;
147 base::WeakPtrFactory<RendererSchedulerImpl> weak_factory_; 153 base::WeakPtrFactory<RendererSchedulerImpl> weak_factory_;
148 154
149 DISALLOW_COPY_AND_ASSIGN(RendererSchedulerImpl); 155 DISALLOW_COPY_AND_ASSIGN(RendererSchedulerImpl);
150 }; 156 };
151 157
152 } // namespace content 158 } // namespace content
153 159
154 #endif // CONTENT_RENDERER_SCHEDULER_RENDERER_SCHEDULER_IMPL_H_ 160 #endif // CONTENT_RENDERER_SCHEDULER_RENDERER_SCHEDULER_IMPL_H_
OLDNEW
« no previous file with comments | « content/child/child_thread_impl.h ('k') | content/renderer/scheduler/task_queue_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698