forked from
me.webbeef.org/browser.html
Rewild Your Web
chore: update to Servo 54bc366160b226618d2b2bf88c1c8ac8b6cb110c
Signed-off-by: webbeef <me@webbeef.org>
+59
-109
+16
-66
Cargo.lock
+16
-66
Cargo.lock
···
4374
4374
"icu_properties 1.5.1",
4375
4375
"icu_provider 1.5.0",
4376
4376
"icu_provider_adapters",
4377
-
"icu_segmenter 1.5.0",
4377
+
"icu_segmenter",
4378
4378
"icu_timezone",
4379
4379
"tinystr 0.7.6",
4380
4380
"unicode-bidi",
···
4559
4559
checksum = "52b1a7fbdbf3958f1be8354cb59ac73f165b7b7082d447ff2090355c9a069120"
4560
4560
4561
4561
[[package]]
4562
-
name = "icu_locale"
4563
-
version = "2.1.1"
4564
-
source = "registry+https://github.com/rust-lang/crates.io-index"
4565
-
checksum = "532b11722e350ab6bf916ba6eb0efe3ee54b932666afec989465f9243fe6dd60"
4566
-
dependencies = [
4567
-
"icu_collections 2.1.1",
4568
-
"icu_locale_core",
4569
-
"icu_locale_data",
4570
-
"icu_provider 2.1.1",
4571
-
"potential_utf",
4572
-
"tinystr 0.8.2",
4573
-
"zerovec 0.11.5",
4574
-
]
4575
-
4576
-
[[package]]
4577
4562
name = "icu_locale_core"
4578
4563
version = "2.1.1"
4579
4564
source = "registry+https://github.com/rust-lang/crates.io-index"
···
4581
4566
dependencies = [
4582
4567
"displaydoc",
4583
4568
"litemap 0.8.1",
4584
-
"serde",
4585
4569
"tinystr 0.8.2",
4586
4570
"writeable 0.6.2",
4587
4571
"zerovec 0.11.5",
4588
4572
]
4589
4573
4590
4574
[[package]]
4591
-
name = "icu_locale_data"
4592
-
version = "2.1.2"
4593
-
source = "registry+https://github.com/rust-lang/crates.io-index"
4594
-
checksum = "1c5f1d16b4c3a2642d3a719f18f6b06070ab0aef246a6418130c955ae08aa831"
4595
-
4596
-
[[package]]
4597
4575
name = "icu_locid"
4598
4576
version = "1.5.0"
4599
4577
source = "registry+https://github.com/rust-lang/crates.io-index"
···
4770
4748
dependencies = [
4771
4749
"displaydoc",
4772
4750
"icu_locale_core",
4773
-
"serde",
4774
-
"stable_deref_trait",
4775
4751
"writeable 0.6.2",
4776
4752
"yoke 0.8.1",
4777
4753
"zerofrom",
···
4814
4790
"icu_collections 1.5.0",
4815
4791
"icu_locid",
4816
4792
"icu_provider 1.5.0",
4817
-
"icu_segmenter_data 1.5.1",
4793
+
"icu_segmenter_data",
4818
4794
"utf8_iter",
4819
4795
"zerovec 0.10.4",
4820
4796
]
4821
4797
4822
4798
[[package]]
4823
-
name = "icu_segmenter"
4824
-
version = "2.1.2"
4825
-
source = "registry+https://github.com/rust-lang/crates.io-index"
4826
-
checksum = "a807a7488f3f758629ae86d99d9d30dce24da2fb2945d74c80a4f4a62c71db73"
4827
-
dependencies = [
4828
-
"core_maths",
4829
-
"icu_collections 2.1.1",
4830
-
"icu_locale",
4831
-
"icu_provider 2.1.1",
4832
-
"icu_segmenter_data 2.1.1",
4833
-
"potential_utf",
4834
-
"utf8_iter",
4835
-
"zerovec 0.11.5",
4836
-
]
4837
-
4838
-
[[package]]
4839
4799
name = "icu_segmenter_data"
4840
4800
version = "1.5.1"
4841
4801
source = "registry+https://github.com/rust-lang/crates.io-index"
4842
4802
checksum = "a1e52775179941363cc594e49ce99284d13d6948928d8e72c755f55e98caa1eb"
4843
-
4844
-
[[package]]
4845
-
name = "icu_segmenter_data"
4846
-
version = "2.1.1"
4847
-
source = "registry+https://github.com/rust-lang/crates.io-index"
4848
-
checksum = "6ebbb7321d9e21d25f5660366cb6c08201d0175898a3a6f7a41ee9685af21c80"
4849
4803
4850
4804
[[package]]
4851
4805
name = "icu_timezone"
···
7675
7629
source = "registry+https://github.com/rust-lang/crates.io-index"
7676
7630
checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
7677
7631
dependencies = [
7678
-
"serde_core",
7679
-
"writeable 0.6.2",
7680
7632
"zerovec 0.11.5",
7681
7633
]
7682
7634
···
8694
8646
[[package]]
8695
8647
name = "selectors"
8696
8648
version = "0.36.1"
8697
-
source = "git+https://github.com/servo/stylo?rev=938e58caf26b6d0437291ce875dd5b0dd8a52d4f#938e58caf26b6d0437291ce875dd5b0dd8a52d4f"
8649
+
source = "git+https://github.com/servo/stylo?rev=8557228b96c0e343764953e72a62ea503baf01b3#8557228b96c0e343764953e72a62ea503baf01b3"
8698
8650
dependencies = [
8699
8651
"bitflags 2.11.0",
8700
8652
"cssparser",
···
9383
9335
"euclid",
9384
9336
"html5ever",
9385
9337
"icu_locid",
9386
-
"icu_segmenter 1.5.0",
9338
+
"icu_segmenter",
9387
9339
"itertools 0.14.0",
9388
9340
"kurbo 0.12.0",
9389
9341
"log",
···
10323
10275
[[package]]
10324
10276
name = "servo_arc"
10325
10277
version = "0.4.3"
10326
-
source = "git+https://github.com/servo/stylo?rev=938e58caf26b6d0437291ce875dd5b0dd8a52d4f#938e58caf26b6d0437291ce875dd5b0dd8a52d4f"
10278
+
source = "git+https://github.com/servo/stylo?rev=8557228b96c0e343764953e72a62ea503baf01b3#8557228b96c0e343764953e72a62ea503baf01b3"
10327
10279
dependencies = [
10328
10280
"serde",
10329
10281
"stable_deref_trait",
···
10796
10748
[[package]]
10797
10749
name = "stylo"
10798
10750
version = "0.14.0"
10799
-
source = "git+https://github.com/servo/stylo?rev=938e58caf26b6d0437291ce875dd5b0dd8a52d4f#938e58caf26b6d0437291ce875dd5b0dd8a52d4f"
10751
+
source = "git+https://github.com/servo/stylo?rev=8557228b96c0e343764953e72a62ea503baf01b3#8557228b96c0e343764953e72a62ea503baf01b3"
10800
10752
dependencies = [
10801
10753
"app_units",
10802
10754
"arrayvec",
···
10807
10759
"derive_more",
10808
10760
"encoding_rs",
10809
10761
"euclid",
10810
-
"icu_segmenter 2.1.2",
10762
+
"icu_segmenter",
10811
10763
"indexmap",
10812
10764
"itertools 0.14.0",
10813
10765
"itoa",
···
10852
10804
[[package]]
10853
10805
name = "stylo_atoms"
10854
10806
version = "0.14.0"
10855
-
source = "git+https://github.com/servo/stylo?rev=938e58caf26b6d0437291ce875dd5b0dd8a52d4f#938e58caf26b6d0437291ce875dd5b0dd8a52d4f"
10807
+
source = "git+https://github.com/servo/stylo?rev=8557228b96c0e343764953e72a62ea503baf01b3#8557228b96c0e343764953e72a62ea503baf01b3"
10856
10808
dependencies = [
10857
10809
"string_cache",
10858
10810
"string_cache_codegen",
···
10861
10813
[[package]]
10862
10814
name = "stylo_derive"
10863
10815
version = "0.14.0"
10864
-
source = "git+https://github.com/servo/stylo?rev=938e58caf26b6d0437291ce875dd5b0dd8a52d4f#938e58caf26b6d0437291ce875dd5b0dd8a52d4f"
10816
+
source = "git+https://github.com/servo/stylo?rev=8557228b96c0e343764953e72a62ea503baf01b3#8557228b96c0e343764953e72a62ea503baf01b3"
10865
10817
dependencies = [
10866
10818
"darling",
10867
10819
"proc-macro2",
···
10873
10825
[[package]]
10874
10826
name = "stylo_dom"
10875
10827
version = "0.14.0"
10876
-
source = "git+https://github.com/servo/stylo?rev=938e58caf26b6d0437291ce875dd5b0dd8a52d4f#938e58caf26b6d0437291ce875dd5b0dd8a52d4f"
10828
+
source = "git+https://github.com/servo/stylo?rev=8557228b96c0e343764953e72a62ea503baf01b3#8557228b96c0e343764953e72a62ea503baf01b3"
10877
10829
dependencies = [
10878
10830
"bitflags 2.11.0",
10879
10831
"stylo_malloc_size_of",
···
10882
10834
[[package]]
10883
10835
name = "stylo_malloc_size_of"
10884
10836
version = "0.14.0"
10885
-
source = "git+https://github.com/servo/stylo?rev=938e58caf26b6d0437291ce875dd5b0dd8a52d4f#938e58caf26b6d0437291ce875dd5b0dd8a52d4f"
10837
+
source = "git+https://github.com/servo/stylo?rev=8557228b96c0e343764953e72a62ea503baf01b3#8557228b96c0e343764953e72a62ea503baf01b3"
10886
10838
dependencies = [
10887
10839
"app_units",
10888
10840
"cssparser",
···
10899
10851
[[package]]
10900
10852
name = "stylo_static_prefs"
10901
10853
version = "0.14.0"
10902
-
source = "git+https://github.com/servo/stylo?rev=938e58caf26b6d0437291ce875dd5b0dd8a52d4f#938e58caf26b6d0437291ce875dd5b0dd8a52d4f"
10854
+
source = "git+https://github.com/servo/stylo?rev=8557228b96c0e343764953e72a62ea503baf01b3#8557228b96c0e343764953e72a62ea503baf01b3"
10903
10855
10904
10856
[[package]]
10905
10857
name = "stylo_traits"
10906
10858
version = "0.14.0"
10907
-
source = "git+https://github.com/servo/stylo?rev=938e58caf26b6d0437291ce875dd5b0dd8a52d4f#938e58caf26b6d0437291ce875dd5b0dd8a52d4f"
10859
+
source = "git+https://github.com/servo/stylo?rev=8557228b96c0e343764953e72a62ea503baf01b3#8557228b96c0e343764953e72a62ea503baf01b3"
10908
10860
dependencies = [
10909
10861
"app_units",
10910
10862
"bitflags 2.11.0",
···
11374
11326
checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
11375
11327
dependencies = [
11376
11328
"displaydoc",
11377
-
"serde_core",
11378
11329
"zerovec 0.11.5",
11379
11330
]
11380
11331
···
11406
11357
[[package]]
11407
11358
name = "to_shmem"
11408
11359
version = "0.3.0"
11409
-
source = "git+https://github.com/servo/stylo?rev=938e58caf26b6d0437291ce875dd5b0dd8a52d4f#938e58caf26b6d0437291ce875dd5b0dd8a52d4f"
11360
+
source = "git+https://github.com/servo/stylo?rev=8557228b96c0e343764953e72a62ea503baf01b3#8557228b96c0e343764953e72a62ea503baf01b3"
11410
11361
dependencies = [
11411
11362
"cssparser",
11412
11363
"servo_arc",
···
11419
11370
[[package]]
11420
11371
name = "to_shmem_derive"
11421
11372
version = "0.1.0"
11422
-
source = "git+https://github.com/servo/stylo?rev=938e58caf26b6d0437291ce875dd5b0dd8a52d4f#938e58caf26b6d0437291ce875dd5b0dd8a52d4f"
11373
+
source = "git+https://github.com/servo/stylo?rev=8557228b96c0e343764953e72a62ea503baf01b3#8557228b96c0e343764953e72a62ea503baf01b3"
11423
11374
dependencies = [
11424
11375
"darling",
11425
11376
"proc-macro2",
···
12544
12495
"bytes",
12545
12496
"cookie 0.16.2",
12546
12497
"http 0.2.12",
12547
-
"icu_segmenter 1.5.0",
12498
+
"icu_segmenter",
12548
12499
"log",
12549
12500
"serde",
12550
12501
"serde_derive",
···
13910
13861
source = "registry+https://github.com/rust-lang/crates.io-index"
13911
13862
checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
13912
13863
dependencies = [
13913
-
"serde",
13914
13864
"yoke 0.8.1",
13915
13865
"zerofrom",
13916
13866
"zerovec-derive 0.11.2",
+9
-9
Cargo.toml
+9
-9
Cargo.toml
···
181
181
sea-query = { version = "1.0.0-rc.30", default-features = false, features = ["backend-sqlite", "derive"] }
182
182
sea-query-rusqlite = { version = "0.8.0-rc.15" }
183
183
sec1 = "0.7"
184
-
selectors = { git = "https://github.com/servo/stylo", rev = "938e58caf26b6d0437291ce875dd5b0dd8a52d4f" }
184
+
selectors = { git = "https://github.com/servo/stylo", rev = "8557228b96c0e343764953e72a62ea503baf01b3" }
185
185
serde = "1.0.228"
186
186
serde_bytes = "0.11"
187
187
serde_core = "1.0.226"
···
214
214
servo-media-webrtc = { version = "0.0.6", path = "source/components/media/webrtc" }
215
215
servo_allocator = { package = "servo-allocator", version = "0.0.6", path = "source/components/allocator" }
216
216
servo-tracing = { path = "source/components/servo_tracing" }
217
-
servo_arc = { git = "https://github.com/servo/stylo", rev = "938e58caf26b6d0437291ce875dd5b0dd8a52d4f" }
217
+
servo_arc = { git = "https://github.com/servo/stylo", rev = "8557228b96c0e343764953e72a62ea503baf01b3" }
218
218
servo-url = { version = "0.0.6", path = "source/components/url" }
219
219
sha1 = "0.10"
220
220
sha2 = "0.10"
···
225
225
storage_traits = { package = "servo-storage-traits", path = "source/components/shared/storage" }
226
226
string_cache = "0.9"
227
227
strum = { version = "0.27", features = ["derive"] }
228
-
stylo = { git = "https://github.com/servo/stylo", rev = "938e58caf26b6d0437291ce875dd5b0dd8a52d4f" }
229
-
stylo_atoms = { git = "https://github.com/servo/stylo", rev = "938e58caf26b6d0437291ce875dd5b0dd8a52d4f" }
230
-
stylo_config = { git = "https://github.com/servo/stylo", rev = "938e58caf26b6d0437291ce875dd5b0dd8a52d4f" }
231
-
stylo_dom = { git = "https://github.com/servo/stylo", rev = "938e58caf26b6d0437291ce875dd5b0dd8a52d4f" }
232
-
stylo_malloc_size_of = { git = "https://github.com/servo/stylo", rev = "938e58caf26b6d0437291ce875dd5b0dd8a52d4f" }
233
-
stylo_static_prefs = { git = "https://github.com/servo/stylo", rev = "938e58caf26b6d0437291ce875dd5b0dd8a52d4f" }
234
-
stylo_traits = { git = "https://github.com/servo/stylo", rev = "938e58caf26b6d0437291ce875dd5b0dd8a52d4f" }
228
+
stylo = { git = "https://github.com/servo/stylo", rev = "8557228b96c0e343764953e72a62ea503baf01b3" }
229
+
stylo_atoms = { git = "https://github.com/servo/stylo", rev = "8557228b96c0e343764953e72a62ea503baf01b3" }
230
+
stylo_config = { git = "https://github.com/servo/stylo", rev = "8557228b96c0e343764953e72a62ea503baf01b3" }
231
+
stylo_dom = { git = "https://github.com/servo/stylo", rev = "8557228b96c0e343764953e72a62ea503baf01b3" }
232
+
stylo_malloc_size_of = { git = "https://github.com/servo/stylo", rev = "8557228b96c0e343764953e72a62ea503baf01b3" }
233
+
stylo_static_prefs = { git = "https://github.com/servo/stylo", rev = "8557228b96c0e343764953e72a62ea503baf01b3" }
234
+
stylo_traits = { git = "https://github.com/servo/stylo", rev = "8557228b96c0e343764953e72a62ea503baf01b3" }
235
235
surfman = { version = "0.11.0", features = ["chains"] }
236
236
syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] }
237
237
synstructure = "0.13"
+1
-1
forkme.lock
+1
-1
forkme.lock
+30
-30
patches/components/constellation/constellation.rs.patch
+30
-30
patches/components/constellation/constellation.rs.patch
···
27
27
};
28
28
use euclid::Size2D;
29
29
use euclid::default::Size2D as UntypedSize2D;
30
-
@@ -158,12 +159,14 @@
30
+
@@ -159,12 +160,14 @@
31
31
use servo_canvas_traits::webgl::WebGLThreads;
32
32
use servo_config::{opts, pref};
33
33
use servo_constellation_traits::{
···
48
48
};
49
49
use servo_url::{Host, ImmutableOrigin, ServoUrl};
50
50
use storage_traits::StorageThreads;
51
-
@@ -177,6 +180,7 @@
51
+
@@ -178,6 +181,7 @@
52
52
use webgpu_traits::{WebGPU, WebGPURequest};
53
53
54
54
use super::embedder::ConstellationToEmbedderMsg;
···
56
56
use crate::broadcastchannel::BroadcastChannels;
57
57
use crate::browsingcontext::{
58
58
AllBrowsingContextsIterator, BrowsingContext, FullyActiveBrowsingContextsIterator,
59
-
@@ -184,6 +188,7 @@
59
+
@@ -185,6 +189,7 @@
60
60
};
61
61
use crate::constellation_webview::ConstellationWebView;
62
62
use crate::event_loop::EventLoop;
···
64
64
use crate::pipeline::Pipeline;
65
65
use crate::process_manager::ProcessManager;
66
66
use crate::serviceworker::ServiceWorkerUnprivilegedContent;
67
-
@@ -212,6 +217,9 @@
67
+
@@ -213,6 +218,9 @@
68
68
/// While a completion failed, another global requested to complete the transfer.
69
69
/// We are still buffering messages, and awaiting the return of the buffer from the global who failed.
70
70
CompletionRequested(MessagePortRouterId, VecDeque<PortMessageTask>),
···
74
74
}
75
75
76
76
#[derive(Debug)]
77
-
@@ -513,6 +521,25 @@
77
+
@@ -514,6 +522,25 @@
78
78
/// to the `UserContents` need to be forwared to all the `ScriptThread`s that host
79
79
/// the relevant `WebView`.
80
80
pub(crate) user_contents_for_manager_id: FxHashMap<UserContentManagerId, UserContents>,
···
100
100
}
101
101
102
102
/// State needed to construct a constellation.
103
-
@@ -573,6 +600,9 @@
103
+
@@ -574,6 +601,9 @@
104
104
105
105
/// The async runtime.
106
106
pub async_runtime: Box<dyn AsyncRuntime>,
···
119
119
private_resource_threads: state.private_resource_threads,
120
120
public_storage_threads: state.public_storage_threads,
121
121
private_storage_threads: state.private_storage_threads,
122
-
@@ -737,6 +767,13 @@
122
+
@@ -735,6 +765,13 @@
123
123
pending_viewport_changes: Default::default(),
124
124
screenshot_readiness_requests: Vec::new(),
125
125
user_contents_for_manager_id: Default::default(),
···
133
133
};
134
134
135
135
constellation.run();
136
-
@@ -762,6 +799,18 @@
136
+
@@ -760,6 +797,18 @@
137
137
fn clean_up_finished_script_event_loops(&mut self) {
138
138
self.event_loop_join_handles
139
139
.retain(|join_handle| !join_handle.is_finished());
···
152
152
self.event_loops
153
153
.retain(|event_loop| event_loop.upgrade().is_some());
154
154
}
155
-
@@ -1054,6 +1103,11 @@
155
+
@@ -1052,6 +1101,11 @@
156
156
.get(&webview_id)
157
157
.and_then(|webview| webview.user_content_manager_id);
158
158
···
164
164
let new_pipeline_info = NewPipelineInfo {
165
165
parent_info: parent_pipeline_id,
166
166
new_pipeline_id,
167
-
@@ -1064,6 +1118,13 @@
167
+
@@ -1062,6 +1116,13 @@
168
168
viewport_details: initial_viewport_details,
169
169
user_content_manager_id,
170
170
theme,
···
178
178
};
179
179
let pipeline = match Pipeline::spawn(new_pipeline_info, event_loop, self, throttled) {
180
180
Ok(pipeline) => pipeline,
181
-
@@ -1230,6 +1291,7 @@
181
+
@@ -1228,6 +1289,7 @@
182
182
BackgroundHangMonitor(HangMonitorAlert),
183
183
Embedder(EmbedderToConstellationMessage),
184
184
FromSWManager(SWManagerMsg),
···
186
186
RemoveProcess(usize),
187
187
}
188
188
// Get one incoming request.
189
-
@@ -1250,6 +1312,15 @@
189
+
@@ -1248,6 +1310,15 @@
190
190
sel.recv(&self.embedder_to_constellation_receiver);
191
191
sel.recv(&self.swmanager_receiver);
192
192
···
202
202
self.process_manager.register(&mut sel);
203
203
204
204
let request = {
205
-
@@ -1278,9 +1349,13 @@
205
+
@@ -1276,9 +1347,13 @@
206
206
.recv(&self.swmanager_receiver)
207
207
.expect("Unexpected SW channel panic in constellation")
208
208
.map(Request::FromSWManager),
···
217
217
let _ = oper.recv(self.process_manager.receiver_at(process_index));
218
218
Ok(Request::RemoveProcess(process_index))
219
219
},
220
-
@@ -1306,6 +1381,9 @@
220
+
@@ -1304,6 +1379,9 @@
221
221
Request::FromSWManager(message) => {
222
222
self.handle_request_from_swmanager(message);
223
223
},
···
227
227
Request::RemoveProcess(index) => self.process_manager.remove(index),
228
228
}
229
229
}
230
-
@@ -1534,11 +1612,7 @@
230
+
@@ -1532,11 +1610,7 @@
231
231
}
232
232
},
233
233
EmbedderToConstellationMessage::PreferencesUpdated(updates) => {
···
240
240
let _ = event_loop.send(ScriptThreadMessage::PreferencesUpdated(
241
241
updates
242
242
.iter()
243
-
@@ -1565,6 +1639,18 @@
243
+
@@ -1563,6 +1637,18 @@
244
244
EmbedderToConstellationMessage::SetAccessibilityActive(webview_id, active) => {
245
245
self.set_accessibility_active(webview_id, active);
246
246
},
···
259
259
}
260
260
}
261
261
262
-
@@ -1762,7 +1848,13 @@
262
+
@@ -1760,7 +1846,13 @@
263
263
return warn!("Attempt to add channel name from an unexpected origin.");
264
264
}
265
265
self.broadcast_channels
···
274
274
},
275
275
ScriptToConstellationMessage::RemoveBroadcastChannelNameInRouter(
276
276
router_id,
277
-
@@ -1776,7 +1868,13 @@
277
+
@@ -1774,7 +1866,13 @@
278
278
return warn!("Attempt to remove channel name from an unexpected origin.");
279
279
}
280
280
self.broadcast_channels
···
289
289
},
290
290
ScriptToConstellationMessage::RemoveBroadcastChannelRouter(router_id, origin) => {
291
291
if self
292
-
@@ -1788,6 +1886,12 @@
292
+
@@ -1786,6 +1884,12 @@
293
293
self.broadcast_channels
294
294
.remove_broadcast_channel_router(router_id);
295
295
},
···
302
302
ScriptToConstellationMessage::ScheduleBroadcast(router_id, message) => {
303
303
if self
304
304
.check_origin_against_pipeline(&source_pipeline_id, &message.origin)
305
-
@@ -1797,8 +1901,15 @@
305
+
@@ -1795,8 +1899,15 @@
306
306
"Attempt to schedule broadcast from an origin not matching the origin of the msg."
307
307
);
308
308
}
···
319
319
},
320
320
ScriptToConstellationMessage::PipelineExited => {
321
321
self.handle_pipeline_exited(source_pipeline_id);
322
-
@@ -1818,6 +1929,12 @@
322
+
@@ -1816,6 +1927,12 @@
323
323
ScriptToConstellationMessage::CreateAuxiliaryWebView(load_info) => {
324
324
self.handle_script_new_auxiliary(load_info);
325
325
},
···
332
332
ScriptToConstellationMessage::ChangeRunningAnimationsState(animation_state) => {
333
333
self.handle_change_running_animations_state(source_pipeline_id, animation_state)
334
334
},
335
-
@@ -1991,6 +2108,29 @@
335
+
@@ -1989,6 +2106,29 @@
336
336
new_value,
337
337
);
338
338
},
···
362
362
ScriptToConstellationMessage::MediaSessionEvent(pipeline_id, event) => {
363
363
// Unlikely at this point, but we may receive events coming from
364
364
// different media sessions, so we set the active media session based
365
-
@@ -2010,7 +2150,12 @@
365
+
@@ -2008,7 +2148,12 @@
366
366
}
367
367
self.active_media_session = Some(pipeline_id);
368
368
self.constellation_to_embedder_proxy.send(
···
376
376
);
377
377
},
378
378
#[cfg(feature = "webgpu")]
379
-
@@ -2065,9 +2210,412 @@
379
+
@@ -2063,9 +2208,412 @@
380
380
let _ = event_loop.send(ScriptThreadMessage::TriggerGarbageCollection);
381
381
}
382
382
},
···
789
789
/// Check the origin of a message against that of the pipeline it came from.
790
790
/// Note: this is still limited as a security check,
791
791
/// see <https://github.com/servo/servo/issues/11722>
792
-
@@ -2384,6 +2932,29 @@
792
+
@@ -2382,6 +2930,29 @@
793
793
TransferState::TransferInProgress(queue) => queue.push_back(task),
794
794
TransferState::CompletionFailed(queue) => queue.push_back(task),
795
795
TransferState::CompletionRequested(_, queue) => queue.push_back(task),
···
819
819
}
820
820
}
821
821
822
-
@@ -3275,6 +3846,13 @@
822
+
@@ -3273,6 +3844,13 @@
823
823
/// <https://html.spec.whatwg.org/multipage/#destroy-a-top-level-traversable>
824
824
fn handle_close_top_level_browsing_context(&mut self, webview_id: WebViewId) {
825
825
debug!("{webview_id}: Closing");
···
833
833
let browsing_context_id = BrowsingContextId::from(webview_id);
834
834
// Step 5. Remove traversable from the user agent's top-level traversable set.
835
835
let browsing_context =
836
-
@@ -3549,8 +4127,27 @@
836
+
@@ -3547,8 +4125,27 @@
837
837
opener_webview_id,
838
838
opener_pipeline_id,
839
839
response_sender,
···
861
861
let Some((webview_id_sender, webview_id_receiver)) = generic_channel::channel() else {
862
862
warn!("Failed to create channel");
863
863
let _ = response_sender.send(None);
864
-
@@ -3651,6 +4248,397 @@
864
+
@@ -3649,6 +4246,397 @@
865
865
});
866
866
}
867
867
···
1259
1259
#[servo_tracing::instrument(skip_all)]
1260
1260
fn handle_refresh_cursor(&self, pipeline_id: PipelineId) {
1261
1261
let Some(pipeline) = self.pipelines.get(&pipeline_id) else {
1262
-
@@ -4778,7 +5766,7 @@
1262
+
@@ -4776,7 +5764,7 @@
1263
1263
}
1264
1264
1265
1265
#[servo_tracing::instrument(skip_all)]
···
1268
1268
// Send a flat projection of the history to embedder.
1269
1269
// The final vector is a concatenation of the URLs of the past
1270
1270
// entries, the current entry and the future entries.
1271
-
@@ -4882,9 +5870,22 @@
1271
+
@@ -4880,9 +5868,22 @@
1272
1272
self.constellation_to_embedder_proxy
1273
1273
.send(ConstellationToEmbedderMsg::HistoryChanged(
1274
1274
webview_id,
+1
-1
patches/components/script/dom/html/htmliframeelement.rs.patch
+1
-1
patches/components/script/dom/html/htmliframeelement.rs.patch
···
133
133
+ parent_url.origin().ascii_serialization()
134
134
+ );
135
135
+ // Log error to web console so developers can see why it failed
136
-
+ Console::internal_warn(window.as_global_scope(), DOMString::from(message.clone()));
137
136
+ warn!("{}", message);
137
+
+ Console::internal_warn(window.as_global_scope(), message);
138
138
+
139
139
+ // Fall back to non-functional state (iframe won't navigate)
140
140
+ self.is_embedded_webview.set(false);