libservo: Stop using `script_traits` in the embedding layer (#35185)

Many types used directly in the `libservo` API are in the
`script_traits` crate, which was created to break circular dependencies.
Move all API exposed types to `embedder_traits` which now contains types
exposed via the `libservo` embedding API. Also expose these at the root
of the `libservo` `servo` crate so that the API won't break when they
move around in the future.

The idea with `embedder_traits` in the future is that it contains types
that are available throughout servo because they are used in the
embedding API and thus should have minimal dependencies on other Servo
crates (a bit like `base`).

Signed-off-by: Martin Robinson <mrobinson@igalia.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/components/servo/lib.rs b/components/servo/lib.rs
index c96926d9af0..5f3d45076be 100644
--- a/components/servo/lib.rs
+++ b/components/servo/lib.rs
@@ -54,7 +54,7 @@ use constellation::{
     UnprivilegedContent,
 };
 use crossbeam_channel::{unbounded, Sender};
-use embedder_traits::{EmbedderMsg, EmbedderProxy, EmbedderReceiver, EventLoopWaker};
+pub use embedder_traits::*;
 use env_logger::Builder as EnvLoggerBuilder;
 use euclid::Scale;
 use fonts::SystemFontService;
@@ -71,6 +71,7 @@ pub use gleam::gl;
 use gleam::gl::RENDERER;
 use ipc_channel::ipc::{self, IpcSender};
 use ipc_channel::router::ROUTER;
+pub use keyboard_types::*;
 #[cfg(feature = "layout_2013")]
 pub use layout_thread_2013;
 use log::{error, trace, warn, Log, Metadata, Record};
@@ -107,10 +108,10 @@ use webrender_traits::{
 };
 pub use {
     background_hang_monitor, base, bluetooth, bluetooth_traits, canvas, canvas_traits, compositing,
-    devtools, devtools_traits, embedder_traits, euclid, fonts, ipc_channel, keyboard_types,
-    layout_thread_2020, media, net, net_traits, profile, profile_traits, script,
-    script_layout_interface, script_traits, servo_config as config, servo_config, servo_geometry,
-    servo_url, style, style_traits, webrender_api, webrender_traits,
+    devtools, devtools_traits, euclid, fonts, ipc_channel, layout_thread_2020, media, net,
+    net_traits, profile, profile_traits, script, script_layout_interface, script_traits,
+    servo_config as config, servo_config, servo_geometry, servo_url, style, style_traits,
+    webrender_api, webrender_traits,
 };
 
 use crate::proxies::ConstellationProxy;