| Index: cc/trees/scroll_node.cc
|
| diff --git a/cc/trees/scroll_node.cc b/cc/trees/scroll_node.cc
|
| index 18b5d42d974b2515f92aa940c69d882f784fe73c..ef3498a6712f7a44009d3ef2449d3527d1a3a7e0 100644
|
| --- a/cc/trees/scroll_node.cc
|
| +++ b/cc/trees/scroll_node.cc
|
| @@ -21,8 +21,8 @@ ScrollNode::ScrollNode()
|
| MainThreadScrollingReason::kNotScrollingOnMain),
|
| contains_non_fast_scrollable_region(false),
|
| max_scroll_offset_affected_by_page_scale(false),
|
| - is_inner_viewport_scroll_layer(false),
|
| - is_outer_viewport_scroll_layer(false),
|
| + scrolls_inner_viewport(false),
|
| + scrolls_outer_viewport(false),
|
| should_flatten(false),
|
| user_scrollable_horizontal(false),
|
| user_scrollable_vertical(false),
|
| @@ -41,10 +41,8 @@ bool ScrollNode::operator==(const ScrollNode& other) const {
|
| bounds == other.bounds &&
|
| max_scroll_offset_affected_by_page_scale ==
|
| other.max_scroll_offset_affected_by_page_scale &&
|
| - is_inner_viewport_scroll_layer ==
|
| - other.is_inner_viewport_scroll_layer &&
|
| - is_outer_viewport_scroll_layer ==
|
| - other.is_outer_viewport_scroll_layer &&
|
| + scrolls_inner_viewport == other.scrolls_inner_viewport &&
|
| + scrolls_outer_viewport == other.scrolls_outer_viewport &&
|
| offset_to_transform_parent == other.offset_to_transform_parent &&
|
| should_flatten == other.should_flatten &&
|
| user_scrollable_horizontal == other.user_scrollable_horizontal &&
|
|
|