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

Side by Side Diff: cc/trees/scroll_node.cc

Issue 2860293002: Change cc::ElementId to be a uint64_t (Closed)
Patch Set: none Created 3 years, 7 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 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/input/main_thread_scrolling_reason.h" 7 #include "cc/input/main_thread_scrolling_reason.h"
8 #include "cc/layers/layer.h" 8 #include "cc/layers/layer.h"
9 #include "cc/trees/element_id.h" 9 #include "cc/trees/element_id.h"
10 #include "cc/trees/property_tree.h" 10 #include "cc/trees/property_tree.h"
11 #include "cc/trees/scroll_node.h" 11 #include "cc/trees/scroll_node.h"
12 12
13 namespace cc { 13 namespace cc {
14 14
15 ScrollNode::ScrollNode() 15 ScrollNode::ScrollNode()
16 : id(ScrollTree::kInvalidNodeId), 16 : id(ScrollTree::kInvalidNodeId),
17 parent_id(ScrollTree::kInvalidNodeId), 17 parent_id(ScrollTree::kInvalidNodeId),
18 owning_layer_id(Layer::INVALID_ID), 18 owning_layer_id(Layer::INVALID_ID),
19 scrollable(false), 19 scrollable(false),
20 main_thread_scrolling_reasons( 20 main_thread_scrolling_reasons(
21 MainThreadScrollingReason::kNotScrollingOnMain), 21 MainThreadScrollingReason::kNotScrollingOnMain),
22 max_scroll_offset_affected_by_page_scale(false), 22 max_scroll_offset_affected_by_page_scale(false),
23 scrolls_inner_viewport(false), 23 scrolls_inner_viewport(false),
24 scrolls_outer_viewport(false), 24 scrolls_outer_viewport(false),
25 should_flatten(false), 25 should_flatten(false),
26 user_scrollable_horizontal(false), 26 user_scrollable_horizontal(false),
27 user_scrollable_vertical(false), 27 user_scrollable_vertical(false),
28 element_id(kInvalidElementId),
28 transform_id(0) {} 29 transform_id(0) {}
29 30
30 ScrollNode::ScrollNode(const ScrollNode& other) = default; 31 ScrollNode::ScrollNode(const ScrollNode& other) = default;
31 32
32 bool ScrollNode::operator==(const ScrollNode& other) const { 33 bool ScrollNode::operator==(const ScrollNode& other) const {
33 return id == other.id && parent_id == other.parent_id && 34 return id == other.id && parent_id == other.parent_id &&
34 owning_layer_id == other.owning_layer_id && 35 owning_layer_id == other.owning_layer_id &&
35 scrollable == other.scrollable && 36 scrollable == other.scrollable &&
36 main_thread_scrolling_reasons == other.main_thread_scrolling_reasons && 37 main_thread_scrolling_reasons == other.main_thread_scrolling_reasons &&
37 non_fast_scrollable_region == other.non_fast_scrollable_region && 38 non_fast_scrollable_region == other.non_fast_scrollable_region &&
(...skipping 17 matching lines...) Expand all
55 value->SetBoolean("scrollable", scrollable); 56 value->SetBoolean("scrollable", scrollable);
56 MathUtil::AddToTracedValue("scroll_clip_layer_bounds", 57 MathUtil::AddToTracedValue("scroll_clip_layer_bounds",
57 scroll_clip_layer_bounds, value); 58 scroll_clip_layer_bounds, value);
58 MathUtil::AddToTracedValue("bounds", bounds, value); 59 MathUtil::AddToTracedValue("bounds", bounds, value);
59 MathUtil::AddToTracedValue("offset_to_transform_parent", 60 MathUtil::AddToTracedValue("offset_to_transform_parent",
60 offset_to_transform_parent, value); 61 offset_to_transform_parent, value);
61 value->SetBoolean("should_flatten", should_flatten); 62 value->SetBoolean("should_flatten", should_flatten);
62 value->SetBoolean("user_scrollable_horizontal", user_scrollable_horizontal); 63 value->SetBoolean("user_scrollable_horizontal", user_scrollable_horizontal);
63 value->SetBoolean("user_scrollable_vertical", user_scrollable_vertical); 64 value->SetBoolean("user_scrollable_vertical", user_scrollable_vertical);
64 65
65 element_id.AddToTracedValue(value); 66 value->SetInteger("element_id", element_id);
66 value->SetInteger("transform_id", transform_id); 67 value->SetInteger("transform_id", transform_id);
67 } 68 }
68 69
69 } // namespace cc 70 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698