mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
CanGc fixes in errorevent.rs
(#33960)
* CanGc fixes in errorevent.rs Signed-off-by: taniishkaaa <tanishkasingh2004@gmail.com> * Allow too_many_arguments to avoid lint error Signed-off-by: taniishkaaa <tanishkasingh2004@gmail.com> --------- Signed-off-by: taniishkaaa <tanishkasingh2004@gmail.com>
This commit is contained in:
parent
575e885529
commit
7015e0fb5f
21 changed files with 79 additions and 51 deletions
|
@ -2453,7 +2453,7 @@ impl GlobalScope {
|
|||
}
|
||||
|
||||
/// <https://html.spec.whatwg.org/multipage/#report-the-error>
|
||||
pub fn report_an_error(&self, error_info: ErrorInfo, value: HandleValue) {
|
||||
pub fn report_an_error(&self, error_info: ErrorInfo, value: HandleValue, can_gc: CanGc) {
|
||||
// Step 1.
|
||||
if self.in_error_reporting_mode.get() {
|
||||
return;
|
||||
|
@ -2474,6 +2474,7 @@ impl GlobalScope {
|
|||
error_info.lineno,
|
||||
error_info.column,
|
||||
value,
|
||||
can_gc,
|
||||
);
|
||||
|
||||
// Step 7.
|
||||
|
@ -2613,6 +2614,7 @@ impl GlobalScope {
|
|||
rval: MutableHandleValue,
|
||||
fetch_options: ScriptFetchOptions,
|
||||
script_base_url: ServoUrl,
|
||||
can_gc: CanGc,
|
||||
) -> bool {
|
||||
let source_code = SourceCode::Text(Rc::new(DOMString::from_string((*code).to_string())));
|
||||
self.evaluate_script_on_global_with_result(
|
||||
|
@ -2622,11 +2624,13 @@ impl GlobalScope {
|
|||
1,
|
||||
fetch_options,
|
||||
script_base_url,
|
||||
can_gc,
|
||||
)
|
||||
}
|
||||
|
||||
/// Evaluate a JS script on this global scope.
|
||||
#[allow(unsafe_code)]
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn evaluate_script_on_global_with_result(
|
||||
&self,
|
||||
code: &SourceCode,
|
||||
|
@ -2635,6 +2639,7 @@ impl GlobalScope {
|
|||
line_number: u32,
|
||||
fetch_options: ScriptFetchOptions,
|
||||
script_base_url: ServoUrl,
|
||||
can_gc: CanGc,
|
||||
) -> bool {
|
||||
let metadata = profile_time::TimerMetadata {
|
||||
url: if filename.is_empty() {
|
||||
|
@ -2671,7 +2676,7 @@ impl GlobalScope {
|
|||
|
||||
if compiled_script.is_null() {
|
||||
debug!("error compiling Dom string");
|
||||
report_pending_exception(*cx, true, InRealm::Entered(&ar));
|
||||
report_pending_exception(*cx, true, InRealm::Entered(&ar), can_gc);
|
||||
return false;
|
||||
}
|
||||
},
|
||||
|
@ -2720,7 +2725,7 @@ impl GlobalScope {
|
|||
|
||||
if !result {
|
||||
debug!("error evaluating Dom string");
|
||||
report_pending_exception(*cx, true, InRealm::Entered(&ar));
|
||||
report_pending_exception(*cx, true, InRealm::Entered(&ar), can_gc);
|
||||
}
|
||||
|
||||
maybe_resume_unwind();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue