OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #include "base/trace_event/trace_event_argument.h" | 5 #include "base/trace_event/trace_event_argument.h" |
6 #include "cc/base/math_util.h" | 6 #include "cc/base/math_util.h" |
7 #include "cc/proto/gfx_conversions.h" | 7 #include "cc/proto/gfx_conversions.h" |
8 #include "cc/proto/property_tree.pb.h" | 8 #include "cc/proto/property_tree.pb.h" |
9 #include "cc/trees/transform_node.h" | 9 #include "cc/trees/transform_node.h" |
10 #include "ui/gfx/geometry/point3_f.h" | 10 #include "ui/gfx/geometry/point3_f.h" |
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 value->SetInteger("parent_id", parent_id); | 224 value->SetInteger("parent_id", parent_id); |
225 value->SetInteger("owner_id", owner_id); | 225 value->SetInteger("owner_id", owner_id); |
226 MathUtil::AddToTracedValue("pre_local", pre_local, value); | 226 MathUtil::AddToTracedValue("pre_local", pre_local, value); |
227 MathUtil::AddToTracedValue("local", local, value); | 227 MathUtil::AddToTracedValue("local", local, value); |
228 MathUtil::AddToTracedValue("post_local", post_local, value); | 228 MathUtil::AddToTracedValue("post_local", post_local, value); |
229 // TODO(sunxd): make frameviewer work without target_id | 229 // TODO(sunxd): make frameviewer work without target_id |
230 value->SetInteger("target_id", 0); | 230 value->SetInteger("target_id", 0); |
231 value->SetInteger("content_target_id", 0); | 231 value->SetInteger("content_target_id", 0); |
232 value->SetInteger("source_node_id", source_node_id); | 232 value->SetInteger("source_node_id", source_node_id); |
233 value->SetInteger("sorting_context_id", sorting_context_id); | 233 value->SetInteger("sorting_context_id", sorting_context_id); |
| 234 MathUtil::AddToTracedValue("scroll_offset", scroll_offset, value); |
| 235 MathUtil::AddToTracedValue("scroll_snap", scroll_snap, value); |
234 } | 236 } |
235 | 237 |
236 TransformCachedNodeData::TransformCachedNodeData() | 238 TransformCachedNodeData::TransformCachedNodeData() |
237 : target_id(-1), content_target_id(-1) {} | 239 : target_id(-1), content_target_id(-1) {} |
238 | 240 |
239 TransformCachedNodeData::TransformCachedNodeData( | 241 TransformCachedNodeData::TransformCachedNodeData( |
240 const TransformCachedNodeData& other) = default; | 242 const TransformCachedNodeData& other) = default; |
241 | 243 |
242 TransformCachedNodeData::~TransformCachedNodeData() {} | 244 TransformCachedNodeData::~TransformCachedNodeData() {} |
243 | 245 |
(...skipping 19 matching lines...) Expand all Loading... |
263 const proto::TransformCachedNodeData& proto) { | 265 const proto::TransformCachedNodeData& proto) { |
264 from_target = ProtoToTransform(proto.from_target()); | 266 from_target = ProtoToTransform(proto.from_target()); |
265 to_target = ProtoToTransform(proto.to_target()); | 267 to_target = ProtoToTransform(proto.to_target()); |
266 from_screen = ProtoToTransform(proto.from_screen()); | 268 from_screen = ProtoToTransform(proto.from_screen()); |
267 to_screen = ProtoToTransform(proto.to_screen()); | 269 to_screen = ProtoToTransform(proto.to_screen()); |
268 target_id = proto.target_id(); | 270 target_id = proto.target_id(); |
269 content_target_id = proto.content_target_id(); | 271 content_target_id = proto.content_target_id(); |
270 } | 272 } |
271 | 273 |
272 } // namespace cc | 274 } // namespace cc |
OLD | NEW |