Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00: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

7
components/devtools/lib.rs
View file

@ -19,7 +19,7 @@ use std::net::{Shutdown, TcpListener, TcpStream};
use std::sync::{Arc, Mutex};
use std::thread;
use base::id::{BrowsingContextId, PipelineId};
use base::id::{BrowsingContextId, PipelineId, WebViewId};
use crossbeam_channel::{Receiver, Sender, unbounded};
use devtools_traits::{
ChromeToDevtoolsControlMsg, ConsoleMessage, ConsoleMessageBuilder, DevtoolScriptControlMsg,
@ -343,13 +343,13 @@ impl DevtoolsInstance {
// TODO: move this into the root or target modules?
fn handle_new_global(
&mut self,
ids: (BrowsingContextId, PipelineId, Option<WorkerId>),
ids: (BrowsingContextId, PipelineId, Option<WorkerId>, WebViewId),
script_sender: IpcSender<DevtoolScriptControlMsg>,
page_info: DevtoolsPageInfo,
) {
let mut actors = self.actors.lock().unwrap();
let (browsing_context_id, pipeline_id, worker_id) = ids;
let (browsing_context_id, pipeline_id, worker_id, webview_id) = ids;
let console_name = actors.new_name("console");
@ -387,6 +387,7 @@ impl DevtoolsInstance {
.or_insert_with(|| {
let browsing_context_actor = BrowsingContextActor::new(
console_name.clone(),
webview_id,
browsing_context_id,
page_info,
pipeline_id,