Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

devtools: Use webview_id as browser_id (#35956)

Browse source 
* use `webview_id` as `browser_id`

Signed-off-by: atbrakhi <atbrakhi@igalia.com>

* use correct webview id

Signed-off-by: atbrakhi <atbrakhi@igalia.com>

* fmt

Signed-off-by: atbrakhi <atbrakhi@igalia.com>

* review fix

Signed-off-by: atbrakhi <atbrakhi@igalia.com>

---------

Signed-off-by: atbrakhi <atbrakhi@igalia.com>
This commit is contained in:
atbrakhi 2025-03-19 09:59:38 +01:00 • committed by GitHub
parent 4acaa08cf5
commit 2362e4c134
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 43 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/script/script_thread.rs
View file

@ -3248,7 +3248,12 @@ impl ScriptThread {
document.Title(),
final_url.clone(),
is_top_level_global,
(incomplete.browsing_context_id, incomplete.pipeline_id, None),
(
incomplete.browsing_context_id,
incomplete.pipeline_id,
None,
incomplete.webview_id,
),
);
document.set_https_state(metadata.https_state);
@ -3278,7 +3283,12 @@ impl ScriptThread {
title: DOMString,
url: ServoUrl,
is_top_level_global: bool,
(bc, p, w): (BrowsingContextId, PipelineId, Option<WorkerId>),
(browsing_context_id, pipeline_id, worker_id, webview_id): (
BrowsingContextId,
PipelineId,
Option<WorkerId>,
WebViewId,
),
) {
if let Some(ref chan) = self.senders.devtools_server_sender {
let page_info = DevtoolsPageInfo {
@ -3287,14 +3297,17 @@ impl ScriptThread {
is_top_level_global,
};
chan.send(ScriptToDevtoolsControlMsg::NewGlobal(
(bc, p, w),
(browsing_context_id, pipeline_id, worker_id, webview_id),
self.senders.devtools_client_to_script_thread_sender.clone(),
page_info.clone(),
))
.unwrap();
let state = NavigationState::Stop(p, page_info);
let _ = chan.send(ScriptToDevtoolsControlMsg::Navigate(bc, state));
let state = NavigationState::Stop(pipeline_id, page_info);
let _ = chan.send(ScriptToDevtoolsControlMsg::Navigate(
browsing_context_id,
state,
));
}
}