mirror of
https://github.com/servo/servo.git
synced 2025-08-01 11:40:30 +01:00
Auto merge of #27266 - jdm:hubs-stubs3, r=Manishearth
Hide Window extension methods by default and add helper Window.js_backtrace method Fixes #26858.
This commit is contained in:
commit
1e182cd185
16 changed files with 40 additions and 8 deletions
|
@ -18,8 +18,8 @@ jitspew = ['js/jitspew']
|
|||
profilemozjs = ['js/profilemozjs']
|
||||
unrooted_must_root_lint = ["script_plugins/unrooted_must_root_lint"]
|
||||
default = ["unrooted_must_root_lint"]
|
||||
webgl_backtrace = ["backtrace", "canvas_traits/webgl_backtrace"]
|
||||
js_backtrace = ["backtrace"]
|
||||
webgl_backtrace = ["canvas_traits/webgl_backtrace"]
|
||||
js_backtrace = []
|
||||
refcell_backtrace = ["accountable-refcell"]
|
||||
uwp = ["js/uwp"]
|
||||
xr-profile = ["webxr-api/profile"]
|
||||
|
@ -33,7 +33,7 @@ serde_json = "1.0"
|
|||
accountable-refcell = { version = "0.2.0", optional = true }
|
||||
app_units = "0.7"
|
||||
arrayvec = "0.5.1"
|
||||
backtrace = { version = "0.3", optional = true }
|
||||
backtrace = "0.3"
|
||||
base64 = "0.10.1"
|
||||
bitflags = "1.0"
|
||||
bluetooth_traits = { path = "../bluetooth_traits" }
|
||||
|
|
|
@ -136,9 +136,14 @@ partial interface Window {
|
|||
|
||||
// Proprietary extensions.
|
||||
partial interface Window {
|
||||
[Pref="dom.servo_helpers.enabled"]
|
||||
void debug(DOMString arg);
|
||||
[Pref="dom.servo_helpers.enabled"]
|
||||
void gc();
|
||||
[Pref="dom.servo_helpers.enabled"]
|
||||
void trap();
|
||||
[Pref="dom.servo_helpers.enabled"]
|
||||
void js_backtrace();
|
||||
};
|
||||
|
||||
// WebDriver extensions
|
||||
|
|
|
@ -72,6 +72,7 @@ use crate::task_source::{TaskSource, TaskSourceName};
|
|||
use crate::timers::{IsInterval, TimerCallback};
|
||||
use crate::webdriver_handlers::jsval_to_webdriver;
|
||||
use app_units::Au;
|
||||
use backtrace::Backtrace;
|
||||
use base64;
|
||||
use bluetooth_traits::BluetoothRequest;
|
||||
use canvas_traits::webgl::WebGLChan;
|
||||
|
@ -89,7 +90,7 @@ use js::jsapi::Heap;
|
|||
use js::jsapi::JSAutoRealm;
|
||||
use js::jsapi::JSObject;
|
||||
use js::jsapi::JSPROP_ENUMERATE;
|
||||
use js::jsapi::{GCReason, JS_GC};
|
||||
use js::jsapi::{GCReason, StackFormat, JS_GC};
|
||||
use js::jsval::UndefinedValue;
|
||||
use js::jsval::{JSVal, NullValue};
|
||||
use js::rust::wrappers::JS_DefineProperty;
|
||||
|
@ -1081,6 +1082,20 @@ impl WindowMethods for Window {
|
|||
unsafe { ::std::intrinsics::breakpoint() }
|
||||
}
|
||||
|
||||
#[allow(unsafe_code)]
|
||||
fn Js_backtrace(&self) {
|
||||
unsafe {
|
||||
capture_stack!(in(*self.get_cx()) let stack);
|
||||
let js_stack = stack.and_then(|s| s.as_string(None, StackFormat::SpiderMonkey));
|
||||
let rust_stack = Backtrace::new();
|
||||
println!(
|
||||
"Current JS stack:\n{}\nCurrent Rust stack:\n{:?}",
|
||||
js_stack.unwrap_or(String::new()),
|
||||
rust_stack
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[allow(unsafe_code)]
|
||||
fn WebdriverCallback(&self, cx: JSContext, val: HandleValue) {
|
||||
let rv = unsafe { jsval_to_webdriver(*cx, &self.globalscope, val) };
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue