servo
diff --git a/‎Cargo.lock‎
Lines changed: 3 additions & 0 deletions b/‎Cargo.lock‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎components/constellation/tracing.rs‎
Lines changed: 1 addition & 0 deletions b/‎components/constellation/tracing.rs‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎components/script/script_thread.rs‎
Lines changed: 55 additions & 6 deletions b/‎components/script/script_thread.rs‎
Lines changed: 55 additions & 6 deletions
diff --git a/‎components/servo/lib.rs‎
Lines changed: 5 additions & 14 deletions b/‎components/servo/lib.rs‎
Lines changed: 5 additions & 14 deletions
diff --git a/‎components/shared/embedder/lib.rs‎
Lines changed: 2 additions & 0 deletions b/‎components/shared/embedder/lib.rs‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎components/webdriver_server/actions.rs‎
Lines changed: 11 additions & 10 deletions b/‎components/webdriver_server/actions.rs‎
Lines changed: 11 additions & 10 deletions
diff --git a/‎components/webdriver_server/lib.rs‎
Lines changed: 33 additions & 18 deletions b/‎components/webdriver_server/lib.rs‎
Lines changed: 33 additions & 18 deletions
diff --git a/‎ports/servoshell/Cargo.toml‎
Lines changed: 4 additions & 2 deletions b/‎ports/servoshell/Cargo.toml‎
Lines changed: 4 additions & 2 deletions
@@ -238,6 +238,7 @@ mod from_script {
                 Self::ShutdownComplete => target_variant!("ShutdownComplete"),
                 Self::ShowNotification(..) => target_variant!("ShowNotification"),
                 Self::ShowSelectElementMenu(..) => target_variant!("ShowSelectElementMenu"),
+                Self::WebDriverToEmbedder(..) => target_variant!("WebDriverToEmbedder"),
             }
         }
     }
 
@@ -25,8 +25,8 @@ use std::rc::Rc;
 use std::result::Result;
 use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, Ordering};
-use std::thread;
 use std::time::{Duration, Instant, SystemTime};
+use std::{mem, thread};
 
 use background_hang_monitor_api::{
     BackgroundHangMonitor, BackgroundHangMonitorExitSignal, HangAnnotation, MonitoredComponentId,
@@ -335,6 +335,14 @@ pub struct ScriptThread {
     /// The screen coordinates where the primary mouse button was pressed.
     #[no_trace]
     relative_mouse_down_point: Cell<Point2D<f32, DevicePixel>>,
+    #[no_trace]
+    pending_webdriver_script_events: DomRefCell<Vec<WebdriverScriptEvent>>,
+}
+
+struct WebdriverScriptEvent {
+
FF8
    pub pipeline_id: PipelineId,
+    pub msg: WebDriverScriptCommand,
+    pub can_gc: CanGc,
 }
 
 struct BHMExitSignal {
@@ -956,6 +964,7 @@ impl ScriptThread {
             inherited_secure_context: state.inherited_secure_context,
             layout_factory,
             relative_mouse_down_point: Cell::new(Point2D::zero()),
+            pending_webdriver_script_events: Default::default(),
         }
     }
 
@@ -1062,6 +1071,12 @@ impl ScriptThread {
         }
     }
 
+    fn process_pending_script_events(&self) {
+        for event in self.take_pending_webdriver_events().into_iter() {
+            self.process_webdriver_msg(event.pipeline_id, event.msg, event.can_gc);
+        }
+    }
+
     /// Process compositor events as part of a "update the rendering task".
     fn process_pending_input_events(&self, pipeline_id: PipelineId, can_gc: CanGc) {
         let Some(document) = self.documents.borrow().find_document(pipeline_id) else {
@@ -1285,6 +1300,7 @@ impl ScriptThread {
             // https://drafts.csswg.org/css-position-4/#process-top-layer-removals.
         }
 
+        self.process_pending_script_events();
         // Perform a microtask checkpoint as the specifications says that *update the rendering*
         // should be run in a task and a microtask checkpoint is always done when running tasks.
         self.perform_a_microtask_checkpoint(can_gc);
@@ -2082,16 +2098,16 @@ impl ScriptThread {
         }
     }
 
-    fn handle_webdriver_msg(
+    fn take_pending_webdriver_events(&self) -> Vec<WebdriverScriptEvent> {
+        mem::take(&mut *self.pending_webdriver_script_events.borrow_mut())
+    }
+
         &self,
         pipeline_id: PipelineId,
    
FBC8
     msg: WebDriverScriptCommand,
         can_gc: CanGc,
     ) {
-        // https://github.com/servo/servo/issues/23535
-        // These two messages need different treatment since the JS script might mutate
-        // `self.documents`, which would conflict with the immutable borrow of it that
-        // occurs for the rest of the messages
         match msg {
             WebDriverScriptCommand::ExecuteScript(script, reply) => {
                 let window = self.documents.borrow().find_window(pipeline_id);
@@ -2105,6 +2121,39 @@ impl ScriptThread {
             },
             _ => (),
         }
+    }
+
+    fn handle_webdriver_msg(
+        &self,
+        pipeline_id: PipelineId,
+        msg: WebDriverScriptCommand,
+        can_gc: CanGc,
+    ) {
+        // https://github.com/servo/servo/issues/23535
+        // These two messages need different treatment since the JS script might mutate
+        // `self.documents`, which would conflict with the immutable borrow of it that
+        // occurs for the rest of the messages
+        match msg {
+            WebDriverScriptCommand::ExecuteScript(ref _script, ref _reply) => {
+                return self.pending_webdriver_script_events.borrow_mut().push(
+                    WebdriverScriptEvent {
+                        pipeline_id,
+                        msg,
+                        can_gc,
+                    },
+                );
+            },
+            WebDriverScriptCommand::ExecuteAsyncScript(ref _script, ref _reply) => {
+                return self.pending_webdriver_script_events.borrow_mut().push(
+                    WebdriverScriptEvent {
+                        pipeline_id,
+                        msg,
+                        can_gc,
+                    },
+                );
+            },
+            _ => (),
+        }
         let documents = self.documents.borrow();
         match msg {
 
@@ -127,14 +127,6 @@ pub use crate::webview_delegate::{
     SelectElement, WebResourceLoad, WebViewDelegate,
 };
 
-#[cfg(feature = "webdriver")]
-fn webdriver(port: u16, constellation: Sender<EmbedderToConstellationMessage>) {
-    webdriver_server::start_server(port, constellation);
-}
-
-#[cfg(not(feature = "webdriver"))]
-fn webdriver(_port: u16, 
9B9E
_constellation: Sender<EmbedderToConstellationMessage>) {}
-
 #[cfg(feature = "media-gstreamer")]
 mod media_platform {
     #[cfg(any(windows, target_os = "macos"))]
@@ -459,12 +451,6 @@ impl Servo {
             builder.user_content_manager,
         );
 
-        if cfg!(feature = "webdriver") {
-            if let Some(port) = opts.webdriver_port {
-                webdriver(port, constellation_chan.clone());
-            }
-        }
-
         // The compositor coordinates with the client window to create the final
         // rendered page and display it somewhere.
         let shutdown_state = Rc::new(Cell::new(ShutdownState::NotShuttingDown));
@@ -965,8 +951,13 @@ impl Servo {
                         .show_form_control(webview, FormControl::SelectElement(prompt));
                 }
             },
+            EmbedderMsg::WebDriverToEmbedder(_) => {},
         }
     }
+
+    pub fn constellation_sender(&self) -> Sender<EmbedderToConstellationMessage> {
+        self.constellation_proxy.sender()
+    }
 }
 
 fn create_embedder_channel(
 
@@ -372,6 +372,8 @@ pub enum EmbedderMsg {
         DeviceIntRect,
         IpcSender<Option<usize>>,
     ),
+    /// A request from WebDriver server
+    WebDriverToEmbedder(WebDriverCommandMsg),
 }
 
 impl Debug for EmbedderMsg {
 
@@ -7,7 +7,9 @@ use std::time::{Duration, Instant};
 use std::{cmp, thread};
 
 use constellation_traits::EmbedderToConstellationMessage;
-use embedder_traits::{MouseButtonAction, WebDriverCommandMsg, WebDriverScriptCommand};
+use embedder_traits::{
+    EmbedderMsg, MouseButtonAction, WebDriverCommandMsg, WebDriverScriptCommand,
+};
 use ipc_channel::ipc;
 use keyboard_types::webdriver::KeyInputState;
 use webdriver::actions::{
@@ -288,9 +290,9 @@ impl Handler {
             pointer_input_state.x as f32,
             pointer_input_state.y as f32,
         );
-        self.constellation_chan
-            .send(EmbedderToConstellationMessage::WebDriverCommand(cmd_msg))
-            .unwrap();
+
+        self.embedder_proxy
+            .send(EmbedderMsg::WebDriverToEmbedder(cmd_msg));
     }
 
     // https://w3c.github.io/webdriver/#dfn-dispatch-a-pointerup-action
@@ -335,9 +337,9 @@ impl Handler {
             pointer_input_state.x as f32,
             pointer_input_state.y as f32,
         );
-        self.constellation_chan
-            .send(EmbedderToConstellationMessage::WebDriverCommand(cmd_msg))
-            .unwrap();
+
+        self.embedder_proxy
+            .send(EmbedderMsg::WebDriverToEmbedder(cmd_msg));
     }
 
     // https://w3c.github.io/webdriver/#dfn-dispatch-a-pointermove-action
@@ -470,9 +472,8 @@ impl Handler {
                 // Step 7.2
                 let cmd_msg =
                     WebDriverCommandMsg::MouseMoveAction(session.webview_id, x as f32, y as f32);
-                self.constellation_chan
-                    .send(EmbedderToConstellationMessage::WebDriverCommand(cmd_msg))
-                    .unwrap();
+                self.embedder_proxy
+                    .send(EmbedderMsg::WebDriverToEmbedder(cmd_msg));
                 // Step 7.3
                 pointer_input_state.x = x;
                 pointer_input_state.y = y;
 
@@ -23,8 +23,9 @@ use constellation_traits::{EmbedderToConstellationMessage, TraversalDirection};
 use cookie::{CookieBuilder, Expiration};
 use crossbeam_channel::{Receiver, Sender, after, select, unbounded};
 use embedder_traits::{
-    WebDriverCommandMsg, WebDriverCookieError, WebDriverFrameId, WebDriverJSError,
-    WebDriverJSResult, WebDriverJSValue, WebDriverLoadStatus, WebDriverScriptCommand,
+    EmbedderMsg, EmbedderProxy, EventLoopWaker, WebDriverCommandMsg, WebDriverCookieError,
+    WebDriverFrameId, WebDriverJSError, WebDriverJSResult, WebDriverJSValue, WebDriverLoadStatus,
+    WebDriverScriptCommand,
 };
 use euclid::{Rect, Size2D};
 use http::method::Method;
@@ -57,8 +58,8 @@ use webdriver::common::{Cookie, Date, LocatorStrategy, Parameters, WebElement};
 use webdriver::error::{ErrorStatus, WebDriverError, WebDriverResult};
 use webdriver::httpapi::WebDriverExtensionRoute;
 use webdriver::response::{
-    CloseWindowResponse, CookieResponse, CookiesResponse, ElementRectResponse, NewSessionResponse,
-    NewWindowResponse, TimeoutsResponse, ValueResponse, WebDriverResponse, WindowRectResponse,
+    CookieResponse, CookiesResponse, ElementRectResponse, NewSessionResponse, NewWindowResponse,
+    TimeoutsResponse, ValueResponse, WebDriverResponse, WindowRectResponse,
 };
 use webdriver::server::{self, Session, SessionTeardownKind, WebDriverHandler};
 
@@ -100,8 +101,12 @@ fn cookie_msg_to_cookie(cookie: cookie::Cookie) -> Cookie {
     }
 }
 
-pub fn start_server(port: u16, constellation_chan: Sender<EmbedderToConstellationMessage>) {
-    let h
9B9E
andler = Handler::new(constellation_chan);
+pub fn start_server(
+    port: u16,
+    constellation_chan: Sender<EmbedderToConstellationMessage>,
+    embedder_proxy: EmbedderProxy,
+) {
+    let handler = Handler::new(constellation_chan, embedder_proxy);
     thread::Builder::new()
         .name("WebDriverHttpServer".to_owned())
         .spawn(move || {
@@ -120,6 +125,19 @@ pub fn start_server(port: u16, constellation_chan: Sender<EmbedderToConstellatio
         .expect("Thread spawning failed");
 }
 
+pub fn create_embedder_channel(
+    event_loop_waker: Box<dyn EventLoopWaker>,
+) -> (EmbedderProxy, Receiver<EmbedderMsg>) {
+    let (sender, receiver) = unbounded();
+    (
+        EmbedderProxy {
+            sender,
+            event_loop_waker,
+        },
+        receiver,
+    )
+}
+
 /// Represents the current WebDriver session and holds relevant session state.
 pub struct WebDriverSession {
     id: Uuid,
@@ -189,6 +207,7 @@ struct Handler {
     load_status_sender: IpcSender<WebDriverLoadStatus>,
     session: Option<WebDriverSession>,
     constellation_chan: Sender<EmbedderToConstellationMessage>,
+    embedder_proxy: EmbedderProxy,
     resize_timeout: u32,
 }
 
@@ -400,7 +419,10 @@ impl<'de> Visitor<'de> for TupleVecMapVisitor {
 }
 
 impl Handler {
-    pub fn new(constellation_chan: Sender<EmbedderToConstellationMessage>) -> Handler {
+    pub fn new(
+        constellation_chan: Sender<EmbedderToConstellationMessage>,
+        embedder_proxy: EmbedderProxy,
+    ) -> Handler {
         // Create a pair of both an IPC and a threaded channel,
         // keep the IPC sender to clone and pass to the constellation for each load,
         // and keep a threaded receiver to block on an incoming load-status.
@@ -414,6 +436,7 @@ impl Handler {
             load_status_receiver,
             session: None,
             constellation_chan,
+            embedder_proxy,
             resize_timeout: 500,
         }
     }
@@ -623,10 +646,9 @@ impl Handler {
         cmd_msg: WebDriverScriptCommand,
     ) -> WebDriverResult<()> {
         let browsing_context_id = self.session()?.browsing_context_id;
-        let msg = EmbedderToConstellationMessage::WebDriverCommand(
+        self.embedder_proxy.send(EmbedderMsg::WebDriverToEmbedder(
             WebDriverCommandMsg::ScriptCommand(browsing_context_id, cmd_msg),
-        );
-        self.constellation_chan.send(msg).unwrap();
+        ));
         Ok(())
     }
 
@@ -895,14 +917,7 @@ impl Handler {
                 .unwrap();
         }
 
-        Ok(WebDriverResponse::CloseWindow(CloseWindowResponse(
-            self.session()
-                .unwrap()
-                .window_handles
-                .values()
-                .cloned()
-                .collect(),
-        )))
+        self.handle_window_handles()
     }
 
     fn handle_new_window(
 
@@ -37,7 +37,7 @@ ProductName = "Servo"
 [features]
 crown = ["libservo/crown"]
 debugmozjs = ["libservo/debugmozjs"]
-default = ["max_log_level", "webdriver", "webgpu", "webxr"]
+default = ["max_log_level", "webgpu", "webxr"]
 jitspew = ["libservo/jitspew"]
 js_backtrace = ["libservo/js_backtrace"]
 max_log_level = ["log/release_max_level_info"]
@@ -48,13 +48,14 @@ refcell_backtrace = ["libservo/refcell_backtrace"]
 tracing = ["dep:tracing", "dep:tracing-subscriber", "libservo/tracing"]
 tracing-hitrace = ["tracing", "dep:hitrace"]
 tracing-perfetto = ["tracing", "dep:tracing-perfetto"]
-webdriver = ["libservo/webdriver"]
 webgl_backtrace = ["libservo/webgl_backtrace"]
 webgpu = ["libservo/webgpu"]
 webxr = ["libservo/webxr"]
 
 [dependencies]
 cfg-if = { workspace = true }
+constellation_traits = { workspace = true }
+crossbeam-channel = { workspace = true }
 dpi = { workspace = true }
 euclid = { workspace = true }
 getopts = { workspace = true }
@@ -74,6 +75,7 @@ tracing = { workspace = true, optional = true }
 tracing-perfetto = { workspace = true, optional 
5A4B
= true }
 tracing-subscriber = { workspace = true, optional = true, features = ["env-filter"] }
 url = { workspace = true }
+webdriver_server = { path = "../../components/webdriver_server" }
 
 [target.'cfg(target_os = "android")'.dependencies]
 android_logger = "0.15"