+2 -3

Cargo.lock

reviewed

··· 9104 9104 "serde", 9105 9105 "serde_json", 9106 9106 "servo-config-macro", 9107 9107 - "servo-url", 9108 9107 "stylo_static_prefs", 9109 9108 ] 9110 9109 ··· 11764 11763 11765 11764 [[package]] 11766 11765 name = "tracing-subscriber" 11767 11767 - version = "0.3.22" 11766 11766 + version = "0.3.23" 11768 11767 source = "registry+https://github.com/rust-lang/crates.io-index" 11769 11769 - checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" 11768 11768 + checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319" 11770 11769 dependencies = [ 11771 11770 "matchers", 11772 11771 "nu-ansi-term",

+1 -1

forkme.lock

reviewed

··· 1 1 - 97225f55370e78e869fc3fc0ec0821b4a9053454 1 1 + eb249afac8127af3cc4312f3065c0f1dfa8102d5

+5 -5

patches/components/constellation/constellation.rs.patch

reviewed

··· 498 498 /// Check the origin of a message against that of the pipeline it came from. 499 499 /// Note: this is still limited as a security check, 500 500 /// see <https://github.com/servo/servo/issues/11722> 501 501 - @@ -3204,6 +3519,13 @@ 501 501 + @@ -3246,6 +3561,13 @@ 502 502 /// <https://html.spec.whatwg.org/multipage/#destroy-a-top-level-traversable> 503 503 fn handle_close_top_level_browsing_context(&mut self, webview_id: WebViewId) { 504 504 debug!("{webview_id}: Closing"); ··· 512 512 let browsing_context_id = BrowsingContextId::from(webview_id); 513 513 // Step 5. Remove traversable from the user agent's top-level traversable set. 514 514 let browsing_context = 515 515 - @@ -3480,8 +3802,27 @@ 515 515 + @@ -3522,8 +3844,27 @@ 516 516 opener_webview_id, 517 517 opener_pipeline_id, 518 518 response_sender, ··· 540 540 let Some((webview_id_sender, webview_id_receiver)) = generic_channel::channel() else { 541 541 warn!("Failed to create channel"); 542 542 let _ = response_sender.send(None); 543 543 - @@ -3580,6 +3921,361 @@ 543 543 + @@ -3622,6 +3963,361 @@ 544 544 }); 545 545 } 546 546 ··· 902 902 #[servo_tracing::instrument(skip_all)] 903 903 fn handle_refresh_cursor(&self, pipeline_id: PipelineId) { 904 904 let Some(pipeline) = self.pipelines.get(&pipeline_id) else { 905 905 - @@ -4705,7 +5401,7 @@ 905 905 + @@ -4747,7 +5443,7 @@ 906 906 } 907 907 908 908 #[servo_tracing::instrument(skip_all)] ··· 911 911 // Send a flat projection of the history to embedder. 912 912 // The final vector is a concatenation of the URLs of the past 913 913 // entries, the current entry and the future entries. 914 914 - @@ -4808,9 +5504,23 @@ 914 914 + @@ -4850,9 +5546,23 @@ 915 915 ); 916 916 self.embedder_proxy.send(EmbedderMsg::HistoryChanged( 917 917 webview_id,

+4 -4

patches/components/script/dom/document.rs.patch

reviewed

··· 110 110 pub(crate) fn dirty_all_nodes(&self) { 111 111 let root = match self.GetDocumentElement() { 112 112 Some(root) => root, 113 113 - @@ -3216,9 +3253,59 @@ 113 113 + @@ -3247,9 +3284,59 @@ 114 114 current_rendering_epoch, 115 115 ); 116 116 ··· 170 170 pub(crate) fn handle_no_longer_waiting_on_asynchronous_image_updates(&self) { 171 171 self.waiting_on_canvas_image_updates.set(false); 172 172 } 173 173 - @@ -3961,6 +4048,7 @@ 173 173 + @@ -3992,6 +4079,7 @@ 174 174 active_sandboxing_flag_set: Cell::new(SandboxingFlagSet::empty()), 175 175 creation_sandboxing_flag_set: Cell::new(creation_sandboxing_flag_set), 176 176 favicon: RefCell::new(None), ··· 178 178 websockets: DOMTracker::new(), 179 179 details_name_groups: Default::default(), 180 180 protocol_handler_automation_mode: Default::default(), 181 181 - @@ -5065,6 +5153,36 @@ 181 181 + @@ -5096,6 +5184,36 @@ 182 182 183 183 pub(crate) fn notify_embedder_favicon(&self) { 184 184 if let Some(ref image) = *self.favicon.borrow() { ··· 215 215 self.send_to_embedder(EmbedderMsg::NewFavicon(self.webview_id(), image.clone())); 216 216 } 217 217 } 218 218 - @@ -5110,6 +5228,20 @@ 218 218 + @@ -5141,6 +5259,20 @@ 219 219 pub(crate) fn set_css_styling_flag(&self, value: bool) { 220 220 self.css_styling_flag.set(value) 221 221 }

+4 -4

patches/components/script/dom/window.rs.patch

reviewed

··· 83 83 // Step 6: Let userPromptHandler be WebDriver BiDi user prompt opened with this, 84 84 // "prompt", and message. 85 85 // TODO: Add support for WebDriver BiDi. 86 86 - @@ -3046,9 +3074,33 @@ 86 86 + @@ -3047,9 +3075,33 @@ 87 87 &self, 88 88 input_event: &ConstellationInputEvent, 89 89 ) -> Option<HitTestResult> { ··· 120 120 } 121 121 122 122 #[expect(unsafe_code)] 123 123 - @@ -3067,8 +3119,25 @@ 123 123 + @@ -3068,8 +3120,25 @@ 124 124 // SAFETY: This is safe because `Window::query_elements_from_point` has ensured that 125 125 // layout has run and any OpaqueNodes that no longer refer to real nodes are gone. 126 126 let address = UntrustedNodeAddress(result.node.0 as *const c_void); ··· 147 147 cursor: result.cursor, 148 148 point_in_node: result.point_in_target, 149 149 point_in_frame, 150 150 - @@ -3749,6 +3818,8 @@ 150 150 + @@ -3750,6 +3819,8 @@ 151 151 player_context: WindowGLContext, 152 152 #[cfg(feature = "webgpu")] gpu_id_hub: Arc<IdentityHub>, 153 153 inherited_secure_context: Option<bool>, ··· 156 156 theme: Theme, 157 157 weak_script_thread: Weak<ScriptThread>, 158 158 ) -> DomRoot<Self> { 159 159 - @@ -3775,6 +3846,8 @@ 159 159 + @@ -3776,6 +3847,8 @@ 160 160 gpu_id_hub, 161 161 inherited_secure_context, 162 162 unminify_js,

+9 -9

patches/components/script/script_thread.rs.patch

reviewed

··· 30 30 use servo_config::{opts, pref, prefs}; 31 31 use servo_url::{ImmutableOrigin, MutableOrigin, OriginSnapshot, ServoUrl}; 32 32 use storage_traits::StorageThreads; 33 33 - @@ -1931,11 +1932,22 @@ 33 33 + @@ -1941,11 +1942,22 @@ 34 34 self.handle_refresh_cursor(pipeline_id); 35 35 }, 36 36 ScriptThreadMessage::PreferencesUpdated(updates) => { ··· 57 57 }, 58 58 ScriptThreadMessage::ForwardKeyboardScroll(pipeline_id, scroll) => { 59 59 if let Some(document) = self.documents.borrow().find_document(pipeline_id) { 60 60 - @@ -1976,6 +1988,19 @@ 60 60 + @@ -1986,6 +1998,19 @@ 61 61 ScriptThreadMessage::TriggerGarbageCollection => unsafe { 62 62 JS_GC(*GlobalScope::get_cx(), GCReason::API); 63 63 }, ··· 77 77 } 78 78 } 79 79 80 80 - @@ -3054,6 +3079,9 @@ 80 80 + @@ -3064,6 +3089,9 @@ 81 81 .documents 82 82 .borrow() 83 83 .find_iframe(parent_pipeline_id, browsing_context_id); ··· 87 87 if let Some(frame_element) = frame_element { 88 88 frame_element.update_pipeline_id(new_pipeline_id, reason, cx); 89 89 } 90 90 - @@ -3073,6 +3101,7 @@ 90 90 + @@ -3083,6 +3111,7 @@ 91 91 // is no need to pass along existing opener information that 92 92 // will be discarded. 93 93 None, ··· 95 95 ); 96 96 } 97 97 } 98 98 - @@ -3349,6 +3378,60 @@ 98 98 + @@ -3359,6 +3388,60 @@ 99 99 } 100 100 } 101 101 ··· 156 156 fn ask_constellation_for_top_level_info( 157 157 &self, 158 158 sender_webview_id: WebViewId, 159 159 - @@ -3463,7 +3546,13 @@ 159 159 + @@ -3473,7 +3556,13 @@ 160 160 self.senders.pipeline_to_embedder_sender.clone(), 161 161 self.senders.constellation_sender.clone(), 162 162 incomplete.pipeline_id, ··· 171 171 incomplete.viewport_details, 172 172 origin.clone(), 173 173 final_url.clone(), 174 174 - @@ -3485,6 +3574,8 @@ 174 174 + @@ -3495,6 +3584,8 @@ 175 175 #[cfg(feature = "webgpu")] 176 176 self.gpu_id_hub.clone(), 177 177 incomplete.load_data.inherited_secure_context, ··· 180 180 incomplete.theme, 181 181 self.this.clone(), 182 182 ); 183 183 - @@ -3508,6 +3599,7 @@ 183 183 + @@ -3518,6 +3609,7 @@ 184 184 incomplete.webview_id, 185 185 incomplete.parent_info, 186 186 incomplete.opener, ··· 188 188 ); 189 189 if window_proxy.parent().is_some() { 190 190 // https://html.spec.whatwg.org/multipage/#navigating-across-documents:delaying-load-events-mode-2 191 191 - @@ -4281,6 +4373,24 @@ 191 191 + @@ -4291,6 +4383,24 @@ 192 192 document.event_handler().handle_refresh_cursor(); 193 193 } 194 194

+2 -2

patches/components/script_bindings/codegen/Bindings.conf.patch

reviewed

··· 1 1 --- original 2 2 +++ modified 3 3 - @@ -280,6 +280,11 @@ 3 3 + @@ -284,6 +284,11 @@ 4 4 'cx': ['CheckValidity', 'ReportValidity'], 5 5 }, 6 6 ··· 12 12 'EventSource': { 13 13 'weakReferenceable': True, 14 14 }, 15 15 - @@ -690,6 +695,11 @@ 15 15 + @@ -703,6 +708,11 @@ 16 16 'cx': ['CreateLinearGradient', 'CreatePattern', 'CreateRadialGradient', 'GetTransform'], 17 17 }, 18 18

+3 -3

patches/components/servo/webview.rs.patch

reviewed

··· 1 1 --- original 2 2 +++ modified 3 3 - @@ -215,6 +215,18 @@ 3 3 + @@ -219,6 +219,18 @@ 4 4 self.delegate().request_create_new(self.clone(), request); 5 5 } 6 6 ··· 19 19 pub(crate) fn viewport_details(&self) -> ViewportDetails { 20 20 // The division by 1 represents the page's default zoom of 100%, 21 21 // and gives us the appropriate CSSPixel type for the viewport. 22 22 - @@ -224,6 +236,7 @@ 22 22 + @@ -228,6 +240,7 @@ 23 23 ViewportDetails { 24 24 size: scaled_viewport_size / Scale::new(1.0), 25 25 hidpi_scale_factor: Scale::new(inner.hidpi_scale_factor.0), ··· 27 27 } 28 28 } 29 29 30 30 - @@ -754,6 +767,11 @@ 30 30 + @@ -745,6 +758,11 @@ 31 31 EmbedderControlRequest::FilePicker { .. } => { 32 32 unreachable!("This message should be routed through the FileManagerThread") 33 33 },

+2 -2

patches/components/servo/webview_delegate.rs.patch

reviewed

··· 9 9 use constellation_traits::EmbedderToConstellationMessage; 10 10 #[cfg(feature = "gamepad")] 11 11 use embedder_traits::GamepadHapticEffectType; 12 12 - @@ -925,6 +925,14 @@ 12 12 + @@ -930,6 +930,14 @@ 13 13 /// 14 14 /// [`window.open`]: https://developer.mozilla.org/en-US/docs/Web/API/Window/open 15 15 fn request_create_new(&self, _parent_webview: WebView, _: CreateNewWebViewRequest) {} ··· 24 24 /// Content in a [`WebView`] is requesting permission to access a feature requiring 25 25 /// permission from the user. The embedder should allow or deny the request, either by 26 26 /// reading a cached value or querying the user for permission via the user interface. 27 27 - @@ -999,6 +1007,25 @@ 27 27 + @@ -1004,6 +1012,25 @@ 28 28 _tree_update: accesskit::TreeUpdate, 29 29 ) { 30 30 }