| Index: cc/trees/property_tree.h
|
| diff --git a/cc/trees/property_tree.h b/cc/trees/property_tree.h
|
| index b00d090a3d863eb43bbd2946455cf70dc4cc4cf9..682040b306357e8ff5133bb12078ad42dc710497 100644
|
| --- a/cc/trees/property_tree.h
|
| +++ b/cc/trees/property_tree.h
|
| @@ -399,7 +399,8 @@ class CC_EXPORT ScrollTree final : public PropertyTree<ScrollNode> {
|
| gfx::Transform ScreenSpaceTransform(int scroll_node_id) const;
|
|
|
| const gfx::ScrollOffset current_scroll_offset(int layer_id) const;
|
| - void CollectScrollDeltas(ScrollAndScaleSet* scroll_info);
|
| + void CollectScrollDeltas(ScrollAndScaleSet* scroll_info,
|
| + int inner_viewport_layer_id);
|
| void UpdateScrollOffsetMap(ScrollOffsetMap* new_scroll_offset_map,
|
| LayerTreeImpl* layer_tree_impl);
|
| ScrollOffsetMap& scroll_offset_map();
|
|
|