Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-17 18:38:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

script: Fix building with webgl_backtrace feature (#39231)

Browse source 
I think this is the correct solution? GlobalScope::get_cx() doesn't take
a self parameter anymore.

Testing: WebGL tests should suffice.
Fixes: #39228

Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
This commit is contained in:
lumiscosity 2025-09-09 16:09:20 +02:00 • committed by GitHub
parent ebfb5b1abb
commit 721fc01c30
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/script/dom/webgl/webglrenderingcontext.rs
View file

@ -55,10 +55,12 @@ use crate::dom::bindings::codegen::UnionTypes::{
use crate::dom::bindings::conversions::DerivedFrom; use crate::dom::bindings::conversions::DerivedFrom;
use crate::dom::bindings::error::{Error, ErrorResult, Fallible}; use crate::dom::bindings::error::{Error, ErrorResult, Fallible};
use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::inheritance::Castable;
use crate::dom::bindings::reflector::{DomGlobal, DomObject, Reflector, reflect_dom_object}; use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object};
use crate::dom::bindings::root::{DomOnceCell, DomRoot, LayoutDom, MutNullableDom}; use crate::dom::bindings::root::{DomOnceCell, DomRoot, LayoutDom, MutNullableDom};
use crate::dom::bindings::str::DOMString; use crate::dom::bindings::str::DOMString;
use crate::dom::event::{Event, EventBubbles, EventCancelable}; use crate::dom::event::{Event, EventBubbles, EventCancelable};
#[cfg(feature = "webgl_backtrace")]
use crate::dom::globalscope::GlobalScope;
use crate::dom::node::{Node, NodeDamage, NodeTraits}; use crate::dom::node::{Node, NodeDamage, NodeTraits};
#[cfg(feature = "webxr")] #[cfg(feature = "webxr")]
use crate::dom::promise::Promise; use crate::dom::promise::Promise;
@ -366,14 +368,12 @@ impl WebGLRenderingContext {
#[inline] #[inline]
pub(crate) fn send_command(&self, command: WebGLCommand) { pub(crate) fn send_command(&self, command: WebGLCommand) {
self.webgl_sender self.webgl_sender
.send(command, capture_webgl_backtrace(self)) .send(command, capture_webgl_backtrace())
.unwrap(); .unwrap();
} }
pub(crate) fn send_command_ignored(&self, command: WebGLCommand) { pub(crate) fn send_command_ignored(&self, command: WebGLCommand) {
let _ = self let _ = self.webgl_sender.send(command, capture_webgl_backtrace());
.webgl_sender
.send(command, capture_webgl_backtrace(self));
} }
pub(crate) fn webgl_error(&self, err: WebGLError) { pub(crate) fn webgl_error(&self, err: WebGLError) {
@ -2059,16 +2059,16 @@ impl CanvasContext for WebGLRenderingContext {
#[cfg(not(feature = "webgl_backtrace"))] #[cfg(not(feature = "webgl_backtrace"))]
#[inline] #[inline]
pub(crate) fn capture_webgl_backtrace<T: DomObject>(_: &T) -> WebGLCommandBacktrace { pub(crate) fn capture_webgl_backtrace() -> WebGLCommandBacktrace {
WebGLCommandBacktrace {} WebGLCommandBacktrace {}
} }
#[cfg(feature = "webgl_backtrace")] #[cfg(feature = "webgl_backtrace")]
#[cfg_attr(feature = "webgl_backtrace", allow(unsafe_code))] #[cfg_attr(feature = "webgl_backtrace", allow(unsafe_code))]
pub(crate) fn capture_webgl_backtrace<T: DomObject>(obj: &T) -> WebGLCommandBacktrace { pub(crate) fn capture_webgl_backtrace() -> WebGLCommandBacktrace {
let bt = Backtrace::new(); let bt = Backtrace::new();
unsafe { unsafe {
capture_stack!(in(*obj.global().get_cx()) let stack); capture_stack!(in(*GlobalScope::get_cx()) let stack);
WebGLCommandBacktrace { WebGLCommandBacktrace {
backtrace: format!("{:?}", bt), backtrace: format!("{:?}", bt),
js_backtrace: stack.and_then(|s| s.as_string(None, js::jsapi::StackFormat::Default)), js_backtrace: stack.and_then(|s| s.as_string(None, js::jsapi::StackFormat::Default)),
@ -2485,7 +2485,7 @@ impl WebGLRenderingContextMethods<crate::DomTypeHolder> for WebGLRenderingContex
let (sender, receiver) = webgl_channel().unwrap(); let (sender, receiver) = webgl_channel().unwrap();
// If the send does not succeed, assume context lost // If the send does not succeed, assume context lost
let backtrace = capture_webgl_backtrace(self); let backtrace = capture_webgl_backtrace();
if self if self
.webgl_sender .webgl_sender
.send(WebGLCommand::GetContextAttributes(sender), backtrace) .send(WebGLCommand::GetContextAttributes(sender), backtrace)