Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust
Rust ai-agentsai-toolsbrowserbrowser-automationcloud-browserheadlessheadless-browserkitesurfplaywrightpuppeteerrustservoweb-crawlerweb-crawlingweb-scraperweb-scraping
refactor(renderer): resolve scoped nodes within owner-only DOM operations
ldm0828658d9d485
diff --git a/moli-core/src/page/renderer_command_support.rs b/moli-core/src/page/renderer_command_support.rsindex 4dbc143e9..99e2c783d 100644--- a/moli-core/src/page/renderer_command_support.rs+++ b/moli-core/src/page/renderer_command_support.rs@@ -409,15 +409,23 @@ impl Page {))}+ pub fn start_scroll_node_into_view_if_needed(+ &self,+ reference: RendererDomNodeReference,+ rect: Option<moli_page_types::DomScrollIntoViewRect>,+ ) -> Result<PendingPageCommand> {+ self.start_page_command(RendererPageCommand::ScrollNodeIntoViewIfNeeded { reference, rect })+ }+pub fn start_scroll_backend_node_into_view_if_needed(&self,backend_node_id: u32,rect: Option<moli_page_types::DomScrollIntoViewRect>,) -> Result<PendingPageCommand> {- self.start_page_command(RendererPageCommand::ScrollBackendNodeIntoViewIfNeeded {- backend_node_id,+ self.start_scroll_node_into_view_if_needed(+ RendererDomNodeReference::BackendNodeId(backend_node_id),rect,- })+ )}pub fn finish_node_has_geometry_for_object_id(@@ -624,37 +632,61 @@ impl Page {)}+ pub fn start_remove_document_node(+ &self,+ reference: RendererDomNodeReference,+ ) -> Result<PendingPageCommand> {+ self.start_page_command(RendererPageCommand::RemoveDocumentNode { reference })+ }+pub fn start_remove_document_backend_node_id(&self,backend_node_id: u32,) -> Result<PendingPageCommand> {- self.start_page_command(RendererPageCommand::RemoveDocumentBackendNodeId {- backend_node_id,- })+ self.start_remove_document_node(RendererDomNodeReference::BackendNodeId(backend_node_id))}pub fn finish_remove_document_node(&mut self,completion: CompletedPageCommand,) -> Result<bool> {+ self.finish_remove_document_node_reference(completion)+ .map(|removed| removed.unwrap_or(false))+ }++ pub fn finish_remove_document_node_reference(+ &mut self,+ completion: CompletedPageCommand,+ ) -> Result<Option<bool>> {let reply = self.finish_page_command(completion);expect_page_reply!(reply,"remove document node page command",- "a bool reply",- RendererPageReply::Bool(value) => Ok(value),+ "an optional bool reply",+ RendererPageReply::OptionalBool(value) => Ok(value),)}+ pub fn start_mutate_document_node_attribute(+ &self,+ reference: RendererDomNodeReference,+ mutation: RendererDomAttributeMutation,+ ) -> Result<PendingPageCommand> {+ self.start_page_command(RendererPageCommand::MutateDocumentNodeAttribute {+ reference,+ mutation,+ })+ }+pub fn start_mutate_document_backend_node_attribute(&self,backend_node_id: u32,mutation: RendererDomAttributeMutation,) -> Result<PendingPageCommand> {- self.start_page_command(RendererPageCommand::MutateDocumentBackendNodeAttribute {- backend_node_id,+ self.start_mutate_document_node_attribute(+ RendererDomNodeReference::BackendNodeId(backend_node_id),mutation,- })+ )}pub fn finish_mutate_document_node_attribute(@@ -694,11 +726,18 @@ impl Page {)}+ pub fn start_focus_document_node(+ &self,+ reference: RendererDomNodeReference,+ ) -> Result<PendingPageCommand> {+ self.start_page_command(RendererPageCommand::FocusDocumentNode { reference })+ }+pub fn start_focus_document_backend_node_id(&self,backend_node_id: u32,) -> Result<PendingPageCommand> {- self.start_page_command(RendererPageCommand::FocusDocumentBackendNode { backend_node_id })+ self.start_focus_document_node(RendererDomNodeReference::BackendNodeId(backend_node_id))}pub fn finish_focus_document_node_id(@@ -829,6 +868,23 @@ impl Page {)}+ pub fn start_document_node_exists_for_backend_node_id(+ &self,+ backend_node_id: u32,+ ) -> Result<PendingPageCommand> {+ self.start_page_command(RendererPageCommand::DocumentNodeExistsForBackendNodeId {+ backend_node_id,+ })+ }++ pub fn finish_document_node_exists(+ &mut self,+ completion: CompletedPageCommand,+ ) -> Result<bool> {+ let reply = self.finish_page_command(completion);+ expect_page_reply!(reply, "document node presence page command", "a bool reply", RendererPageReply::Bool(exists) => Ok(exists),)+ }+pub fn start_document_node_snapshot_for_backend_node_id(&self,backend_node_id: u32,diff --git a/moli-protocol/src/domains/dom/resolve.rs b/moli-protocol/src/domains/dom/resolve.rsindex c62d24192..14a84a73b 100644--- a/moli-protocol/src/domains/dom/resolve.rs+++ b/moli-protocol/src/domains/dom/resolve.rs@@ -194,7 +194,7 @@ pub(super) enum PendingDomCommandKind {GetNodeForLocation {top_frame_id: String,},- RendererBackendNodeScrollIntoViewIfNeeded,+ RendererNodeScrollIntoViewIfNeeded,PushNodesByBackendIdsToFrontend {backend_node_ids: Vec<u32>,node_ids: Vec<u32>,@@ -206,25 +206,12 @@ pub(super) enum PendingDomCommandKind {QuerySelectorLive {multiple: bool,},- ResolveFrontendNodeForRemoveNode {- frontend_node_id: u32,- },- ResolveFrontendNodeForFocus {- frontend_node_id: u32,- },- ResolveFrontendNodeForMutateAttribute {- mutation: RendererDomAttributeMutation,- },ResolveFrontendNodeForResolveNode {frontend_node_id: u32,requested_execution_context_id: Option<i64>,object_group: Option<String>,top_frame_id: Option<String>,},- ResolveFrontendNodeForScrollIntoViewIfNeeded {- frontend_node_id: u32,- rect: Option<DomScrollIntoViewRect>,- },ResolveBidiNodeForSetFileInputFiles {object_id: DevToolsRemoteHandleId,files: Vec<SelectedFile>,@@ -463,32 +450,6 @@ fn required_backend_node_id_for_reference(}}-pub(super) fn start_document_node_snapshot_for_reference(- page: &Page,- reference: DevToolsDomNodeReference,- depth: i32,- pierce: bool,-) -> Result<PendingPageCommand, PendingDomCommandStartError> {- let backend_node_id = required_backend_node_id_for_reference(&reference)?;- page.start_document_node_snapshot_for_backend_node_id(backend_node_id, depth, pierce)- .map_err(PendingDomCommandStartError::renderer_error)-}--fn start_scroll_into_view_for_reference(- page: &Page,- reference: DevToolsDomNodeReference,- rect: Option<DomScrollIntoViewRect>,-) -> Result<(PendingPageCommand, PendingDomCommandKind), PendingDomCommandStartError> {- let backend_node_id = required_backend_node_id_for_reference(&reference)?;- let pending = page- .start_scroll_backend_node_into_view_if_needed(backend_node_id, rect)- .map_err(PendingDomCommandStartError::renderer_error)?;- Ok((- pending,- PendingDomCommandKind::RendererBackendNodeScrollIntoViewIfNeeded,- ))-}-fn optional_i64_to_i32(value: Option<i64>) -> Option<Option<i32>> {value.map(i32::try_from).transpose().ok()}diff --git a/moli-protocol/src/domains/dom/resolve/command_start.rs b/moli-protocol/src/domains/dom/resolve/command_start.rsindex 774e08e11..db1f159c5 100644--- a/moli-protocol/src/domains/dom/resolve/command_start.rs+++ b/moli-protocol/src/domains/dom/resolve/command_start.rs@@ -359,43 +359,27 @@ pub(super) fn start_cdp_dom_focus_command(let reference = devtools_node_reference_from_ids(params.node_id, params.backend_node_id).ok_or_else(PendingDomCommandStartError::invalid_params)?;- if let DevToolsDomNodeReference::FrontendNodeId(frontend_node_id) = reference {- return start_document_frontend_node_binding_command(- conn,- cmd.id,- &owner,- frontend_node_id,- PendingDomCommandKind::ResolveFrontendNodeForFocus { frontend_node_id },- )?- .ok_or_else(PendingDomCommandStartError::node_not_found);- }+ let missing_node_message = if matches!(reference, DevToolsDomNodeReference::FrontendNodeId(_)) {+ "Could not find node with given id"+ } else {+ "No node found for given backend id"+ };+ let session = conn.target_renderer_runtime_inspector_session_id_for_owner(&owner);let page = loaded_page_mut_for_owner(conn, &owner).ok_or_else(PendingDomCommandStartError::no_document_loaded)?;- let pending = start_focus_document_node_for_reference(page, reference)?;+ let pending = page+ .start_focus_document_node(reference.into_renderer_reference(session))+ .map_err(PendingDomCommandStartError::renderer_error)?;Ok(PendingDomCommandDispatch {command_id: cmd.id,owner_scope: owner,kind: PendingDomCommandKind::Focus {- missing_node_message: "No node found for given backend id",+ missing_node_message,},pending,})}-pub(super) fn start_focus_document_node_for_reference(- page: &Page,- reference: DevToolsDomNodeReference,-) -> Result<PendingPageCommand, PendingDomCommandStartError> {- match reference {- DevToolsDomNodeReference::FrontendNodeId(_) => {- Err(PendingDomCommandStartError::node_not_found())- }- DevToolsDomNodeReference::BackendNodeId(backend_node_id) => page- .start_focus_document_backend_node_id(backend_node_id)- .map_err(PendingDomCommandStartError::renderer_error),- }-}-pub(super) fn start_cdp_dom_attribute_mutation_command(conn: &mut CdpConnection,cmd: &Cmd<'_>,@@ -435,14 +419,20 @@ pub(super) fn start_cdp_dom_attribute_mutation_command(_ => unreachable!("attribute mutation command requires an attribute mutation action"),};- start_document_frontend_node_binding_command(- conn,- cmd.id,- &owner,- frontend_node_id,- PendingDomCommandKind::ResolveFrontendNodeForMutateAttribute { mutation },- )?- .ok_or_else(PendingDomCommandStartError::node_not_found)+ let session = conn.target_renderer_runtime_inspector_session_id_for_owner(&owner);+ let page = loaded_page_mut_for_owner(conn, &owner)+ .ok_or_else(PendingDomCommandStartError::no_document_loaded)?;+ let reference =+ DevToolsDomNodeReference::FrontendNodeId(frontend_node_id).into_renderer_reference(session);+ let pending = page+ .start_mutate_document_node_attribute(reference, mutation)+ .map_err(PendingDomCommandStartError::renderer_error)?;+ Ok(PendingDomCommandDispatch {+ command_id: cmd.id,+ owner_scope: owner,+ kind: PendingDomCommandKind::MutateAttribute,+ pending,+ })}pub(super) fn start_cdp_dom_edit_command(@@ -467,36 +457,6 @@ pub(super) fn start_cdp_dom_edit_command(})}-pub(super) fn start_mutate_document_node_for_reference(- page: &Page,- reference: DevToolsDomNodeReference,- mutation: RendererDomAttributeMutation,-) -> Result<(PendingPageCommand, PendingDomCommandKind), PendingDomCommandStartError> {- match reference {- DevToolsDomNodeReference::FrontendNodeId(_) => {- Err(PendingDomCommandStartError::node_not_found())- }- DevToolsDomNodeReference::BackendNodeId(backend_node_id) => page- .start_mutate_document_backend_node_attribute(backend_node_id, mutation)- .map(|pending| (pending, PendingDomCommandKind::MutateAttribute))- .map_err(PendingDomCommandStartError::renderer_error),- }-}--pub(super) fn start_remove_document_node_for_reference(- page: &Page,- reference: DevToolsDomNodeReference,-) -> Result<PendingPageCommand, PendingDomCommandStartError> {- match reference {- DevToolsDomNodeReference::FrontendNodeId(_) => {- Err(PendingDomCommandStartError::node_not_found())- }- DevToolsDomNodeReference::BackendNodeId(backend_node_id) => page- .start_remove_document_backend_node_id(backend_node_id)- .map_err(PendingDomCommandStartError::renderer_error),- }-}-pub(super) fn build_cdp_remove_node_command(conn: &CdpConnection,cmd: &Cmd<'_>,@@ -526,18 +486,12 @@ pub(super) fn start_devtools_remove_node_command(owner: &CommandOwnerScope,command: DevToolsRemoveNodeCommand,) -> Result<Option<PendingDomCommandDispatch>, PendingDomCommandStartError> {- if let DevToolsDomNodeReference::FrontendNodeId(frontend_node_id) = command.reference {- return start_document_frontend_node_binding_command(- conn,- command_id,- owner,- frontend_node_id,- PendingDomCommandKind::ResolveFrontendNodeForRemoveNode { frontend_node_id },- );- }+ let session = conn.target_renderer_runtime_inspector_session_id_for_owner(owner);let page = loaded_page_mut_for_owner(conn, owner).ok_or_else(PendingDomCommandStartError::no_document_loaded)?;- let pending = start_remove_document_node_for_reference(page, command.reference)?;+ let pending = page+ .start_remove_document_node(command.reference.into_renderer_reference(session))+ .map_err(PendingDomCommandStartError::renderer_error)?;Ok(Some(PendingDomCommandDispatch {command_id,owner_scope: owner.clone(),diff --git a/moli-protocol/src/domains/dom/resolve/native/files.rs b/moli-protocol/src/domains/dom/resolve/native/files.rsindex 9fe457082..8c46f3a0f 100644--- a/moli-protocol/src/domains/dom/resolve/native/files.rs+++ b/moli-protocol/src/domains/dom/resolve/native/files.rs@@ -35,28 +35,20 @@ pub(super) fn prepare(conn: &CdpConnection, cmd: &Cmd<'_>) -> Result<Operation,.ok_or_else(StartError::invalid_params)?;Ok(with_backend(session, reference, move |backend_node_id| {Operation::then(- Command::DocumentNodeSnapshotForBackendNodeId {- backend_node_id,- depth: 0,- pierce: false,- },+ Command::DocumentNodeExistsForBackendNodeId { backend_node_id },move |reply| match reply {- Ok(Reply::OptionalDocumentNodeObjectSnapshot(snapshot)) if snapshot.is_some() => {- match files {- Ok(files) => Step::Continue(Operation::new(- Command::SetFileInputFilesForBackendNodeId {- backend_node_id,- files,- append: false,- },- project,- )),- Err(error) => Step::Complete(Response::error(error.code, error.message)),- }- }- Ok(Reply::OptionalDocumentNodeObjectSnapshot(_)) => {- Step::Complete(node_not_found())- }+ Ok(Reply::Bool(true)) => match files {+ Ok(files) => Step::Continue(Operation::new(+ Command::SetFileInputFilesForBackendNodeId {+ backend_node_id,+ files,+ append: false,+ },+ project,+ )),+ Err(error) => Step::Complete(Response::error(error.code, error.message)),+ },+ Ok(Reply::Bool(false)) => Step::Complete(node_not_found()),Err(error) => Step::Complete(Response::error(-32000,format!("Could not preflight file input node: {error}"),diff --git a/moli-protocol/src/domains/dom/resolve/native/mutation.rs b/moli-protocol/src/domains/dom/resolve/native/mutation.rsindex 12b906869..2e80b0d95 100644--- a/moli-protocol/src/domains/dom/resolve/native/mutation.rs+++ b/moli-protocol/src/domains/dom/resolve/native/mutation.rs@@ -1,5 +1,5 @@//! Renderer-local DOM edits finish through the same channel as DOM queries.-//! Node-id lookups are continuations of the handler, not Browser round trips.+//! Scoped node references are resolved by the renderer operation before editing.use super::*;@@ -20,22 +20,22 @@ pub(super) fn prepare(DomAction::RemoveNode => {let params =build_cdp_remove_node_command(conn, cmd)?.ok_or_else(StartError::invalid_params)?;- // The first step only resolves a native node binding, but removal- // enters V8. Keep the complete chain on its owner turn; agent-only- // operations below inherit their backend entry requirement.- Ok(with_backend(session, params.reference, |backend_node_id| {- Operation::new(- Command::RemoveDocumentBackendNodeId { backend_node_id },- |reply| match reply {- Ok(Reply::Bool(true)) => Response::success(json!({})),- Ok(Reply::Bool(false)) => Response::error(-32000, "Could not remove node"),- Err(error) => {- Response::error(-32000, format!("Could not remove node: {error}"))- }- _ => unreachable!("DOM remove node reply"),- },- )- }))+ Ok(Operation::new(+ Command::RemoveDocumentNode {+ reference: params.reference.into_renderer_reference(session),+ },+ |reply| match reply {+ Ok(Reply::OptionalBool(Some(true))) => Response::success(json!({})),+ Ok(Reply::OptionalBool(Some(false))) => {+ Response::error(-32000, "Could not remove node")+ }+ Ok(Reply::OptionalBool(None)) => node_not_found(),+ Err(error) => {+ Response::error(-32000, format!("Could not remove node: {error}"))+ }+ _ => unreachable!("DOM remove node reply"),+ },+ ))}DomAction::Focus => {let params: NodeReferenceParams = cmd@@ -62,12 +62,12 @@ pub(super) fn prepare(} else {"No node found for given backend id"};- Ok(with_backend(session, reference, move |backend_node_id| {- Operation::new(- Command::FocusDocumentBackendNode { backend_node_id },- move |reply| focus(reply, missing),- )- }))+ Ok(Operation::new(+ Command::FocusDocumentNode {+ reference: reference.into_renderer_reference(session),+ },+ move |reply| focus(reply, missing),+ ))}}DomAction::SetAttributeValue | DomAction::RemoveAttribute => {@@ -96,18 +96,13 @@ pub(super) fn prepare()};let id = id.ok_or_else(StartError::invalid_params)?;- Ok(with_backend(- session,- DevToolsDomNodeReference::FrontendNodeId(id),- move |backend_node_id| {- Operation::new(- Command::MutateDocumentBackendNodeAttribute {- backend_node_id,- mutation,- },- attribute,- )+ Ok(Operation::new(+ Command::MutateDocumentNodeAttribute {+ reference: DevToolsDomNodeReference::FrontendNodeId(id)+ .into_renderer_reference(session),+ mutation,},+ attribute,))}DomAction::MoveTo@@ -143,15 +138,13 @@ pub(super) fn prepare(params.reference.backend_node_id,).ok_or_else(StartError::node_not_found)?;- Ok(with_backend(session, reference, move |backend_node_id| {- Operation::new(- Command::ScrollBackendNodeIntoViewIfNeeded {- backend_node_id,- rect,- },- scroll,- )- }))+ Ok(Operation::new(+ Command::ScrollNodeIntoViewIfNeeded {+ reference: reference.into_renderer_reference(session),+ rect,+ },+ scroll,+ ))}}DomAction::GetNodeForLocation => {diff --git a/moli-protocol/src/domains/dom/resolve/node_completion.rs b/moli-protocol/src/domains/dom/resolve/node_completion.rsindex 1afa508b9..23c2b44ef 100644--- a/moli-protocol/src/domains/dom/resolve/node_completion.rs+++ b/moli-protocol/src/domains/dom/resolve/node_completion.rs@@ -38,15 +38,6 @@ pub(super) fn complete_pending_dom_command_result(let completion = *completed_work;let result = match completed.kind {- PendingDomCommandKind::ResolveFrontendNodeForRemoveNode { frontend_node_id } => {- return complete_frontend_node_binding_for_remove_node_result(- conn,- completed.command_id,- &owner_scope,- completion,- frontend_node_id,- );- }PendingDomCommandKind::ResolveFrontendNodeForResolveNode {frontend_node_id,requested_execution_context_id,@@ -64,19 +55,6 @@ pub(super) fn complete_pending_dom_command_result(top_frame_id,);}- PendingDomCommandKind::ResolveFrontendNodeForScrollIntoViewIfNeeded {- frontend_node_id,- rect,- } => {- return complete_frontend_node_binding_for_scroll_into_view_if_needed_result(- conn,- completed.command_id,- &owner_scope,- completion,- frontend_node_id,- rect,- );- }PendingDomCommandKind::ResolveBidiNodeForSetFileInputFiles {object_id,files,@@ -151,14 +129,14 @@ pub(super) fn complete_pending_dom_command_result().map(AutomationResult::DomGeometry)}- PendingDomCommandKind::RendererBackendNodeScrollIntoViewIfNeeded => {+ PendingDomCommandKind::RendererNodeScrollIntoViewIfNeeded => {let Some(page) = loaded_page_mut_for_owner(conn, &owner_scope) else {return devtools_dom_command_task_complete(Err(DevToolsError::new(DevToolsErrorKind::Internal,"NoDocumentLoaded",)));};- complete_renderer_backend_node_scroll_into_view_if_needed_result(page, completion)+ complete_renderer_node_scroll_into_view_if_needed_result(page, completion).map(|()| AutomationResult::Empty)}PendingDomCommandKind::PushNodesByBackendIdsToFrontend {@@ -235,6 +213,26 @@ pub(super) fn complete_pending_dom_command_result(complete_query_selector_set_child_nodes_live_result(page, completion, multiple).map(AutomationResult::QuerySelector)}+ PendingDomCommandKind::RemoveNode => {+ let Some(page) = loaded_page_mut_for_owner(conn, &owner_scope) else {+ return devtools_dom_command_task_complete(Err(DevToolsError::new(+ DevToolsErrorKind::Internal,+ "NoDocumentLoaded",+ )));+ };+ match page.finish_remove_document_node_reference(completion) {+ Ok(Some(true)) => Ok(AutomationResult::Empty),+ Ok(Some(false)) => Err(DevToolsError::new(+ DevToolsErrorKind::Internal,+ "Could not remove node",+ )),+ Ok(None) => Err(devtools_dom_node_not_found_error()),+ Err(error) => Err(DevToolsError::new(+ DevToolsErrorKind::Internal,+ format!("Could not remove node: {error}"),+ )),+ }+ }PendingDomCommandKind::GetAttributesLive => {let Some(page) = loaded_page_mut_for_owner(conn, &owner_scope) else {return devtools_dom_command_task_complete(Err(DevToolsError::new(@@ -809,91 +807,6 @@ where}}-pub(super) fn complete_frontend_node_binding_for_remove_node(- conn: &mut CdpConnection,- command_id: Option<u64>,- owner: &CommandOwnerScope,- completion: CompletedPageCommand,- _frontend_node_id: u32,- out: &mut DomCommandOutput,-) -> DomCommandTaskStep {- complete_frontend_node_binding_followup(- conn,- command_id,- owner,- completion,- out,- |page, reference| {- start_remove_document_node_for_reference(page, reference)- .map(|pending| (pending, PendingDomCommandKind::RemoveNode))- },- )-}--pub(super) fn complete_frontend_node_binding_for_remove_node_result(- conn: &mut CdpConnection,- command_id: Option<u64>,- owner: &CommandOwnerScope,- completion: CompletedPageCommand,- _frontend_node_id: u32,-) -> DevToolsDomCommandTaskStep {- complete_frontend_node_binding_followup_result(- conn,- command_id,- owner,- completion,- |page, reference| {- start_remove_document_node_for_reference(page, reference)- .map(|pending| (pending, PendingDomCommandKind::RemoveNode))- },- )-}--pub(super) fn complete_frontend_node_binding_for_focus(- conn: &mut CdpConnection,- command_id: Option<u64>,- owner: &CommandOwnerScope,- completion: CompletedPageCommand,- _frontend_node_id: u32,- out: &mut DomCommandOutput,-) -> DomCommandTaskStep {- complete_frontend_node_binding_followup(- conn,- command_id,- owner,- completion,- out,- |page, reference| {- start_focus_document_node_for_reference(page, reference).map(|pending| {- (- pending,- PendingDomCommandKind::Focus {- missing_node_message: "Could not find node with given id",- },- )- })- },- )-}--pub(super) fn complete_frontend_node_binding_for_mutate_attribute(- conn: &mut CdpConnection,- command_id: Option<u64>,- owner: &CommandOwnerScope,- completion: CompletedPageCommand,- mutation: RendererDomAttributeMutation,- out: &mut DomCommandOutput,-) -> DomCommandTaskStep {- complete_frontend_node_binding_followup(- conn,- command_id,- owner,- completion,- out,- move |page, reference| start_mutate_document_node_for_reference(page, reference, mutation),- )-}-pub(super) fn start_resolve_node_for_bound_reference(page: &Page,renderer_inspector_session_id: Option<String>,@@ -983,42 +896,6 @@ pub(super) fn complete_frontend_node_binding_for_resolve_node_result()}-pub(super) fn complete_frontend_node_binding_for_scroll_into_view_if_needed(- conn: &mut CdpConnection,- command_id: Option<u64>,- owner: &CommandOwnerScope,- completion: CompletedPageCommand,- _frontend_node_id: u32,- rect: Option<DomScrollIntoViewRect>,- out: &mut DomCommandOutput,-) -> DomCommandTaskStep {- complete_frontend_node_binding_followup(- conn,- command_id,- owner,- completion,- out,- |page, reference| start_scroll_into_view_for_reference(page, reference, rect),- )-}--pub(super) fn complete_frontend_node_binding_for_scroll_into_view_if_needed_result(- conn: &mut CdpConnection,- command_id: Option<u64>,- owner: &CommandOwnerScope,- completion: CompletedPageCommand,- _frontend_node_id: u32,- rect: Option<DomScrollIntoViewRect>,-) -> DevToolsDomCommandTaskStep {- complete_frontend_node_binding_followup_result(- conn,- command_id,- owner,- completion,- |page, reference| start_scroll_into_view_for_reference(page, reference, rect),- )-}-pub(super) fn complete_get_attributes_live(page: &mut Page,completion: CompletedPageCommand,@@ -1606,7 +1483,7 @@ pub(super) fn complete_scroll_into_view_if_needed_object_reference_result(complete_scroll_into_view_result(page.finish_scroll_node_into_view_if_needed(completion))}-pub(super) fn complete_renderer_backend_node_scroll_into_view_if_needed(+pub(super) fn complete_renderer_node_scroll_into_view_if_needed(page: &mut Page,completion: CompletedPageCommand,out: &mut DomCommandOutput,@@ -1627,7 +1504,7 @@ pub(super) fn complete_renderer_backend_node_scroll_into_view_if_needed(DomCommandTaskStep::Complete}-pub(super) fn complete_renderer_backend_node_scroll_into_view_if_needed_result(+pub(super) fn complete_renderer_node_scroll_into_view_if_needed_result(page: &mut Page,completion: CompletedPageCommand,) -> Result<(), DevToolsError> {diff --git a/moli-protocol/src/domains/dom/resolve/pending_command.rs b/moli-protocol/src/domains/dom/resolve/pending_command.rsindex 3504beb21..156bd40ff 100644--- a/moli-protocol/src/domains/dom/resolve/pending_command.rs+++ b/moli-protocol/src/domains/dom/resolve/pending_command.rs@@ -51,36 +51,6 @@ pub(super) fn complete_pending_dom_command(out,);}- PendingDomCommandKind::ResolveFrontendNodeForRemoveNode { frontend_node_id } => {- return complete_frontend_node_binding_for_remove_node(- conn,- command_id,- &owner_scope,- completion,- frontend_node_id,- out,- );- }- PendingDomCommandKind::ResolveFrontendNodeForFocus { frontend_node_id } => {- return complete_frontend_node_binding_for_focus(- conn,- command_id,- &owner_scope,- completion,- frontend_node_id,- out,- );- }- PendingDomCommandKind::ResolveFrontendNodeForMutateAttribute { mutation } => {- return complete_frontend_node_binding_for_mutate_attribute(- conn,- command_id,- &owner_scope,- completion,- mutation,- out,- );- }PendingDomCommandKind::ResolveFrontendNodeForResolveNode {frontend_node_id,requested_execution_context_id,@@ -99,20 +69,6 @@ pub(super) fn complete_pending_dom_command(out,);}- PendingDomCommandKind::ResolveFrontendNodeForScrollIntoViewIfNeeded {- frontend_node_id,- rect,- } => {- return complete_frontend_node_binding_for_scroll_into_view_if_needed(- conn,- command_id,- &owner_scope,- completion,- frontend_node_id,- rect,- out,- );- }PendingDomCommandKind::ResolveBidiNodeForSetFileInputFiles {object_id,files,@@ -161,11 +117,14 @@ pub(super) fn complete_pending_dom_command(}}}- PendingDomCommandKind::RemoveNode => match page.finish_remove_document_node(completion) {- Ok(true) => out.push_success(),- Ok(false) => out.push_error(-32000, "Could not remove node"),- Err(error) => out.push_error(-32000, format!("Could not remove node: {error}")),- },+ PendingDomCommandKind::RemoveNode => {+ match page.finish_remove_document_node_reference(completion) {+ Ok(Some(true)) => out.push_success(),+ Ok(Some(false)) => out.push_error(-32000, "Could not remove node"),+ Ok(None) => out.push_error(-32000, "Could not find node with given id"),+ Err(error) => out.push_error(-32000, format!("Could not remove node: {error}")),+ }+ }PendingDomCommandKind::SetFileInputFilesPreflight {reference,file_paths,@@ -276,10 +235,8 @@ pub(super) fn complete_pending_dom_command(Err(error) => out.push_error(-32000, error.message),}}- PendingDomCommandKind::RendererBackendNodeScrollIntoViewIfNeeded => {- return complete_renderer_backend_node_scroll_into_view_if_needed(- page, completion, out,- );+ PendingDomCommandKind::RendererNodeScrollIntoViewIfNeeded => {+ return complete_renderer_node_scroll_into_view_if_needed(page, completion, out);}PendingDomCommandKind::PushNodesByBackendIdsToFrontend {backend_node_ids,@@ -552,11 +509,7 @@ pub(super) fn complete_pending_dom_command(| PendingDomCommandKind::DiscardSearchResultsLive| PendingDomCommandKind::SetNodeStackTracesEnabled| PendingDomCommandKind::GetNodeStackTraces- | PendingDomCommandKind::ResolveFrontendNodeForRemoveNode { .. }- | PendingDomCommandKind::ResolveFrontendNodeForFocus { .. }- | PendingDomCommandKind::ResolveFrontendNodeForMutateAttribute { .. }| PendingDomCommandKind::ResolveFrontendNodeForResolveNode { .. }- | PendingDomCommandKind::ResolveFrontendNodeForScrollIntoViewIfNeeded { .. }| PendingDomCommandKind::ResolveBidiNodeForSetFileInputFiles { .. }| PendingDomCommandKind::ResolveFrontendNodeForSetFileInputFiles { .. } => {unreachable!(diff --git a/moli-protocol/src/domains/dom/resolve/protocol_dispatch.rs b/moli-protocol/src/domains/dom/resolve/protocol_dispatch.rsindex cae0a2b10..ac80b276f 100644--- a/moli-protocol/src/domains/dom/resolve/protocol_dispatch.rs+++ b/moli-protocol/src/domains/dom/resolve/protocol_dispatch.rs@@ -536,21 +536,16 @@ pub(super) fn start_devtools_scroll_into_view_if_needed_command(let Some(reference) = command.reference else {return Err(PendingDomCommandStartError::node_not_found());};- if let DevToolsDomNodeReference::FrontendNodeId(frontend_node_id) = reference {- return start_document_frontend_node_binding_command(- conn,- command_id,- owner,- frontend_node_id,- PendingDomCommandKind::ResolveFrontendNodeForScrollIntoViewIfNeeded {- frontend_node_id,- rect: command.rect,- },- );- }+ let session = conn.target_renderer_runtime_inspector_session_id_for_owner(owner);let page = loaded_page_mut_for_owner(conn, owner).ok_or_else(PendingDomCommandStartError::no_document_loaded)?;- let (pending, kind) = start_scroll_into_view_for_reference(page, reference, command.rect)?;+ let pending = page+ .start_scroll_node_into_view_if_needed(+ reference.into_renderer_reference(session),+ command.rect,+ )+ .map_err(PendingDomCommandStartError::renderer_error)?;+ let kind = PendingDomCommandKind::RendererNodeScrollIntoViewIfNeeded;Ok(Some(PendingDomCommandDispatch {command_id,owner_scope: owner.clone(),diff --git a/moli-protocol/src/domains/dom/resolve/protocol_neutral_tests.rs b/moli-protocol/src/domains/dom/resolve/protocol_neutral_tests.rsindex 9f98ab702..5445e2479 100644--- a/moli-protocol/src/domains/dom/resolve/protocol_neutral_tests.rs+++ b/moli-protocol/src/domains/dom/resolve/protocol_neutral_tests.rs@@ -1436,3 +1436,104 @@ fn cdp_set_file_input_files_node_reference_falls_back_to_pending_node_reference_panic!("setFileInputFiles without objectId should use node-reference pending path");};}++#[tokio::test(flavor = "multi_thread")]+async fn typed_child_capture_and_removal_use_scoped_node_references() {+ use crate::automation::{AutomationContext, AutomationResult, DevToolsError};+ use crate::testing::TestContext;++ async fn execute(+ conn: &mut CdpConnection,+ command: AutomationCommand,+ ) -> Result<AutomationResult, DevToolsError> {+ let pending = start_devtools_dom_command(conn, None, None, command)?+ .expect("DOM operation must start in the renderer");+ super::await_pending_devtools_dom_command_result(conn, pending).await+ }++ let mut ctx = TestContext::new();+ ctx.process_async(+ json!({"id": 1, "method": "Target.createTarget", "params": {"url": "about:blank"}}),+ )+ .await;+ ctx.take_response_by_id(1);+ ctx.process_async(json!({"id": 10, "method": "Page.navigate", "params": {"url": "data:text/html,<!doctype html><html><body><section id='front'><span>one</span></section><section id='back'><span>two</span></section></body></html>"}})).await;+ let navigation = ctx.take_response_by_id(10);+ let frame_id = navigation["result"]["frameId"].as_str().unwrap();+ let loader_id = navigation["result"]["loaderId"].as_str().unwrap();+ crate::testing::wait_until_renderer_document_load(&mut ctx, None, frame_id, loader_id).await;+ ctx.process_async(json!({"id": 2, "method": "DOM.getDocument"}))+ .await;+ let root = ctx.take_response_by_id(2)["result"]["root"]["nodeId"].clone();+ let context = AutomationContext {+ protocol: FrontendProtocol::Cdp,+ session_id: None,+ target_id: None,+ browser_context_id: None,+ };+ for (index, selector) in ["#front", "#back"].into_iter().enumerate() {+ ctx.process_async(json!({"id": 3, "method": "DOM.querySelector", "params": {"nodeId": root, "selector": selector}})).await;+ let frontend_node_id = ctx.take_response_by_id(3)["result"]["nodeId"]+ .as_u64()+ .unwrap() as u32;+ ctx.process_async(+ json!({"id": 4, "method": "DOM.describeNode", "params": {"nodeId": frontend_node_id}}),+ )+ .await;+ let backend_node_id = ctx.take_response_by_id(4)["result"]["node"]["backendNodeId"]+ .as_u64()+ .unwrap() as u32;+ let reference = if index == 0 {+ DevToolsDomNodeReference::FrontendNodeId(frontend_node_id)+ } else {+ DevToolsDomNodeReference::BackendNodeId(backend_node_id)+ };+ let capture = execute(+ &mut ctx.conn,+ AutomationCommand::RequestChildNodes(+ crate::automation::DevToolsRequestChildNodesCommand {+ context: context.clone(),+ reference: reference.clone(),+ depth: 1,+ pierce: false,+ },+ ),+ )+ .await+ .expect("typed child capture should complete");+ assert!(matches!(capture, AutomationResult::Empty));+ let removed = execute(+ &mut ctx.conn,+ AutomationCommand::RemoveNode(crate::automation::DevToolsRemoveNodeCommand {+ context: context.clone(),+ reference,+ }),+ )+ .await+ .expect("typed removal should complete");+ assert!(matches!(removed, AutomationResult::Empty));+ ctx.process_async(json!({"id": 5, "method": "DOM.querySelector", "params": {"nodeId": root, "selector": selector}})).await;+ assert_eq!(+ ctx.take_response_by_id(5)["result"]["nodeId"],+ 0,+ "removal must change the live document"+ );+ }+ let missing = DevToolsDomNodeReference::FrontendNodeId(u32::MAX);+ for command in [+ AutomationCommand::RequestChildNodes(crate::automation::DevToolsRequestChildNodesCommand {+ context: context.clone(),+ reference: missing.clone(),+ depth: 1,+ pierce: false,+ }),+ AutomationCommand::RemoveNode(crate::automation::DevToolsRemoveNodeCommand {+ context,+ reference: missing,+ }),+ ] {+ let error = execute(&mut ctx.conn, command).await.unwrap_err();+ assert_eq!(error.kind, DevToolsErrorKind::NoSuchNode);+ assert_eq!(error.message, "Could not find node with given id");+ }+}diff --git a/moli-protocol/src/domains/dom/set_file_input.rs b/moli-protocol/src/domains/dom/set_file_input.rsindex a509e69bd..450e3eb7d 100644--- a/moli-protocol/src/domains/dom/set_file_input.rs+++ b/moli-protocol/src/domains/dom/set_file_input.rs@@ -11,7 +11,7 @@ use super::node_references::{NodeReferenceParams, devtools_node_reference_from_iuse super::resolve::{DevToolsDomCommandTaskStep, DomCommandOutput, DomCommandTaskStep, PendingDomCommandDispatch,PendingDomCommandKind, PendingDomCommandStartError, devtools_dom_command_task_complete,- dom_object_reference_id_for_owner, start_document_node_snapshot_for_reference,+ dom_object_reference_id_for_owner,};use crate::automation::{DevToolsDomNodeReference, DevToolsError, DevToolsErrorKind, DevToolsRemoteHandleId,@@ -146,10 +146,10 @@ pub(super) fn complete_preflight(out.push_error(-32000, "Could not find node with given id");return DomCommandTaskStep::Complete;};- let preflight = page.finish_document_node_snapshot_for_backend_node_id(completion);+ let preflight = page.finish_document_node_exists(completion);match preflight {- Ok(Some(_)) => {}- Ok(None) => {+ Ok(true) => {}+ Ok(false) => {out.push_error(-32000, "Could not find node with given id");return DomCommandTaskStep::Complete;}@@ -472,10 +472,12 @@ fn start_set_file_input_files_preflight_dispatch(file_paths: Vec<String>,append: bool,) -> Result<PendingDomCommandDispatch, PendingDomCommandStartError> {- let DevToolsDomNodeReference::BackendNodeId(_) = reference else {+ let DevToolsDomNodeReference::BackendNodeId(backend_node_id) = reference else {return Err(PendingDomCommandStartError::node_not_found());};- let pending = start_document_node_snapshot_for_reference(page, reference.clone(), 0, false)?;+ let pending = page+ .start_document_node_exists_for_backend_node_id(backend_node_id)+ .map_err(PendingDomCommandStartError::renderer_error)?;Ok(PendingDomCommandDispatch {command_id,owner_scope: owner.clone(),diff --git a/moli-renderer-v8/src/devtools/command/nested.rs b/moli-renderer-v8/src/devtools/command/nested.rsindex 22c271117..e62d7087b 100644--- a/moli-renderer-v8/src/devtools/command/nested.rs+++ b/moli-renderer-v8/src/devtools/command/nested.rs@@ -39,6 +39,7 @@ impl RendererPageCommand {| Self::DocumentGeometryForNode { .. }| Self::DocumentHitTest { .. }| Self::NodeHasGeometryForBackendNodeId { .. }+ | Self::DocumentNodeExistsForBackendNodeId { .. }| Self::DocumentNodeSnapshotForBackendNodeId { .. }| Self::DocumentNodeSnapshotForNodeInInspectorSession { .. }| Self::DocumentNodeSnapshotForDocument { .. }@@ -150,11 +151,11 @@ impl RendererPageCommand {| Self::RuntimeCollectGarbage| Self::StopDocumentLifecycle| Self::SetInlineStyleSheetTextForStyleSheetId { .. }- | Self::ScrollBackendNodeIntoViewIfNeeded { .. }- | Self::RemoveDocumentBackendNodeId { .. }- | Self::MutateDocumentBackendNodeAttribute { .. }+ | Self::ScrollNodeIntoViewIfNeeded { .. }+ | Self::RemoveDocumentNode { .. }+ | Self::MutateDocumentNodeAttribute { .. }| Self::EditDocumentNode { .. }- | Self::FocusDocumentBackendNode { .. }+ | Self::FocusDocumentNode { .. }| Self::TriggerAutofill(..)| Self::ResetNavigationHistory| Self::SetFileInputFilesForBackendNodeId { .. }diff --git a/moli-renderer-v8/src/runtime/page_commands.rs b/moli-renderer-v8/src/runtime/page_commands.rsindex d1d701dbe..619a50bab 100644--- a/moli-renderer-v8/src/runtime/page_commands.rs+++ b/moli-renderer-v8/src/runtime/page_commands.rs@@ -153,11 +153,11 @@ impl PageVm {self.clear_active_drag_data_transfer()?;Ok(RendererPageReply::Unit)}- RendererPageCommand::MutateDocumentBackendNodeAttribute {- backend_node_id,+ RendererPageCommand::MutateDocumentNodeAttribute {+ reference,mutation,} => self- .mutate_document_backend_node_attribute(backend_node_id, mutation)+ .mutate_document_node_attribute(reference, mutation).map(RendererPageReply::DomAttributeMutationOutcome),RendererPageCommand::EditDocumentNode {inspector_session_id,@@ -165,8 +165,8 @@ impl PageVm {} => self.edit_document_node(inspector_session_id.as_deref(), edit).map(RendererPageReply::DomEditOutcome),- RendererPageCommand::FocusDocumentBackendNode { backend_node_id } => self- .focus_document_backend_node(backend_node_id)+ RendererPageCommand::FocusDocumentNode { reference } => self+ .focus_document_node(reference).map(RendererPageReply::DomFocusOutcome),RendererPageCommand::TriggerAutofill(request) => self.trigger_autofill(request)@@ -456,11 +456,11 @@ impl PageVm {&text,).map(RendererPageReply::Bool),- RendererPageCommand::ScrollBackendNodeIntoViewIfNeeded {- backend_node_id,+ RendererPageCommand::ScrollNodeIntoViewIfNeeded {+ reference,rect,} => self- .scroll_backend_node_into_view_if_needed(backend_node_id, rect)+ .scroll_node_into_view_if_needed(reference, rect).map(RendererPageReply::ScrollIntoViewResult),RendererPageCommand::ClientRectForBackendNodeId { backend_node_id } => Ok(RendererPageReply::OptionalDocumentNodeClientRect(@@ -492,9 +492,10 @@ impl PageVm {self.node_has_geometry_for_backend_node_id(backend_node_id)?,))}- RendererPageCommand::RemoveDocumentBackendNodeId { backend_node_id } => self- .remove_document_backend_node_id(backend_node_id)- .map(RendererPageReply::Bool),+ RendererPageCommand::RemoveDocumentNode { reference } => self+ .remove_document_node(reference)+ .map(RendererPageReply::OptionalBool),+ RendererPageCommand::DocumentNodeExistsForBackendNodeId { backend_node_id } => self.document_node_exists_for_backend_node_id(backend_node_id).map(RendererPageReply::Bool),RendererPageCommand::DocumentNodeSnapshotForBackendNodeId {backend_node_id,depth,diff --git a/moli-renderer-v8/src/runtime/page_dom.rs b/moli-renderer-v8/src/runtime/page_dom.rsindex d6285a912..d947a0638 100644--- a/moli-renderer-v8/src/runtime/page_dom.rs+++ b/moli-renderer-v8/src/runtime/page_dom.rs@@ -1920,6 +1920,23 @@ impl PageVm {Ok(snapshot)}+ pub(crate) fn document_node_exists_for_backend_node_id(+ &mut self,+ backend_node_id: u32,+ ) -> Result<bool> {+ let Some(key) = self.current_renderer_backend_node_key_for_id(backend_node_id) else {+ return Ok(false);+ };+ // The registry has validated physical node lifetime and document ownership.+ // Inspector identities also need their generated representation to exist.+ if key.inspector_identity.is_none() {+ return Ok(true);+ }+ Ok(self+ .document_node_snapshot_for_backend_node_id(backend_node_id, 0, false)?+ .is_some())+ }+pub(crate) fn document_node_snapshot_for_backend_node_id(&mut self,backend_node_id: u32,@@ -3560,12 +3577,12 @@ impl PageVm {.scroll_live_node_handle_into_view_if_needed(handle, rect)}- pub(crate) fn scroll_backend_node_into_view_if_needed(+ pub(crate) fn scroll_node_into_view_if_needed(&mut self,- backend_node_id: u32,+ reference: RendererDomNodeReference,rect: Option<moli_page_types::DomScrollIntoViewRect>,) -> Result<RendererScrollIntoViewResult> {- let Some(handle) = self.live_handle_for_backend_node_id(backend_node_id) else {+ let Some(handle) = self.live_handle_for_document_node_reference(reference) else {return Ok(RendererScrollIntoViewResult::NodeNotFound);};self.vm_mut()@@ -4035,19 +4052,26 @@ impl PageVm {.unwrap_or(false))}- pub(crate) fn remove_document_backend_node_id(&mut self, backend_node_id: u32) -> Result<bool> {+ pub(crate) fn remove_document_node(+ &mut self,+ reference: RendererDomNodeReference,+ ) -> Result<Option<bool>> {+ let Some(backend_node_id) = self.backend_node_id_for_document_node_reference(reference)+ else {+ return Ok(None);+ };let Some(handle) = self.live_handle_for_backend_node_id(backend_node_id) else {- return Ok(false);+ return Ok(Some(false));};- self.remove_document_node_id(handle)+ self.remove_document_node_id(handle).map(Some)}- pub(crate) fn mutate_document_backend_node_attribute(+ pub(crate) fn mutate_document_node_attribute(&mut self,- backend_node_id: u32,+ reference: RendererDomNodeReference,mutation: RendererDomAttributeMutation,) -> Result<RendererDomAttributeMutationOutcome> {- let Some(handle) = self.live_handle_for_backend_node_id(backend_node_id) else {+ let Some(handle) = self.live_handle_for_document_node_reference(reference) else {return Ok(RendererDomAttributeMutationOutcome::NodeNotFound);};self.vm_mut()@@ -4225,11 +4249,11 @@ impl PageVm {})}- pub(crate) fn focus_document_backend_node(+ pub(crate) fn focus_document_node(&mut self,- backend_node_id: u32,+ reference: RendererDomNodeReference,) -> Result<RendererDomFocusOutcome> {- let Some(handle) = self.live_handle_for_backend_node_id(backend_node_id) else {+ let Some(handle) = self.live_handle_for_document_node_reference(reference) else {return Ok(RendererDomFocusOutcome::NodeNotFound);};self.vm_mut().focus_document_node(handle)diff --git a/moli-renderer-v8/src/runtime/page_surface.rs b/moli-renderer-v8/src/runtime/page_surface.rsindex 8e9a61d0a..96179c0c6 100644--- a/moli-renderer-v8/src/runtime/page_surface.rs+++ b/moli-renderer-v8/src/runtime/page_surface.rs@@ -4830,8 +4830,8 @@ pub enum RendererPageCommand {style_sheet_id: String,text: String,},- ScrollBackendNodeIntoViewIfNeeded {- backend_node_id: u32,+ ScrollNodeIntoViewIfNeeded {+ reference: RendererDomNodeReference,rect: Option<moli_page_types::DomScrollIntoViewRect>,},ClientRectForBackendNodeId {@@ -4850,19 +4850,19 @@ pub enum RendererPageCommand {NodeHasGeometryForBackendNodeId {backend_node_id: u32,},- RemoveDocumentBackendNodeId {- backend_node_id: u32,+ RemoveDocumentNode {+ reference: RendererDomNodeReference,},- MutateDocumentBackendNodeAttribute {- backend_node_id: u32,+ MutateDocumentNodeAttribute {+ reference: RendererDomNodeReference,mutation: RendererDomAttributeMutation,},EditDocumentNode {inspector_session_id: Option<String>,edit: RendererDomEdit,},- FocusDocumentBackendNode {- backend_node_id: u32,+ FocusDocumentNode {+ reference: RendererDomNodeReference,},TriggerAutofill(RendererAutofillTriggerRequest),ResetNavigationHistory,@@ -4871,6 +4871,9 @@ pub enum RendererPageCommand {files: Vec<crate::dom::native::SelectedFile>,append: bool,},+ DocumentNodeExistsForBackendNodeId {+ backend_node_id: u32,+ },DocumentNodeSnapshotForBackendNodeId {backend_node_id: u32,depth: i32,@@ -5568,6 +5571,9 @@ impl RendererPageCommand {Self::ChildFrameDocumentRootNodeReference { .. } => {Some("ChildFrameDocumentRootNodeReference")}+ Self::DocumentNodeExistsForBackendNodeId { .. } => {+ Some("DocumentNodeExistsForBackendNodeId")+ }Self::DocumentNodeSnapshotForBackendNodeId { .. } => {Some("DocumentNodeSnapshotForBackendNodeId")}@@ -5639,14 +5645,12 @@ impl RendererPageCommand {Self::PublishLayout => Some("PublishLayout"),Self::CaptureScreenshot(_) => Some("CaptureScreenshot"),Self::CaptureScreencastFrame(_) => Some("CaptureScreencastFrame"),- Self::ScrollBackendNodeIntoViewIfNeeded { .. } => {- Some("ScrollBackendNodeIntoViewIfNeeded")- }+ Self::ScrollNodeIntoViewIfNeeded { .. } => Some("ScrollNodeIntoViewIfNeeded"),Self::ClientRectForBackendNodeId { .. } => Some("ClientRectForBackendNodeId"),Self::DocumentGeometryForNode { .. } => Some("DocumentGeometryForNode"),Self::DocumentHitTest { .. } => Some("DocumentHitTest"),Self::NodeHasGeometryForBackendNodeId { .. } => Some("NodeHasGeometryForBackendNodeId"),- Self::RemoveDocumentBackendNodeId { .. } => Some("RemoveDocumentBackendNodeId"),+ Self::RemoveDocumentNode { .. } => Some("RemoveDocumentNode"),Self::EditDocumentNode { .. } => Some("EditDocumentNode"),Self::TriggerAutofill(_) => Some("TriggerAutofill"),Self::ComputedStyleProperties { .. } => Some("ComputedStyleProperties"),