blob: fa1ad0db7b8265233f6145f0787b6433e857b762 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
--- cc/layers/layer_impl.cc.orig 2016-01-21 13:23:19.448767974 +0100
+++ cc/layers/layer_impl.cc 2016-01-21 13:24:08.192764717 +0100
@@ -1549,13 +1549,15 @@
scaled_scroll_bounds.SetSize(std::floor(scaled_scroll_bounds.width()),
std::floor(scaled_scroll_bounds.height()));
- gfx::ScrollOffset max_offset(
+ // (rene) prevent name collision with /usr/include/vm/vm_map.h on FreeBSD
+ // which also defines max_offset
+ gfx::ScrollOffset _max_offset(
scaled_scroll_bounds.width() - scroll_clip_layer->bounds().width(),
scaled_scroll_bounds.height() - scroll_clip_layer->bounds().height());
// We need the final scroll offset to be in CSS coords.
- max_offset.Scale(1 / scale_factor);
- max_offset.SetToMax(gfx::ScrollOffset());
- return max_offset;
+ _max_offset.Scale(1 / scale_factor);
+ _max_offset.SetToMax(gfx::ScrollOffset());
+ return _max_offset;
}
gfx::ScrollOffset LayerImpl::ClampScrollOffsetToLimits(
|
