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

Side by Side Diff: cc/scheduler/scheduler_state_machine.h

Issue 882673002: 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: Edited formatting 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
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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_STATE_MACHINE_H_ 5 #ifndef CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_
6 #define CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_ 6 #define CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/time/time.h" 12 #include "base/time/time.h"
13 #include "cc/base/cc_export.h" 13 #include "cc/base/cc_export.h"
14 #include "cc/output/begin_frame_args.h" 14 #include "cc/output/begin_frame_args.h"
15 #include "cc/scheduler/commit_earlyout_reason.h" 15 #include "cc/scheduler/commit_earlyout_reason.h"
16 #include "cc/scheduler/draw_result.h" 16 #include "cc/scheduler/draw_result.h"
17 #include "cc/scheduler/scheduler_settings.h" 17 #include "cc/scheduler/scheduler_settings.h"
18 18
19 namespace base { 19 namespace base {
20 namespace debug { 20 namespace trace_event {
21 class ConvertableToTraceFormat; 21 class ConvertableToTraceFormat;
22 class TracedValue; 22 class TracedValue;
23 } 23 }
24
25 // This is added temporarily. Once the renaming of namespace usages
26 // accross all folders are done, this will be removed.
27 // TODO(ssid): crrev.com/837303004
28 namespace debug {
29 using ::base::trace_event::ConvertableToTraceFormat;
30 using ::base::trace_event::TracedValue;
31 }
24 class Value; 32 class Value;
25 } 33 } // namespace base
26 34
27 namespace cc { 35 namespace cc {
28 36
29 // The SchedulerStateMachine decides how to coordinate main thread activites 37 // The SchedulerStateMachine decides how to coordinate main thread activites
30 // like painting/running javascript with rendering and input activities on the 38 // like painting/running javascript with rendering and input activities on the
31 // impl thread. 39 // impl thread.
32 // 40 //
33 // The state machine tracks internal state but is also influenced by external 41 // The state machine tracks internal state but is also influenced by external
34 // state. Internal state includes things like whether a frame has been 42 // state. Internal state includes things like whether a frame has been
35 // requested, while external state includes things like the current time being 43 // requested, while external state includes things like the current time being
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 bool impl_latency_takes_priority_on_battery_; 350 bool impl_latency_takes_priority_on_battery_;
343 bool children_need_begin_frames_; 351 bool children_need_begin_frames_;
344 352
345 private: 353 private:
346 DISALLOW_COPY_AND_ASSIGN(SchedulerStateMachine); 354 DISALLOW_COPY_AND_ASSIGN(SchedulerStateMachine);
347 }; 355 };
348 356
349 } // namespace cc 357 } // namespace cc
350 358
351 #endif // CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_ 359 #endif // CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698