servo: android hardware rendering and refactor

examples/servo/Cargo.toml

@@ -34,24 +34,26 @@ winit = "0.30.12"
 spin_on = "0.1.1"
 rustls = "0.23.34"
 euclid = "0.22.11"
-surfman = "0.10.0"
+surfman = "0.11.0"
 time-now = "0.1.2"
 termcolor = "1.4.1"
 thiserror = "2.0.17"
 foreign-types-shared = "0.3.1"
 
-wgpu-hal = "27.0.2"
-wgpu-core = "27.0.1"
+wgpu-hal = "27.0.4"
+wgpu-core = "27.0.3"
 wgpu = { version = "27.0.1", features = ["metal"] }
 
-libservo = { git = "https://github.com/servo/servo", rev = "158bf97e" }
-embedder_traits = { git = "https://github.com/servo/servo", rev = "158bf97e", features = ["baked-default-resources"] }
+libservo = { git = "https://github.com/servo/servo", rev = "39d3fc6c" }
+embedder_traits = { git = "https://github.com/servo/servo", rev = "39d3fc6c", features = ["baked-default-resources"] }
+# not used in code but added for no need to set specific rev whenever run cargo update or freash install and without this its not building
+servo-media = { git = "https://github.com/servo/media", rev = "6c1766f5" }
 
-[target.'cfg(target_os = "linux")'.dependencies]
+[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
 ash = "0.38.0"
 
 [target.'cfg(target_os = "android")'.dependencies]
-slint = { path = "../../api/rs/slint", features = ["backend-android-activity-06"] }
+slint = { path = "../../api/rs/slint", features = ["backend-android-activity-06", "unstable-wgpu-27"] }
 
 [target.'cfg(not(target_os = "android"))'.dependencies]
 slint = { path = "../../api/rs/slint", features = ["unstable-winit-030", "unstable-wgpu-27"] }
@@ -64,10 +66,9 @@ objc2-foundation = "0.3.2"
 objc2-metal = { version = "0.3.2", features = ["MTLDevice", "MTLAllocation", "MTLResource", "MTLTexture", "objc2-io-surface"] }
 
 [build-dependencies]
-slint-build = { path = "../../api/rs/build" }
-
-[target.'cfg(target_os = "linux")'.build-dependencies]
+# need to add to for all host to generate gl_bindings for android
 gl_generator = "0.14.0"
+slint-build = { path = "../../api/rs/build" }
 
 [[package.metadata.android.uses_permission]]
 name = "android.permission.INTERNET"

examples/servo/build.rs

@@ -6,10 +6,8 @@ use std::fs::File;
 use std::io::Write;
 use std::path::Path;
 
-#[cfg(target_os = "linux")]
 use gl_generator::{Api, Fallbacks, Profile, Registry, StructGenerator};
 
-#[cfg(target_os = "linux")]
 extern crate gl_generator;
 
 fn main() {
@@ -18,16 +16,21 @@ fn main() {
     let out = env::var("OUT_DIR").unwrap();
     let out = Path::new(&out);
 
-    #[cfg(target_os = "linux")]
+    let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap();
+
     {
         let mut file = File::create(&out.join("gl_bindings.rs")).unwrap();
 
         // Config copied from https://github.com/YaLTeR/bxt-rs/blob/9f621251b8ce5c2af00b67d2feab731e48d1dae9/build.rs.
 
+        let api = if target_os == "android" { Api::Gles2 } else { Api::Gl };
+        let version = if target_os == "android" { (3, 0) } else { (4, 6) };
+        let profile = if target_os == "android" { Profile::Core } else { Profile::Compatibility };
+
         Registry::new(
-            Api::Gl,
-            (4, 6),
-            Profile::Compatibility,
+            api,
+            version,
+            profile,
             Fallbacks::All,
             [
                 "GL_EXT_memory_object",
@@ -42,10 +45,6 @@ fn main() {
         .unwrap();
     }
 
-    // Note: We can't use `#[cfg(windows)]`, since that would check the host platform
-    // and not the target platform
-    let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap();
-
     // On MacOS, all dylib dependencies are shipped along with the binary
     // in the "/lib" directory. Setting the rpath here, allows the dynamic
     // linker to locate them. See `man dyld` for more info.

examples/servo/src/lib.rs

@@ -3,7 +3,7 @@
 
 pub mod webview;
 
-#[cfg(target_os = "linux")]
+#[cfg(any(target_os = "linux", target_os = "android"))]
 mod gl_bindings {
     #![allow(unsafe_op_in_unsafe_fn)]
 
@@ -12,26 +12,16 @@ mod gl_bindings {
 
 use slint::ComponentHandle;
 
-#[cfg(not(target_os = "android"))]
 use crate::webview::WebView;
 
 slint::include_modules!();
 
 pub fn main() {
-    #[cfg(not(target_os = "android"))]
     let (device, queue) = setup_wgpu();
 
     let app = MyApp::new().expect("Failed to create Slint application - check UI resources");
 
-    #[cfg(not(target_os = "android"))]
-    WebView::new(
-        app.clone_strong(),
-        "https://slint.dev".into(),
-        #[cfg(not(target_os = "android"))]
-        device,
-        #[cfg(not(target_os = "android"))]
-        queue,
-    );
+    WebView::new(app.clone_strong(), "https://slint.dev".into(), device, queue);
 
     app.run().expect("Application failed to run - check for runtime errors");
 }
@@ -43,16 +33,11 @@ pub fn android_main(android_app: slint::android::AndroidApp) {
     main();
 }
 
-#[cfg(not(target_os = "android"))]
 fn setup_wgpu() -> (wgpu::Device, wgpu::Queue) {
     let backends = wgpu::Backends::from_env().unwrap_or_default();
 
-    let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor {
-        backends,
-        flags: Default::default(),
-        backend_options: Default::default(),
-        memory_budget_thresholds: Default::default(),
-    });
+    let instance =
+        wgpu::Instance::new(&wgpu::InstanceDescriptor { backends, ..Default::default() });
 
     let adapter = spin_on::spin_on(async {
         instance

examples/servo/src/webview/adapter.rs

@@ -9,10 +9,9 @@ use smol::channel::{Receiver, Sender};
 
 use slint::ComponentHandle;
 
-#[cfg(not(target_os = "android"))]
 use slint::wgpu_27::wgpu;
 
-use crate::{MyApp, WebviewLogic, webview::rendering_context::ServoRenderingAdapter};
+use crate::{MyApp, WebviewLogic, webview::ServoRenderingAdapter};
 
 /// Upgrades a weak reference to `SlintServoAdapter` to a strong reference.
 ///
@@ -61,18 +60,16 @@ pub struct SlintServoAdapterInner {
     servo: Option<Servo>,
     webview: Option<WebView>,
     rendering_adapter: Option<Rc<Box<dyn ServoRenderingAdapter>>>,
-    #[cfg(not(target_os = "android"))]
     device: wgpu::Device,
-    #[cfg(not(target_os = "android"))]
     queue: wgpu::Queue,
 }
 
 impl SlintServoAdapter {
     pub fn new(
         waker_sender: Sender<()>,
         waker_receiver: Receiver<()>,
-        #[cfg(not(target_os = "android"))] device: wgpu::Device,
-        #[cfg(not(target_os = "android"))] queue: wgpu::Queue,
+        device: wgpu::Device,
+        queue: wgpu::Queue,
     ) -> Self {
         Self {
             waker_sender,
@@ -81,9 +78,7 @@ impl SlintServoAdapter {
                 servo: None,
                 webview: None,
                 rendering_adapter: None,
-                #[cfg(not(target_os = "android"))]
                 device: device,
-                #[cfg(not(target_os = "android"))]
                 queue: queue,
             }),
         }
@@ -105,12 +100,10 @@ impl SlintServoAdapter {
         self.waker_receiver.clone()
     }
 
-    #[cfg(not(target_os = "android"))]
     pub fn wgpu_device(&self) -> wgpu::Device {
         self.inner().device.clone()
     }
 
-    #[cfg(not(target_os = "android"))]
     pub fn wgpu_queue(&self) -> wgpu::Queue {
         self.inner().queue.clone()
     }