diff options
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/servoshell/Cargo.toml | 46 | ||||
| -rw-r--r-- | ports/servoshell/desktop/app.rs | 7 | ||||
| -rw-r--r-- | ports/servoshell/desktop/dialog.rs | 40 | ||||
| -rw-r--r-- | ports/servoshell/desktop/protocols/urlinfo.rs | 4 |
4 files changed, 52 insertions, 45 deletions
diff --git a/ports/servoshell/Cargo.toml b/ports/servoshell/Cargo.toml index a5d3a52aefd..c77ea06fa15 100644 --- a/ports/servoshell/Cargo.toml +++ b/ports/servoshell/Cargo.toml @@ -22,7 +22,7 @@ bench = false # since build-scripts can't detect the cargo target os at build-time, we # must unconditionally add these dependencies. See https://github.com/rust-lang/cargo/issues/4932 [build-dependencies] -# MacOS only +# macOS only cc = "1.2" [target.'cfg(windows)'.build-dependencies] @@ -37,7 +37,7 @@ ProductName = "Servo" [features] crown = ["libservo/crown"] debugmozjs = ["libservo/debugmozjs"] -default = ["max_log_level", "webdriver", "webxr", "webgpu"] +default = ["max_log_level", "webdriver", "webgpu", "webxr"] jitspew = ["libservo/jitspew"] js_backtrace = ["libservo/js_backtrace"] max_log_level = ["log/release_max_level_info"] @@ -50,29 +50,30 @@ tracing-hitrace = ["tracing", "dep:hitrace"] tracing-perfetto = ["tracing", "dep:tracing-perfetto"] webdriver = ["libservo/webdriver"] webgl_backtrace = ["libservo/webgl_backtrace"] -webxr = ["libservo/webxr"] webgpu = ["libservo/webgpu"] +webxr = ["libservo/webxr"] [dependencies] +cfg-if = { workspace = true } dpi = { workspace = true } euclid = { workspace = true } -libc = { workspace = true } -libservo = { path = "../../components/servo", features = ["background_hang_monitor", "bluetooth"] } -cfg-if = { workspace = true } -keyboard-types = { workspace = true } -log = { workspace = true } getopts = { workspace = true } hitrace = { workspace = true, optional = true } +icu_locid = "1.5.0" image = { workspace = true } +keyboard-types = { workspace = true } +libc = { workspace = true } +libservo = { path = "../../components/servo", features = ["background_hang_monitor", "bluetooth"] } +log = { workspace = true } mime_guess = { workspace = true } -url = { workspace = true } raw-window-handle = { workspace = true } rustls = { workspace = true, features = ["aws-lc-rs"] } +servo-tracing = { workspace = true } tokio = { workspace = true } tracing = { workspace = true, optional = true } -tracing-subscriber = { workspace = true, optional = true, features = ["env-filter"] } tracing-perfetto = { workspace = true, optional = true } -icu_locid = "1.5.0" +tracing-subscriber = { workspace = true, optional = true, features = ["env-filter"] } +url = { workspace = true } [target.'cfg(target_os = "android")'.dependencies] android_logger = "0.15" @@ -80,36 +81,34 @@ ipc-channel = { workspace = true } jni = "0.21.1" libloading = "0.8" - [target.'cfg(not(target_os = "android"))'.dependencies] backtrace = { workspace = true } [target.'cfg(target_env = "ohos")'.dependencies] env_filter = "0.1.3" euclid = { workspace = true } +hilog = "0.2.0" # force inprocess, until libc-rs 0.2.156 is released containing # https://github.com/rust-lang/libc/commit/9e248e212c5602cb4e98676e4c21ea0382663a12 ipc-channel = { workspace = true, features = ["force-inprocess"] } -hilog = "0.2.0" napi-derive-ohos = "1.0.4" napi-ohos = "1.0.4" -ohos-vsync = "0.1.3" -ohos-ime = { version = "0.2" } +ohos-ime = "0.2" ohos-ime-sys = "0.1.4" +ohos-vsync = "0.1.3" xcomponent-sys = { version = "0.3.1", features = ["api-12", "keyboard-types"] } [target.'cfg(any(target_os = "android", target_env = "ohos"))'.dependencies] nix = { workspace = true, features = ["fs"] } -surfman = { workspace = true, features = ["sm-angle-default"] } serde_json = { workspace = true } +surfman = { workspace = true, features = ["sm-angle-default"] } [target.'cfg(not(any(target_os = "android", target_env = "ohos")))'.dependencies] -# For optional feature servo_allocator/use-system-allocator -servo_allocator = { path = "../../components/allocator" } dirs = "5.0" -egui = { version = "0.31.1" } -egui_glow = { version = "0.31.1", features = ["winit"] } +egui = "0.31.1" +egui-file-dialog = "0.9.0" egui-winit = { version = "0.31.1", default-features = false, features = ["clipboard", "wayland"] } +egui_glow = { version = "0.31.1", features = ["winit"] } gilrs = "0.11.0" gleam = { workspace = true } glow = "0.16.0" @@ -118,17 +117,18 @@ http = { workspace = true } net = { path = "../../components/net" } net_traits = { workspace = true } serde_json = { workspace = true } +# For optional feature servo_allocator/use-system-allocator +servo_allocator = { path = "../../components/allocator" } shellwords = "1.0.0" -surfman = { workspace = true, features = ["sm-x11", "sm-raw-window-handle-06"] } -egui-file-dialog = "0.9.0" +surfman = { workspace = true, features = ["sm-raw-window-handle-06", "sm-x11"] } winit = "0.30.9" [target.'cfg(any(all(target_os = "linux", not(target_env = "ohos")), target_os = "macos"))'.dependencies] sig = "1.0" [target.'cfg(target_os = "windows")'.dependencies] -windows-sys = { workspace = true, features = ["Win32_Graphics_Gdi"] } libservo = { path = "../../components/servo", features = ["no-wgl"] } +windows-sys = { workspace = true, features = ["Win32_Graphics_Gdi"] } [target.'cfg(target_os = "macos")'.dependencies] objc2-app-kit = { version = "0.2.2", default-features = false, features = [ diff --git a/ports/servoshell/desktop/app.rs b/ports/servoshell/desktop/app.rs index 4dde169fb4b..7bbac47cda3 100644 --- a/ports/servoshell/desktop/app.rs +++ b/ports/servoshell/desktop/app.rs @@ -122,12 +122,13 @@ impl App { } let mut protocol_registry = ProtocolRegistry::default(); - protocol_registry.register( + let _ = protocol_registry.register( "urlinfo", protocols::urlinfo::UrlInfoProtocolHander::default(), ); - protocol_registry.register("servo", protocols::servo::ServoProtocolHandler::default()); - protocol_registry.register( + let _ = + protocol_registry.register("servo", protocols::servo::ServoProtocolHandler::default()); + let _ = protocol_registry.register( "resource", protocols::resource::ResourceProtocolHandler::default(), ); diff --git a/ports/servoshell/desktop/dialog.rs b/ports/servoshell/desktop/dialog.rs index 2bfccb523de..c113682de56 100644 --- a/ports/servoshell/desktop/dialog.rs +++ b/ports/servoshell/desktop/dialog.rs @@ -449,32 +449,34 @@ impl Dialog { let modal = Modal::new("select_element_picker".into()).area(area); modal.show(ctx, |ui| { - for option_or_optgroup in prompt.options() { - match &option_or_optgroup { - SelectElementOptionOrOptgroup::Option(option) => { - display_option( - ui, - option, - &mut selected_option, - &mut is_open, - false, - ); - }, - SelectElementOptionOrOptgroup::Optgroup { label, options } => { - ui.label(egui::RichText::new(label).strong()); - - for option in options { + egui::ScrollArea::vertical().show(ui, |ui| { + for option_or_optgroup in prompt.options() { + match &option_or_optgroup { + SelectElementOptionOrOptgroup::Option(option) => { display_option( ui, option, &mut selected_option, &mut is_open, - true, + false, ); - } - }, + }, + SelectElementOptionOrOptgroup::Optgroup { label, options } => { + ui.label(egui::RichText::new(label).strong()); + + for option in options { + display_option( + ui, + option, + &mut selected_option, + &mut is_open, + true, + ); + } + }, + } } - } + }); }); prompt.select(selected_option); diff --git a/ports/servoshell/desktop/protocols/urlinfo.rs b/ports/servoshell/desktop/protocols/urlinfo.rs index 4408ce47e52..14ad6bdb549 100644 --- a/ports/servoshell/desktop/protocols/urlinfo.rs +++ b/ports/servoshell/desktop/protocols/urlinfo.rs @@ -46,4 +46,8 @@ impl ProtocolHandler for UrlInfoProtocolHander { fn is_fetchable(&self) -> bool { true } + + fn is_secure(&self) -> bool { + true + } } |