diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 98d41cbff2f..442f5f8de2d 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -81,7 +81,7 @@ jobs: uses: nttld/setup-ndk@v1 id: setup-ndk with: - ndk-version: r28 + ndk-version: r28b - name: Setup Gradle caches uses: gradle/actions/setup-gradle@v4 - name: Trigger initial download of Gradle with retries diff --git a/Cargo.lock b/Cargo.lock index 19504b0e435..220653fdaba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2384,7 +2384,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -3045,7 +3045,7 @@ dependencies = [ "gobject-sys", "libc", "system-deps", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -4540,7 +4540,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -4844,7 +4844,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -5238,7 +5238,7 @@ dependencies = [ [[package]] name = "mozjs" version = "0.14.1" -source = "git+https://github.com/servo/mozjs#e0a4ee47e686f581faefb201a6fd73bd4dcd67f0" +source = "git+https://github.com/servo/mozjs#518ee8df6f7dcc85bbe184d562cea69c505fc7cc" dependencies = [ "bindgen 0.71.1", "cc", @@ -5250,8 +5250,8 @@ dependencies = [ [[package]] name = "mozjs_sys" -version = "0.137.0-2" -source = "git+https://github.com/servo/mozjs#e0a4ee47e686f581faefb201a6fd73bd4dcd67f0" +version = "0.140.0-0" +source = "git+https://github.com/servo/mozjs#518ee8df6f7dcc85bbe184d562cea69c505fc7cc" dependencies = [ "bindgen 0.71.1", "cc", @@ -7011,7 +7011,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -7024,7 +7024,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.9.4", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -8431,7 +8431,7 @@ dependencies = [ "getrandom 0.3.3", "once_cell", "rustix 1.0.8", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -9966,7 +9966,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] diff --git a/components/config/prefs.rs b/components/config/prefs.rs index dd17204698e..d7bd8f85a1b 100644 --- a/components/config/prefs.rs +++ b/components/config/prefs.rs @@ -216,7 +216,6 @@ pub struct Preferences { pub js_mem_max: i64, pub js_native_regex_enabled: bool, pub js_offthread_compilation_enabled: bool, - pub js_parallel_parsing_enabled: bool, pub js_shared_memory: bool, pub js_throw_on_asmjs_validation_failure: bool, pub js_throw_on_debuggee_would_run: bool, @@ -394,7 +393,6 @@ impl Preferences { js_mem_max: -1, js_native_regex_enabled: true, js_offthread_compilation_enabled: true, - js_parallel_parsing_enabled: true, js_shared_memory: true, js_throw_on_asmjs_validation_failure: false, js_throw_on_debuggee_would_run: false, diff --git a/components/script/script_runtime.rs b/components/script/script_runtime.rs index 19b081f4d5b..8c3ea83baaf 100644 --- a/components/script/script_runtime.rs +++ b/components/script/script_runtime.rs @@ -21,19 +21,19 @@ use std::{os, ptr, thread}; use background_hang_monitor_api::ScriptHangAnnotation; use js::conversions::jsstr_to_string; use js::glue::{ - CollectServoSizes, CreateJobQueue, DeleteJobQueue, DispatchableRun, JS_GetReservedSlot, - JobQueueTraps, RUST_js_GetErrorMessage, SetBuildId, StreamConsumerConsumeChunk, - StreamConsumerNoteResponseURLs, StreamConsumerStreamEnd, StreamConsumerStreamError, + CollectServoSizes, CreateJobQueue, DeleteJobQueue, DispatchablePointer, DispatchableRun, + JS_GetReservedSlot, JobQueueTraps, RUST_js_GetErrorMessage, SetBuildId, SetUpEventLoopDispatch, + StreamConsumerConsumeChunk, StreamConsumerNoteResponseURLs, StreamConsumerStreamEnd, + StreamConsumerStreamError, }; use js::jsapi::{ - AsmJSOption, BuildIdCharVector, CompilationType, ContextOptionsRef, Dispatchable as JSRunnable, + AsmJSOption, BuildIdCharVector, CompilationType, ContextOptionsRef, Dispatchable_MaybeShuttingDown, GCDescription, GCOptions, GCProgress, GCReason, GetPromiseUserInputEventHandlingState, HandleObject, HandleString, - HandleValue as RawHandleValue, Heap, InitConsumeStreamCallback, InitDispatchToEventLoop, - JS_AddExtraGCRootsTracer, JS_InitDestroyPrincipalsCallback, JS_InitReadPrincipalsCallback, - JS_NewObject, JS_NewStringCopyN, JS_SetGCCallback, JS_SetGCParameter, - JS_SetGlobalJitCompilerOption, JS_SetOffthreadIonCompilationEnabled, - JS_SetParallelParsingEnabled, JS_SetReservedSlot, JS_SetSecurityCallbacks, + HandleValue as RawHandleValue, Heap, InitConsumeStreamCallback, JS_AddExtraGCRootsTracer, + JS_InitDestroyPrincipalsCallback, JS_InitReadPrincipalsCallback, JS_NewObject, + JS_NewStringCopyN, JS_SetGCCallback, JS_SetGCParameter, JS_SetGlobalJitCompilerOption, + JS_SetOffthreadIonCompilationEnabled, JS_SetReservedSlot, JS_SetSecurityCallbacks, JSCLASS_RESERVED_SLOTS_MASK, JSCLASS_RESERVED_SLOTS_SHIFT, JSClass, JSClassOps, JSContext as RawJSContext, JSGCParamKey, JSGCStatus, JSJitCompilerOption, JSObject, JSSecurityCallbacks, JSTracer, JobQueue, MimeType, MutableHandleObject, MutableHandleString, @@ -694,7 +694,7 @@ impl Runtime { unsafe extern "C" fn dispatch_to_event_loop( closure: *mut c_void, - dispatchable: *mut JSRunnable, + dispatchable: *mut DispatchablePointer, ) -> bool { let networking_task_src: &SendableTaskSource = &*(closure as *mut SendableTaskSource); let runnable = Runnable(dispatchable); @@ -711,7 +711,7 @@ impl Runtime { let mut networking_task_src_ptr = std::ptr::null_mut(); if let Some(source) = networking_task_source { networking_task_src_ptr = Box::into_raw(Box::new(source)); - InitDispatchToEventLoop( + SetUpEventLoopDispatch( cx, Some(dispatch_to_event_loop), networking_task_src_ptr as *mut c_void, @@ -777,7 +777,6 @@ impl Runtime { JSJitCompilerOption::JSJITCOMPILER_NATIVE_REGEXP_ENABLE, pref!(js_native_regex_enabled) as u32, ); - JS_SetParallelParsingEnabled(cx, pref!(js_parallel_parsing_enabled)); JS_SetOffthreadIonCompilationEnabled(cx, pref!(js_offthread_compilation_enabled)); JS_SetGlobalJitCompilerOption( cx, @@ -1263,7 +1262,7 @@ unsafe extern "C" fn report_stream_error(_cx: *mut RawJSContext, error_code: usi ); } -pub(crate) struct Runnable(*mut JSRunnable); +pub(crate) struct Runnable(*mut DispatchablePointer); #[allow(unsafe_code)] unsafe impl Sync for Runnable {} diff --git a/tests/wpt/meta/webaudio/the-audio-api/the-delaynode-interface/delay-test.html.ini b/tests/wpt/meta/webaudio/the-audio-api/the-delaynode-interface/delay-test.html.ini index f62de3b230e..b70a0c163d4 100644 --- a/tests/wpt/meta/webaudio/the-audio-api/the-delaynode-interface/delay-test.html.ini +++ b/tests/wpt/meta/webaudio/the-audio-api/the-delaynode-interface/delay-test.html.ini @@ -8,6 +8,6 @@ [X Creating ConstantSourceNode(context) and DelayNode(context) incorrectly threw ReferenceError: "DelayNode is not defined".] expected: FAIL - [X Setting delayTime to 3 frames incorrectly threw TypeError: "delay is undefined".] + [X Setting delayTime to 3 frames incorrectly threw TypeError: "can't access property "delayTime", delay is undefined".] expected: FAIL diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 12a84179672..5fdb9942599 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -10651,7 +10651,7 @@ [] ], "interfaces.js": [ - "24c7fa68dbca91a9d26b2534c81ea7338cb2102a", + "52fc87e916db0cd9143304eac883d975b6faf75e", [] ], "max-session-history-frame.html": [ diff --git a/tests/wpt/mozilla/tests/mozilla/interfaces.js b/tests/wpt/mozilla/tests/mozilla/interfaces.js index 24c7fa68dbc..52fc87e916d 100644 --- a/tests/wpt/mozilla/tests/mozilla/interfaces.js +++ b/tests/wpt/mozilla/tests/mozilla/interfaces.js @@ -50,6 +50,7 @@ function test_interfaces(interfaceNamesInGlobalScope) { "String", "Symbol", "SyntaxError", + "Temporal", "TextMetrics", "TypeError", "URIError",