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

Update hit test result return type

Browse source 
Signed-off-by: batu_hoang <longvatrong111@gmail.com>
This commit is contained in:
batu_hoang 2025-05-28 14:22:30 +08:00
parent b5a3c975a9
commit ddad26f6c8
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/compositing/compositor.rs
View file

@ -283,8 +283,7 @@ impl PipelineDetails {
pub enum HitTestError {
EpochMismatch,
#[allow(dead_code)]
Other,
Others,
}
impl ServoRenderer {
@ -296,14 +295,17 @@ impl ServoRenderer {
&self,
point: DevicePoint,
details_for_pipeline: impl Fn(PipelineId) -> Option<&'a PipelineDetails>,
) -> Result<Option<CompositorHitTestResult>, HitTestError> {
) -> Result<CompositorHitTestResult, HitTestError> {
match self.hit_test_at_point_with_flags_and_pipeline(
point,
HitTestFlags::empty(),
None,
details_for_pipeline,
) {
Ok(hit_test_results) => Ok(hit_test_results.first().cloned()),
Ok(hit_test_results) => hit_test_results
.first()
.cloned()
.ok_or(HitTestError::Others),
Err(error) => Err(error),
}
}
@ -639,7 +641,7 @@ impl IOCompositor {
.global
.borrow()
.hit_test_at_point(point, details_for_pipeline);
if let Ok(Some(result)) = result {
if let Ok(result) = result {
self.global.borrow_mut().update_cursor(point, &result);
}
}