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

Side by Side Diff: cc/scheduler/scheduler_settings.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/scheduler/scheduler.h ('k') | cc/scheduler/scheduler_state_machine.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_SCHEDULER_SCHEDULER_SETTINGS_H_ 5 #ifndef CC_SCHEDULER_SCHEDULER_SETTINGS_H_
6 #define CC_SCHEDULER_SCHEDULER_SETTINGS_H_ 6 #define CC_SCHEDULER_SCHEDULER_SETTINGS_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "cc/base/cc_export.h" 11 #include "cc/base/cc_export.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 LayerTreeSettings; 26 class LayerTreeSettings;
21 27
22 class CC_EXPORT SchedulerSettings { 28 class CC_EXPORT SchedulerSettings {
23 public: 29 public:
24 SchedulerSettings(); 30 SchedulerSettings();
25 explicit SchedulerSettings(const LayerTreeSettings& settings); 31 explicit SchedulerSettings(const LayerTreeSettings& settings);
26 ~SchedulerSettings(); 32 ~SchedulerSettings();
27 33
(...skipping 14 matching lines...) Expand all
42 bool main_thread_should_always_be_low_latency; 48 bool main_thread_should_always_be_low_latency;
43 49
44 base::TimeDelta background_frame_interval; 50 base::TimeDelta background_frame_interval;
45 51
46 scoped_refptr<base::debug::ConvertableToTraceFormat> AsValue() const; 52 scoped_refptr<base::debug::ConvertableToTraceFormat> AsValue() const;
47 }; 53 };
48 54
49 } // namespace cc 55 } // namespace cc
50 56
51 #endif // CC_SCHEDULER_SCHEDULER_SETTINGS_H_ 57 #endif // CC_SCHEDULER_SCHEDULER_SETTINGS_H_
OLDNEW
« no previous file with comments | « cc/scheduler/scheduler.h ('k') | cc/scheduler/scheduler_state_machine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698