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

Side by Side Diff: cc/output/begin_frame_args.h

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase Created 4 years, 8 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/layers/viewport.cc ('k') | cc/output/begin_frame_args.cc » ('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_OUTPUT_BEGIN_FRAME_ARGS_H_ 5 #ifndef CC_OUTPUT_BEGIN_FRAME_ARGS_H_
6 #define CC_OUTPUT_BEGIN_FRAME_ARGS_H_ 6 #define CC_OUTPUT_BEGIN_FRAME_ARGS_H_
7 7
8 #include <memory>
9
8 #include "base/location.h" 10 #include "base/location.h"
9 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "base/time/time.h" 12 #include "base/time/time.h"
12 #include "base/values.h" 13 #include "base/values.h"
13 #include "cc/base/cc_export.h" 14 #include "cc/base/cc_export.h"
14 15
15 namespace base { 16 namespace base {
16 namespace trace_event { 17 namespace trace_event {
17 class ConvertableToTraceFormat; 18 class ConvertableToTraceFormat;
18 class TracedValue; 19 class TracedValue;
19 } 20 }
20 } 21 }
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 // This is the default delta that will be used to adjust the deadline when 77 // This is the default delta that will be used to adjust the deadline when
77 // proper draw-time estimations are not yet available. 78 // proper draw-time estimations are not yet available.
78 static base::TimeDelta DefaultEstimatedParentDrawTime(); 79 static base::TimeDelta DefaultEstimatedParentDrawTime();
79 80
80 // This is the default interval to use to avoid sprinkling the code with 81 // This is the default interval to use to avoid sprinkling the code with
81 // magic numbers. 82 // magic numbers.
82 static base::TimeDelta DefaultInterval(); 83 static base::TimeDelta DefaultInterval();
83 84
84 bool IsValid() const { return interval >= base::TimeDelta(); } 85 bool IsValid() const { return interval >= base::TimeDelta(); }
85 86
86 scoped_ptr<base::trace_event::ConvertableToTraceFormat> AsValue() const; 87 std::unique_ptr<base::trace_event::ConvertableToTraceFormat> AsValue() const;
87 void AsValueInto(base::trace_event::TracedValue* dict) const; 88 void AsValueInto(base::trace_event::TracedValue* dict) const;
88 89
89 void ToProtobuf(proto::BeginFrameArgs* proto) const; 90 void ToProtobuf(proto::BeginFrameArgs* proto) const;
90 void FromProtobuf(const proto::BeginFrameArgs& proto); 91 void FromProtobuf(const proto::BeginFrameArgs& proto);
91 92
92 base::TimeTicks frame_time; 93 base::TimeTicks frame_time;
93 base::TimeTicks deadline; 94 base::TimeTicks deadline;
94 base::TimeDelta interval; 95 base::TimeDelta interval;
95 BeginFrameArgsType type; 96 BeginFrameArgsType type;
96 bool on_critical_path; 97 bool on_critical_path;
97 98
98 private: 99 private:
99 BeginFrameArgs(base::TimeTicks frame_time, 100 BeginFrameArgs(base::TimeTicks frame_time,
100 base::TimeTicks deadline, 101 base::TimeTicks deadline,
101 base::TimeDelta interval, 102 base::TimeDelta interval,
102 BeginFrameArgsType type); 103 BeginFrameArgsType type);
103 }; 104 };
104 105
105 } // namespace cc 106 } // namespace cc
106 107
107 #endif // CC_OUTPUT_BEGIN_FRAME_ARGS_H_ 108 #endif // CC_OUTPUT_BEGIN_FRAME_ARGS_H_
OLDNEW
« no previous file with comments | « cc/layers/viewport.cc ('k') | cc/output/begin_frame_args.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698