forked from
me.webbeef.org/browser.html
Rewild Your Web
chore: update Servo to 97225f55370e78e869fc3fc0ec0821b4a9053454
Signed-off-by: webbeef <me@webbeef.org>
+69
-45
+37
-13
Cargo.lock
+37
-13
Cargo.lock
···
262
262
checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
263
263
dependencies = [
264
264
"anstyle",
265
-
"anstyle-parse",
265
+
"anstyle-parse 0.2.7",
266
+
"anstyle-query",
267
+
"anstyle-wincon",
268
+
"colorchoice",
269
+
"is_terminal_polyfill",
270
+
"utf8parse",
271
+
]
272
+
273
+
[[package]]
274
+
name = "anstream"
275
+
version = "1.0.0"
276
+
source = "registry+https://github.com/rust-lang/crates.io-index"
277
+
checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
278
+
dependencies = [
279
+
"anstyle",
280
+
"anstyle-parse 1.0.0",
266
281
"anstyle-query",
267
282
"anstyle-wincon",
268
283
"colorchoice",
···
286
301
]
287
302
288
303
[[package]]
304
+
name = "anstyle-parse"
305
+
version = "1.0.0"
306
+
source = "registry+https://github.com/rust-lang/crates.io-index"
307
+
checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
308
+
dependencies = [
309
+
"utf8parse",
310
+
]
311
+
312
+
[[package]]
289
313
name = "anstyle-query"
290
314
version = "1.1.5"
291
315
source = "registry+https://github.com/rust-lang/crates.io-index"
···
1337
1361
1338
1362
[[package]]
1339
1363
name = "clap"
1340
-
version = "4.5.60"
1364
+
version = "4.6.0"
1341
1365
source = "registry+https://github.com/rust-lang/crates.io-index"
1342
-
checksum = "2797f34da339ce31042b27d23607e051786132987f595b02ba4f6a6dffb7030a"
1366
+
checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351"
1343
1367
dependencies = [
1344
1368
"clap_builder",
1345
1369
"clap_derive",
···
1347
1371
1348
1372
[[package]]
1349
1373
name = "clap_builder"
1350
-
version = "4.5.60"
1374
+
version = "4.6.0"
1351
1375
source = "registry+https://github.com/rust-lang/crates.io-index"
1352
-
checksum = "24a241312cea5059b13574bb9b3861cabf758b879c15190b37b6d6fd63ab6876"
1376
+
checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
1353
1377
dependencies = [
1354
-
"anstream",
1378
+
"anstream 1.0.0",
1355
1379
"anstyle",
1356
1380
"clap_lex",
1357
1381
"strsim",
···
1359
1383
1360
1384
[[package]]
1361
1385
name = "clap_derive"
1362
-
version = "4.5.55"
1386
+
version = "4.6.0"
1363
1387
source = "registry+https://github.com/rust-lang/crates.io-index"
1364
-
checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5"
1388
+
checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a"
1365
1389
dependencies = [
1366
1390
"heck 0.5.0",
1367
1391
"proc-macro2",
···
1371
1395
1372
1396
[[package]]
1373
1397
name = "clap_lex"
1374
-
version = "1.0.0"
1398
+
version = "1.1.0"
1375
1399
source = "registry+https://github.com/rust-lang/crates.io-index"
1376
-
checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831"
1400
+
checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
1377
1401
1378
1402
[[package]]
1379
1403
name = "clipboard-win"
···
2407
2431
source = "registry+https://github.com/rust-lang/crates.io-index"
2408
2432
checksum = "b2daee4ea451f429a58296525ddf28b45a3b64f1acf6587e2067437bb11e218d"
2409
2433
dependencies = [
2410
-
"anstream",
2434
+
"anstream 0.6.21",
2411
2435
"anstyle",
2412
2436
"env_filter",
2413
2437
"jiff",
···
7020
7044
7021
7045
[[package]]
7022
7046
name = "orbclient"
7023
-
version = "0.3.50"
7047
+
version = "0.3.51"
7024
7048
source = "registry+https://github.com/rust-lang/crates.io-index"
7025
-
checksum = "52ad2c6bae700b7aa5d1cc30c59bdd3a1c180b09dbaea51e2ae2b8e1cf211fdd"
7049
+
checksum = "59aed3b33578edcfa1bc96a321d590d31832b6ad55a26f0313362ce687e9abd6"
7026
7050
dependencies = [
7027
7051
"libc",
7028
7052
"libredox",
+1
-1
forkme.lock
+1
-1
forkme.lock
+5
-5
patches/components/constellation/constellation.rs.patch
+5
-5
patches/components/constellation/constellation.rs.patch
···
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
-
@@ -3178,6 +3493,13 @@
501
+
@@ -3204,6 +3519,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
-
@@ -3454,8 +3776,27 @@
515
+
@@ -3480,8 +3802,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
-
@@ -3554,6 +3895,361 @@
543
+
@@ -3580,6 +3921,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
-
@@ -4680,7 +5376,7 @@
905
+
@@ -4705,7 +5401,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
-
@@ -4783,9 +5479,23 @@
914
+
@@ -4808,9 +5504,23 @@
915
915
);
916
916
self.embedder_proxy.send(EmbedderMsg::HistoryChanged(
917
917
webview_id,
+1
-1
patches/components/layout/replaced.rs.patch
+1
-1
patches/components/layout/replaced.rs.patch
+15
-15
patches/components/script/dom/document_event_handler.rs.patch
+15
-15
patches/components/script/dom/document_event_handler.rs.patch
···
142
142
}
143
143
}
144
144
145
-
@@ -536,6 +610,198 @@
145
+
@@ -538,6 +612,198 @@
146
146
}
147
147
}
148
148
···
341
341
/// <https://w3c.github.io/uievents/#handle-native-mouse-move>
342
342
fn handle_native_mouse_move_event(&self, input_event: &ConstellationInputEvent, can_gc: CanGc) {
343
343
// Ignore all incoming events without a hit test.
344
-
@@ -550,6 +816,57 @@
344
+
@@ -552,6 +818,57 @@
345
345
return;
346
346
}
347
347
···
399
399
// Update the cursor when the mouse moves, if it has changed.
400
400
self.set_cursor(Some(hit_test_result.cursor));
401
401
402
-
@@ -775,6 +1092,12 @@
402
+
@@ -777,6 +1094,12 @@
403
403
return;
404
404
};
405
405
···
412
412
debug!(
413
413
"{:?}: at {:?}",
414
414
event.action, hit_test_result.point_in_frame
415
-
@@ -867,18 +1190,25 @@
415
+
@@ -869,18 +1192,25 @@
416
416
let target_el = element.find_click_focusable_shadow_host_if_necessary();
417
417
418
418
let document = self.window.Document();
···
443
443
document.commit_focus_transaction(FocusInitiator::Click, can_gc);
444
444
}
445
445
446
-
@@ -888,7 +1218,7 @@
446
+
@@ -890,7 +1220,7 @@
447
447
self.maybe_show_context_menu(
448
448
node.upcast(),
449
449
&hit_test_result,
···
452
452
can_gc,
453
453
);
454
454
}
455
-
@@ -1012,9 +1342,30 @@
455
+
@@ -1014,9 +1344,30 @@
456
456
&self,
457
457
target: &EventTarget,
458
458
hit_test_result: &HitTestResult,
···
484
484
// <https://w3c.github.io/uievents/#contextmenu>
485
485
let menu_event = PointerEvent::new(
486
486
&self.window, // window
487
-
@@ -1028,25 +1379,25 @@
487
+
@@ -1030,25 +1381,25 @@
488
488
hit_test_result
489
489
.point_relative_to_initial_containing_block
490
490
.to_i32(),
···
529
529
can_gc,
530
530
);
531
531
532
-
@@ -1062,6 +1413,89 @@
532
+
@@ -1064,6 +1415,89 @@
533
533
};
534
534
}
535
535
···
619
619
fn handle_touch_event(
620
620
&self,
621
621
event: EmbedderTouchEvent,
622
-
@@ -1068,6 +1502,29 @@
622
+
@@ -1070,6 +1504,29 @@
623
623
input_event: &ConstellationInputEvent,
624
624
can_gc: CanGc,
625
625
) -> InputEventResult {
···
649
649
// Ignore all incoming events without a hit test.
650
650
let Some(hit_test_result) = self.window.hit_test_from_input_event(input_event) else {
651
651
self.update_active_touch_points_when_early_return(event);
652
-
@@ -1074,6 +1531,16 @@
652
+
@@ -1076,6 +1533,16 @@
653
653
return Default::default();
654
654
};
655
655
···
666
666
let TouchId(identifier) = event.touch_id;
667
667
668
668
let Some(element) = hit_test_result
669
-
@@ -1205,6 +1672,10 @@
669
+
@@ -1207,6 +1674,10 @@
670
670
// <https://html.spec.whatwg.org/multipage/#selector-active>
671
671
// If the element is being actively pointed at the element is being activated.
672
672
self.element_for_activation(element).set_active_state(true);
···
677
677
(current_target, pointer_touch)
678
678
},
679
679
_ => {
680
-
@@ -1237,10 +1708,31 @@
680
+
@@ -1239,10 +1710,31 @@
681
681
can_gc,
682
682
);
683
683
···
710
710
},
711
711
TouchEventType::Up | TouchEventType::Cancel => {
712
712
active_touch_points.swap_remove(index);
713
-
@@ -1248,6 +1740,17 @@
713
+
@@ -1250,6 +1742,17 @@
714
714
// <https://html.spec.whatwg.org/multipage/#selector-active>
715
715
// If the element is being actively pointed at the element is being activated.
716
716
self.element_for_activation(element).set_active_state(false);
···
728
728
},
729
729
TouchEventType::Down => unreachable!("Should have been handled above"),
730
730
}
731
-
@@ -1291,6 +1794,19 @@
731
+
@@ -1293,6 +1796,19 @@
732
732
);
733
733
let event = touch_event.upcast::<Event>();
734
734
event.fire(&touch_dispatch_target, can_gc);
···
748
748
event.flags().into()
749
749
}
750
750
751
-
@@ -1455,6 +1971,16 @@
751
+
@@ -1457,6 +1973,16 @@
752
752
return Default::default();
753
753
};
754
754
+3
-3
patches/components/script/dom/globalscope.rs.patch
+3
-3
patches/components/script/dom/globalscope.rs.patch
···
17
17
/// Directory to store unminified scripts for this window if unminify-js
18
18
/// opt is enabled.
19
19
unminified_js_dir: Option<String>,
20
-
@@ -771,6 +781,8 @@
20
+
@@ -770,6 +780,8 @@
21
21
#[cfg(feature = "webgpu")] gpu_id_hub: Arc<IdentityHub>,
22
22
inherited_secure_context: Option<bool>,
23
23
unminify_js: bool,
···
26
26
font_context: Option<Arc<FontContext>>,
27
27
) -> Self {
28
28
Self {
29
-
@@ -815,6 +827,8 @@
29
+
@@ -814,6 +826,8 @@
30
30
console_group_stack: DomRefCell::new(Vec::new()),
31
31
console_count_map: Default::default(),
32
32
inherited_secure_context,
···
35
35
unminified_js_dir: unminify_js.then(|| unminified_path("unminified-js")),
36
36
byte_length_queuing_strategy_size_function: OnceCell::new(),
37
37
count_queuing_strategy_size_function: OnceCell::new(),
38
-
@@ -3129,6 +3143,16 @@
38
+
@@ -3128,6 +3142,16 @@
39
39
self.inherited_secure_context
40
40
}
41
41
+2
-2
patches/components/script/dom/notification.rs.patch
+2
-2
patches/components/script/dom/notification.rs.patch
···
8
8
use dom_struct::dom_struct;
9
9
use embedder_traits::{
10
10
EmbedderMsg, Notification as EmbedderNotification,
11
-
@@ -270,11 +271,22 @@
11
+
@@ -269,11 +270,22 @@
12
12
if !shown {
13
13
// TODO: step 6.1: Append notification to the list of notifications.
14
14
// step 6.2: Display notification on the device
···
36
36
}
37
37
38
38
// TODO: step 7: If shown is false or oldNotification is non-null,
39
-
@@ -857,6 +869,11 @@
39
+
@@ -856,6 +868,11 @@
40
40
for (request, resource_type) in pending_requests {
41
41
self.fetch_and_show_when_ready(request, resource_type);
42
42
}
+1
-1
patches/components/script/dom/window.rs.patch
+1
-1
patches/components/script/dom/window.rs.patch
+1
-1
patches/components/script/script_thread.rs.patch
+1
-1
patches/components/script/script_thread.rs.patch
···
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
-
@@ -4280,6 +4372,24 @@
191
+
@@ -4281,6 +4373,24 @@
192
192
document.event_handler().handle_refresh_cursor();
193
193
}
194
194
+2
-2
patches/components/script_bindings/codegen/Bindings.conf.patch
+2
-2
patches/components/script_bindings/codegen/Bindings.conf.patch
···
1
1
--- original
2
2
+++ modified
3
-
@@ -278,6 +278,11 @@
3
+
@@ -280,6 +280,11 @@
4
4
'cx': ['CheckValidity', 'ReportValidity'],
5
5
},
6
6
···
12
12
'EventSource': {
13
13
'weakReferenceable': True,
14
14
},
15
-
@@ -688,6 +693,11 @@
15
+
@@ -690,6 +695,11 @@
16
16
'cx': ['CreateLinearGradient', 'CreatePattern', 'CreateRadialGradient', 'GetTransform'],
17
17
},
18
18