eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-05-01 20:07:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

script: Add can_gc to WebIDL dictionary constructors (#39195)

Browse Source 
More progress on can_gc!

Testing: Internal change only, shouldn't change behavior.
Fixes: #38708

---------

Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
This commit is contained in:
lumiscosity
2025-09-08 11:21:42 +02:00
committed by GitHub
parent 1b9dc3e672
commit 9584b9e57d
8 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/script/dom/html/htmlcanvaselement.rs
View File

@@ -260,7 +260,7 @@ impl HTMLCanvasElement {
let canvas =
RootedHTMLCanvasElementOrOffscreenCanvas::HTMLCanvasElement(DomRoot::from_ref(self));
let size = self.get_size();
let attrs = Self::get_gl_attributes(cx, options)?;
let attrs = Self::get_gl_attributes(cx, options, can_gc)?;
let context = WebGLRenderingContext::new(
&window,
&canvas,
@@ -293,7 +293,7 @@ impl HTMLCanvasElement {
let canvas =
RootedHTMLCanvasElementOrOffscreenCanvas::HTMLCanvasElement(DomRoot::from_ref(self));
let size = self.get_size();
let attrs = Self::get_gl_attributes(cx, options)?;
let attrs = Self::get_gl_attributes(cx, options, can_gc)?;
let context = WebGL2RenderingContext::new(&window, &canvas, size, attrs, can_gc)?;
*self.context_mode.borrow_mut() = Some(RenderingContext::WebGL2(Dom::from_ref(&*context)));
Some(context)
@@ -338,9 +338,13 @@ impl HTMLCanvasElement {
}
#[allow(unsafe_code)]
fn get_gl_attributes(cx: JSContext, options: HandleValue) -> Option<GLContextAttributes> {
fn get_gl_attributes(
cx: JSContext,
options: HandleValue,
can_gc: CanGc,
) -> Option<GLContextAttributes> {
unsafe {
match WebGLContextAttributes::new(cx, options) {
match WebGLContextAttributes::new(cx, options, can_gc) {
Ok(ConversionResult::Success(attrs)) => Some(attrs.convert()),
Ok(ConversionResult::Failure(error)) => {
throw_type_error(*cx, &error);