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

Unified Diff: cc/trees/scroll_node.cc

Issue 2612883002: Rename cc property tree node owner_id to owning_layer_id. (Closed)
Patch Set: Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/scroll_node.h ('k') | cc/trees/transform_node.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/scroll_node.cc
diff --git a/cc/trees/scroll_node.cc b/cc/trees/scroll_node.cc
index 5da6957545aa92e1962145dfcb6beeb510187de3..0e0c7777a5a1d756c0ba1a77c520df300a5b67ef 100644
--- a/cc/trees/scroll_node.cc
+++ b/cc/trees/scroll_node.cc
@@ -14,7 +14,7 @@ namespace cc {
ScrollNode::ScrollNode()
: id(-1),
parent_id(-1),
- owner_id(-1),
+ owning_layer_id(-1),
scrollable(false),
main_thread_scrolling_reasons(
MainThreadScrollingReason::kNotScrollingOnMain),
@@ -31,7 +31,8 @@ ScrollNode::ScrollNode(const ScrollNode& other) = default;
bool ScrollNode::operator==(const ScrollNode& other) const {
return id == other.id && parent_id == other.parent_id &&
- owner_id == other.owner_id && scrollable == other.scrollable &&
+ owning_layer_id == other.owning_layer_id &&
+ scrollable == other.scrollable &&
main_thread_scrolling_reasons == other.main_thread_scrolling_reasons &&
contains_non_fast_scrollable_region ==
other.contains_non_fast_scrollable_region &&
@@ -53,7 +54,7 @@ bool ScrollNode::operator==(const ScrollNode& other) const {
void ScrollNode::AsValueInto(base::trace_event::TracedValue* value) const {
value->SetInteger("id", id);
value->SetInteger("parent_id", parent_id);
- value->SetInteger("owner_id", owner_id);
+ value->SetInteger("owning_layer_id", owning_layer_id);
value->SetBoolean("scrollable", scrollable);
MathUtil::AddToTracedValue("scroll_clip_layer_bounds",
scroll_clip_layer_bounds, value);
« no previous file with comments | « cc/trees/scroll_node.h ('k') | cc/trees/transform_node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698