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

Keep is_point_in_path using a path, rather than a path builder.

Browse source
This commit is contained in:
Josh Matthews 2019-02-07 15:09:59 -05:00
parent 2c5a6ebc53
commit decf88331b
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
components/canvas/canvas_data.rs
View file

@ -439,19 +439,14 @@ impl<'a> CanvasData<'a> {
chan: IpcSender<bool>, chan: IpcSender<bool>,
) { ) {
self.ensure_path(); self.ensure_path();
let (result, new_state) = match *self.path_state.as_mut().unwrap() { let result = match self.path_state.as_ref() {
PathState::UserSpacePath(ref path, ref mut transform) => { Some(PathState::UserSpacePath(ref path, ref transform)) => {
let result = { let target_transform = self.drawtarget.get_transform();
let path_transform = transform.as_ref().unwrap_or(&self.state.transform); let path_transform = transform.as_ref().unwrap_or(&target_transform);
path.contains_point(x, y, path_transform) path.contains_point(x, y, path_transform)
};
let state = PathState::UserSpacePathBuilder(path.copy_to_builder(), transform.take());
(result, state)
} }
PathState::UserSpacePathBuilder(..) | Some(_) | None => false,
PathState::DeviceSpacePathBuilder(..) => unreachable!(),
}; };
self.path_state = Some(new_state);
chan.send(result).unwrap(); chan.send(result).unwrap();
} }