aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-cc_trees_property__tree.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-cc_trees_property__tree.cc')
-rw-r--r--www/chromium/files/patch-cc_trees_property__tree.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc
index 549b1400f3a2..1b68ad522dde 100644
--- a/www/chromium/files/patch-cc_trees_property__tree.cc
+++ b/www/chromium/files/patch-cc_trees_property__tree.cc
@@ -1,8 +1,8 @@
---- cc/trees/property_tree.cc.orig 2017-06-05 19:03:01 UTC
+--- cc/trees/property_tree.cc.orig 2019-03-11 22:00:52 UTC
+++ cc/trees/property_tree.cc
-@@ -1256,13 +1256,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
+@@ -1325,13 +1325,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro
- gfx::Size clip_layer_bounds = scroll_clip_layer_bounds(scroll_node->id);
+ gfx::Size clip_layer_bounds = container_bounds(scroll_node->id);
- gfx::ScrollOffset max_offset(
+ gfx::ScrollOffset _max_offset(
@@ -17,4 +17,4 @@
+ return _max_offset;
}
- void ScrollTree::OnScrollOffsetAnimated(int layer_id,
+ gfx::SizeF ScrollTree::scroll_bounds(int scroll_node_id) const {