Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

gfx: Don't mutate the same point multiple times while translating it to other stacking context space.

Browse source 
I don't know how neither review or a test caught this.
This commit is contained in:
Emilio Cobos Álvarez 2017-01-16 14:28:04 +01:00
parent 9cd1b861ec
commit 602b45a372
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
4 changed files with 43 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/gfx/display_list/mod.rs
View file

@ -115,7 +115,7 @@ impl DisplayList {
// Return all nodes containing the point of interest, bottommost first, and
// respecting the `pointer-events` CSS property.
pub fn hit_test(&self,
translated_point: &mut Point2D<Au>,
translated_point: &Point2D<Au>,
client_point: &Point2D<Au>,
scroll_offsets: &ScrollOffsetMap)
-> Vec<DisplayItemMetadata> {
@ -131,28 +131,30 @@ impl DisplayList {
pub fn hit_test_contents<'a>(&self,
traversal: &mut DisplayListTraversal<'a>,
translated_point: &mut Point2D<Au>,
translated_point: &Point2D<Au>,
client_point: &Point2D<Au>,
scroll_offsets: &ScrollOffsetMap,
result: &mut Vec<DisplayItemMetadata>) {
while let Some(item) = traversal.next() {
match item {
&DisplayItem::PushStackingContext(ref stacking_context_item) => {
let mut point = *translated_point;
DisplayList::translate_point(&stacking_context_item.stacking_context,
translated_point,
&mut point,
client_point);
self.hit_test_contents(traversal,
translated_point,
&point,
client_point,
scroll_offsets,
result);
}
&DisplayItem::PushScrollRoot(ref item) => {
let mut point = *translated_point;
DisplayList::scroll_root(&item.scroll_root,
translated_point,
&mut point,
scroll_offsets);
self.hit_test_contents(traversal,
translated_point,
&point,
client_point,
scroll_offsets,
result);

4
components/layout/query.rs
View file

@ -141,7 +141,7 @@ impl LayoutRPC for LayoutRPCImpl {
fn nodes_from_point(&self,
page_point: Point2D<f32>,
client_point: Point2D<f32>) -> Vec<UntrustedNodeAddress> {
let mut page_point = Point2D::new(Au::from_f32_px(page_point.x),
let page_point = Point2D::new(Au::from_f32_px(page_point.x),
Au::from_f32_px(page_point.y));
let client_point = Point2D::new(Au::from_f32_px(client_point.x),
Au::from_f32_px(client_point.y));
@ -152,7 +152,7 @@ impl LayoutRPC for LayoutRPCImpl {
let result = match rw_data.display_list {
None => panic!("Tried to hit test without a DisplayList"),
Some(ref display_list) => {
display_list.hit_test(&mut page_point,
display_list.hit_test(&page_point,
&client_point,
&rw_data.stacking_context_scroll_offsets)
}