Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-27 16:18:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Migrate Android and OHOS ports to the delegate API (#35315)

Browse source 
Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
Co-authored-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Mukilan Thiyagarajan 2025-02-06 19:51:29 +05:30 • committed by GitHub
parent e7a6691628
commit e0689c1f0b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 794 additions and 784 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ports/servoshell/egl/android.rs
View file

@ -18,11 +18,11 @@ use log::{debug, error, info, warn};
use servo::{LoadStatus, MediaSessionActionType};
use simpleservo::{
DeviceIntRect, EventLoopWaker, InitOptions, InputMethodType, MediaSessionPlaybackState,
PromptResult, SERVO,
PromptResult, APP,
};
use super::app_state::{Coordinates, RunningAppState};
use super::host_trait::HostTrait;
use super::servo_glue::{Coordinates, ServoGlue};
struct HostCallbacks {
callbacks: GlobalRef,
@ -44,10 +44,10 @@ pub extern "C" fn android_main() {
fn call<F>(env: &mut JNIEnv, f: F)
where
F: Fn(&mut ServoGlue),
F: Fn(&RunningAppState),
{
SERVO.with(|servo| match servo.borrow_mut().as_mut() {
Some(ref mut servo) => (f)(servo),
APP.with(|app| match app.borrow().as_ref() {
Some(ref app_state) => (f)(app_state),
None => throw(env, "Servo not available in this thread"),
});
}
@ -673,13 +673,6 @@ impl HostTrait for HostCallbacks {
.unwrap();
}
fn on_devtools_started(&self, port: Result<u16, ()>, _token: String) {
match port {
Ok(p) => info!("Devtools Server running on port {}", p),
Err(()) => error!("Error running devtools server"),
}
}
fn show_context_menu(&self, _title: Option<String>, _items: Vec<String>) {}
fn on_panic(&self, _reason: String, _backtrace: Option<String>) {}