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

Make LayoutCanvasRenderingContext2DHelpers::get_canvas_id be safe

Browse source
This commit is contained in:
Anthony Ramine 2020-03-31 20:58:20 +02:00
parent fbc3e430ab
commit e561911066
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/script/dom/canvasrenderingcontext2d.rs
View file

@ -153,8 +153,7 @@ impl CanvasRenderingContext2D {
pub trait LayoutCanvasRenderingContext2DHelpers {
#[allow(unsafe_code)]
unsafe fn get_ipc_renderer(self) -> IpcSender<CanvasMsg>;
#[allow(unsafe_code)]
unsafe fn get_canvas_id(self) -> CanvasId;
fn get_canvas_id(self) -> CanvasId;
}
impl LayoutCanvasRenderingContext2DHelpers for LayoutDom<'_, CanvasRenderingContext2D> {
@ -168,11 +167,16 @@ impl LayoutCanvasRenderingContext2DHelpers for LayoutDom<'_, CanvasRenderingCont
}
#[allow(unsafe_code)]
unsafe fn get_canvas_id(self) -> CanvasId {
(*self.unsafe_get())
.canvas_state
.borrow_for_layout()
.get_canvas_id()
fn get_canvas_id(self) -> CanvasId {
// FIXME(nox): This relies on the fact that CanvasState::get_canvas_id
// does nothing fancy but it would be easier to trust a
// LayoutDom<_>-like type that would wrap the &CanvasState.
unsafe {
self.unsafe_get()
.canvas_state
.borrow_for_layout()
.get_canvas_id()
}
}
}