···11--- original
22+++ modified
33-@@ -28,7 +28,7 @@
33+@@ -30,7 +30,7 @@
44 // should be exported at the root. See <https://github.com/servo/servo/issues/18475>.
55 pub use accesskit;
66 pub use base::generic_channel::GenericSender;
···99 pub use embedder_traits::user_contents::UserScript;
1010 pub use embedder_traits::*;
1111 pub use image::RgbaImage;
1212-@@ -48,9 +48,12 @@
1212+@@ -50,9 +50,12 @@
1313 // This should be replaced with an API on ServoBuilder.
1414 // See <https://github.com/servo/servo/issues/40950>.
1515 pub use resources;
+6-6
patches/components/servo/servo.rs.patch
···99 use servo_geometry::{
1010 DeviceIndependentIntRect, convert_rect_to_css_pixel, convert_size_to_css_pixel,
1111 };
1212-@@ -204,9 +204,7 @@
1212+@@ -206,9 +206,7 @@
1313 }
14141515 if self.constellation_proxy.disconnected() {
···2020 }
21212222 self.paint.borrow_mut().perform_updates();
2323-@@ -258,10 +256,39 @@
2323+@@ -260,10 +258,39 @@
24242525 fn handle_delegate_errors(&self) {
2626 while let Some(error) = self.servo_errors.try_recv() {
···6161 fn clean_up_destroyed_webview_handles(&self) {
6262 // Remove any webview handles that have been destroyed and would not be upgradable.
6363 // Note that `retain` is O(capacity) because it visits empty buckets, so it may be worth
6464-@@ -419,6 +446,11 @@
6464+@@ -421,6 +448,11 @@
6565 webview.request_create_new(response_sender);
6666 }
6767 },
···7373 EmbedderMsg::WebViewClosed(webview_id) => {
7474 if let Some(webview) = self.get_webview_handle(webview_id) {
7575 webview.delegate().notify_closed(webview);
7676-@@ -564,10 +596,7 @@
7676+@@ -566,10 +598,7 @@
7777 .delegate
7878 .borrow()
7979 .notify_devtools_server_started(port, token),
···8585 },
8686 EmbedderMsg::RequestDevtoolsConnection(response_sender) => {
8787 self.delegate
8888-@@ -687,6 +716,47 @@
8888+@@ -694,6 +723,47 @@
8989 .notify_accessibility_tree_update(webview, tree_update);
9090 }
9191 },
···133133 }
134134 }
135135 }
136136-@@ -925,6 +995,14 @@
136136+@@ -932,6 +1002,14 @@
137137 self.0.site_data_manager.borrow()
138138 }
139139
+3-3
patches/components/servo/webview.rs.patch
···11--- original
22+++ modified
33-@@ -209,6 +209,18 @@
33+@@ -215,6 +215,18 @@
44 self.delegate().request_create_new(self.clone(), request);
55 }
66···1919 pub(crate) fn viewport_details(&self) -> ViewportDetails {
2020 // The division by 1 represents the page's default zoom of 100%,
2121 // and gives us the appropriate CSSPixel type for the viewport.
2222-@@ -218,6 +230,7 @@
2222+@@ -224,6 +236,7 @@
2323 ViewportDetails {
2424 size: scaled_viewport_size / Scale::new(1.0),
2525 hidpi_scale_factor: Scale::new(inner.hidpi_scale_factor.0),
···2727 }
2828 }
29293030-@@ -737,6 +750,11 @@
3030+@@ -753,6 +766,11 @@
3131 EmbedderControlRequest::FilePicker { .. } => {
3232 unreachable!("This message should be routed through the FileManagerThread")
3333 },