aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--components/config/opts.rs7
-rw-r--r--ports/libsimpleservo/src/api.rs32
-rw-r--r--ports/libsimpleservo/src/capi.rs70
-rw-r--r--ports/libsimpleservo/src/jniapi.rs232
-rw-r--r--resources/prefs.json1
-rw-r--r--support/android/apk/servoview/src/main/java/org/mozilla/servoview/JNIServo.java19
-rw-r--r--support/android/apk/servoview/src/main/java/org/mozilla/servoview/Servo.java11
-rw-r--r--support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoSurface.java25
-rw-r--r--support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoView.java25
9 files changed, 270 insertions, 152 deletions
diff --git a/components/config/opts.rs b/components/config/opts.rs
index 293a5f64c10..1f6c6ecad46 100644
--- a/components/config/opts.rs
+++ b/components/config/opts.rs
@@ -968,6 +968,11 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult {
.as_boolean()
.unwrap();
+ let enable_subpixel_text_antialiasing = !debug_options.disable_subpixel_aa && PREFS
+ .get("gfx.subpixel-text-antialiasing.enabled")
+ .as_boolean()
+ .unwrap();
+
let is_printing_version = opt_match.opt_present("v") || opt_match.opt_present("version");
let opts = Opts {
@@ -1003,7 +1008,7 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult {
show_debug_fragment_borders: debug_options.show_fragment_borders,
show_debug_parallel_layout: debug_options.show_parallel_layout,
enable_text_antialiasing: !debug_options.disable_text_aa,
- enable_subpixel_text_antialiasing: !debug_options.disable_subpixel_aa,
+ enable_subpixel_text_antialiasing: enable_subpixel_text_antialiasing,
enable_canvas_antialiasing: !debug_options.disable_canvas_aa,
dump_style_tree: debug_options.dump_style_tree,
dump_rule_tree: debug_options.dump_rule_tree,
diff --git a/ports/libsimpleservo/src/api.rs b/ports/libsimpleservo/src/api.rs
index 924dd4b8afd..d8ed898cc53 100644
--- a/ports/libsimpleservo/src/api.rs
+++ b/ports/libsimpleservo/src/api.rs
@@ -11,7 +11,7 @@ use servo::euclid::{Length, TypedPoint2D, TypedScale, TypedSize2D, TypedVector2D
use servo::msg::constellation_msg::TraversalDirection;
use servo::script_traits::{MouseButton, TouchEventType};
use servo::servo_config::opts;
-use servo::servo_config::prefs::PREFS;
+use servo::servo_config::prefs::{PrefValue, PREFS};
use servo::servo_url::ServoUrl;
use servo::style_traits::DevicePixel;
use std::cell::{Cell, RefCell};
@@ -28,6 +28,15 @@ thread_local! {
/// and that perform_updates need to be called
pub use servo::embedder_traits::EventLoopWaker;
+pub struct InitOptions {
+ pub args: Option<String>,
+ pub url: Option<String>,
+ pub width: u32,
+ pub height: u32,
+ pub density: f32,
+ pub enable_subpixel_text_antialiasing: bool,
+}
+
/// Delegate resource file reading to the embedder.
pub trait ReadFileTrait {
fn readfile(&self, file: &str) -> Vec<u8>;
@@ -93,28 +102,27 @@ pub fn servo_version() -> String {
/// Initialize Servo. At that point, we need a valid GL context.
/// In the future, this will be done in multiple steps.
pub fn init(
+ init_opts: InitOptions,
gl: Rc<gl::Gl>,
- argsline: String,
- embedder_url: Option<String>,
waker: Box<EventLoopWaker>,
readfile: Box<ReadFileTrait + Send + Sync>,
callbacks: Box<HostTrait>,
- width: u32,
- height: u32,
- density: f32,
) -> Result<(), &'static str> {
resources::set(Box::new(ResourceReader(readfile)));
- if !argsline.is_empty() {
- let mut args: Vec<String> = serde_json::from_str(&argsline).map_err(|_| {
+ if let Some(args) = init_opts.args {
+ let mut args: Vec<String> = serde_json::from_str(&args).map_err(|_| {
"Invalid arguments. Servo arguments must be formatted as a JSON array"
})?;
// opts::from_cmdline_args expects the first argument to be the binary name.
args.insert(0, "servo".to_string());
+
+ let pref = PrefValue::Boolean(init_opts.enable_subpixel_text_antialiasing);
+ PREFS.set("gfx.subpixel-text-antialiasing.enabled", pref);
opts::from_cmdline_args(&args);
}
- let embedder_url = embedder_url.as_ref().and_then(|s| {
+ let embedder_url = init_opts.url.as_ref().and_then(|s| {
ServoUrl::parse(s).ok()
});
let cmdline_url = opts::get().url.clone();
@@ -135,9 +143,9 @@ pub fn init(
let callbacks = Rc::new(ServoCallbacks {
gl: gl.clone(),
host_callbacks: callbacks,
- width: Cell::new(width),
- height: Cell::new(height),
- density,
+ width: Cell::new(init_opts.width),
+ height: Cell::new(init_opts.height),
+ density: init_opts.density,
waker,
});
diff --git a/ports/libsimpleservo/src/capi.rs b/ports/libsimpleservo/src/capi.rs
index 6c6ae9a489f..28c036cff56 100644
--- a/ports/libsimpleservo/src/capi.rs
+++ b/ports/libsimpleservo/src/capi.rs
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-use api::{self, EventLoopWaker, ServoGlue, SERVO, HostTrait, ReadFileTrait};
+use api::{self, EventLoopWaker, InitOptions, ServoGlue, SERVO, HostTrait, ReadFileTrait};
use gl_glue;
use servo::gl;
use std::ffi::{CStr, CString};
@@ -37,6 +37,17 @@ pub struct CHostCallbacks {
pub on_animating_changed: extern fn(animating: bool),
}
+/// Servo options
+#[repr(C)]
+pub struct CInitOptions {
+ pub args: *const c_char,
+ pub url: *const c_char,
+ pub width: u32,
+ pub height: u32,
+ pub density: f32,
+ pub enable_subpixel_text_antialiasing: bool,
+}
+
/// The returned string is not freed. This will leak.
#[no_mangle]
pub extern "C" fn servo_version() -> *const c_char {
@@ -48,66 +59,53 @@ pub extern "C" fn servo_version() -> *const c_char {
}
fn init(
+ opts: CInitOptions,
gl: Rc<gl::Gl>,
- args: *const c_char,
- url: *const c_char,
wakeup: extern fn(),
readfile: extern fn(*const c_char) -> *const c_char,
- callbacks: CHostCallbacks,
- width: u32,
- height: u32,
- density: f32) {
- let args = unsafe { CStr::from_ptr(args) };
- let args = args.to_str().expect("Can't read string").to_string();
+ callbacks: CHostCallbacks) {
+ let args = unsafe { CStr::from_ptr(opts.args) };
+ let args = args.to_str().map(|s| s.to_string()).ok();
- let url = unsafe { CStr::from_ptr(url) };
- let url = url.to_str().map(|s| s.to_string());
+ let url = unsafe { CStr::from_ptr(opts.url) };
+ let url = url.to_str().map(|s| s.to_string()).ok();
+
+ let opts = InitOptions {
+ args,
+ url,
+ width: opts.width,
+ height: opts.height,
+ density: opts.density,
+ enable_subpixel_text_antialiasing: opts.enable_subpixel_text_antialiasing,
+ };
let wakeup = Box::new(WakeupCallback::new(wakeup));
let readfile = Box::new(ReadFileCallback::new(readfile));
let callbacks = Box::new(HostCallbacks::new(callbacks));
- api::init(
- gl,
- args,
- url.ok(),
- wakeup,
- readfile,
- callbacks,
- width,
- height,
- density,
- ).unwrap();
+ api::init(opts, gl, wakeup, readfile, callbacks).unwrap();
}
#[cfg(target_os = "windows")]
#[no_mangle]
pub extern "C" fn init_with_egl(
- args: *const c_char,
- url: *const c_char,
+ opts: CInitOptions,
wakeup: extern fn(),
readfile: extern fn(*const c_char) -> *const c_char,
- callbacks: CHostCallbacks,
- width: u32,
- height: u32,
- density: f32) {
+ callbacks: CHostCallbacks) {
let gl = gl_glue::egl::init().unwrap();
- init(gl, args, url, wakeup, readfile, callbacks, width, height, density)
+ init(opts, gl, wakeup, readfile, callbacks)
}
#[cfg(any(target_os = "linux", target_os = "windows", target_os = "macos"))]
#[no_mangle]
pub extern "C" fn init_with_gl(
- args: *const c_char,
- url: *const c_char,
+ opts: CInitOptions,
wakeup: extern fn(),
readfile: extern fn(*const c_char) -> *const c_char,
- callbacks: CHostCallbacks,
- width: u32,
- height: u32,
- density: f32) {
+ callbacks: CHostCallbacks) {
let gl = gl_glue::gl::init().unwrap();
- init(gl, args, url, wakeup, readfile, callbacks, width, height, density)
+ init(opts, gl, wakeup, readfile, callbacks)
}
#[no_mangle]
diff --git a/ports/libsimpleservo/src/jniapi.rs b/ports/libsimpleservo/src/jniapi.rs
index 9470f8c59c2..f4633429f11 100644
--- a/ports/libsimpleservo/src/jniapi.rs
+++ b/ports/libsimpleservo/src/jniapi.rs
@@ -5,15 +5,14 @@
#![allow(non_snake_case)]
use android_logger::{self, Filter};
-use api::{self, EventLoopWaker, ServoGlue, SERVO, HostTrait, ReadFileTrait};
+use api::{self, EventLoopWaker, InitOptions, ServoGlue, SERVO, HostTrait, ReadFileTrait};
use gl_glue;
-use jni::{JNIEnv, JavaVM};
+use jni::{errors, JNIEnv, JavaVM};
use jni::objects::{GlobalRef, JClass, JObject, JString, JValue};
use jni::sys::{jboolean, jfloat, jint, jstring, JNI_TRUE};
use libc::{pipe, dup2, read};
use log::Level;
use std;
-use std::borrow::Cow;
use std::os::raw::{c_char, c_int, c_void};
use std::sync::{Arc, Mutex};
use std::thread;
@@ -23,17 +22,16 @@ struct HostCallbacks {
jvm: JavaVM,
}
-fn call<F>(env: JNIEnv, f: F)
+fn call<F>(env: &JNIEnv, f: F)
where
- F: Fn(&mut ServoGlue) -> Result<(), &'static str>,
+ F: Fn(&mut ServoGlue) -> Result<(), &str>,
{
SERVO.with(|s| {
if let Err(error) = match s.borrow_mut().as_mut() {
Some(ref mut s) => (f)(s),
None => Err("Servo not available in this thread"),
} {
- env.throw(("java/lang/Exception", error))
- .expect("Error while throwing");
+ throw(env, error);
}
});
}
@@ -41,8 +39,7 @@ where
#[no_mangle]
pub fn Java_org_mozilla_servoview_JNIServo_version(env: JNIEnv, _class: JClass) -> jstring {
let v = api::servo_version();
- let output = env.new_string(v).expect("Couldn't create java string");
- output.into_inner()
+ new_string(&env, &v).unwrap_or_else(|null| null)
}
#[no_mangle]
@@ -50,16 +47,18 @@ pub fn Java_org_mozilla_servoview_JNIServo_init(
env: JNIEnv,
_: JClass,
activity: JObject,
- args: JString,
- url: JString,
- log_str: JString,
+ opts: JObject,
callbacks_obj: JObject,
- width: jint,
- height: jint,
- density: jfloat,
- log: jboolean,
) {
- if log == JNI_TRUE {
+ let (opts, log, log_str) = match get_options(&env, opts) {
+ Ok((opts, log, log_str)) => (opts, log, log_str),
+ Err(err) => {
+ throw(&env, &err);
+ return;
+ }
+ };
+
+ if log {
// Note: Android debug logs are stripped from a release build.
// debug!() will only show in a debug build. Use info!() if logs
// should show up in adb logcat with a release build.
@@ -76,10 +75,10 @@ pub fn Java_org_mozilla_servoview_JNIServo_init(
for &module in &filters {
filter = filter.with_allowed_module_path(module);
}
- let log_str = env.get_string(log_str).ok();
- let log_str = log_str.as_ref().map_or(Cow::Borrowed(""), |s| s.to_string_lossy());
- for module in log_str.split(',') {
- filter = filter.with_allowed_module_path(module);
+ if let Some(log_str) = log_str {
+ for module in log_str.split(',') {
+ filter = filter.with_allowed_module_path(module);
+ }
}
android_logger::init_once(filter, Some("simpleservo"));
}
@@ -89,36 +88,23 @@ pub fn Java_org_mozilla_servoview_JNIServo_init(
initialize_android_glue(&env, activity);
redirect_stdout_to_logcat();
- let args = env.get_string(args)
- .expect("Couldn't get java string")
- .into();
-
- let url = if url.is_null() {
- None
- } else {
- Some(env.get_string(url).expect("Couldn't get java string").into())
+ let callbacks_ref = match env.new_global_ref(callbacks_obj) {
+ Ok(r) => r,
+ Err(_) => {
+ throw(&env, "Failed to get global reference of callback argument");
+ return;
+ }
};
- let callbacks_ref = env.new_global_ref(callbacks_obj).unwrap();
-
let wakeup = Box::new(WakeupCallback::new(callbacks_ref.clone(), &env));
let readfile = Box::new(ReadFileCallback::new(callbacks_ref.clone(), &env));
let callbacks = Box::new(HostCallbacks::new(callbacks_ref, &env));
- gl_glue::egl::init().and_then(|gl| {
- api::init(
- gl,
- args,
- url,
- wakeup,
- readfile,
- callbacks,
- width as u32,
- height as u32,
- density as f32)
- }).or_else(|err| {
- env.throw(("java/lang/Exception", err))
- }).unwrap();
+ if let Err(err) =
+ gl_glue::egl::init().and_then(|gl| api::init(opts, gl, wakeup, readfile, callbacks))
+ {
+ throw(&env, err)
+ };
}
#[no_mangle]
@@ -128,7 +114,7 @@ pub fn Java_org_mozilla_servoview_JNIServo_setBatchMode(
batch: jboolean,
) {
debug!("setBatchMode");
- call(env, |s| s.set_batch_mode(batch == JNI_TRUE));
+ call(&env, |s| s.set_batch_mode(batch == JNI_TRUE));
}
#[no_mangle]
@@ -139,50 +125,57 @@ pub fn Java_org_mozilla_servoview_JNIServo_resize(
height: jint,
) {
debug!("resize {}/{}", width, height);
- call(env, |s| s.resize(width as u32, height as u32));
+ call(&env, |s| s.resize(width as u32, height as u32));
}
#[no_mangle]
pub fn Java_org_mozilla_servoview_JNIServo_performUpdates(env: JNIEnv, _class: JClass) {
debug!("performUpdates");
- call(env, |s| s.perform_updates());
+ call(&env, |s| s.perform_updates());
}
#[no_mangle]
pub fn Java_org_mozilla_servoview_JNIServo_loadUri(env: JNIEnv, _class: JClass, url: JString) {
debug!("loadUri");
- let url: String = env.get_string(url).unwrap().into();
- call(env, |s| s.load_uri(&url));
+ match env.get_string(url) {
+ Ok(url) => {
+ let url: String = url.into();
+ call(&env, |s| s.load_uri(&url));
+ },
+ Err(_) => {
+ throw(&env, "Failed to convert Java string");
+ }
+ };
}
#[no_mangle]
pub fn Java_org_mozilla_servoview_JNIServo_reload(env: JNIEnv, _class: JClass) {
debug!("reload");
- call(env, |s| s.reload());
+ call(&env, |s| s.reload());
}
#[no_mangle]
pub fn Java_org_mozilla_servoview_JNIServo_stop(env: JNIEnv, _class: JClass) {
debug!("stop");
- call(env, |s| s.stop());
+ call(&env, |s| s.stop());
}
#[no_mangle]
pub fn Java_org_mozilla_servoview_JNIServo_refresh(env: JNIEnv, _class: JClass) {
debug!("refresh");
- call(env, |s| s.refresh());
+ call(&env, |s| s.refresh());
}
#[no_mangle]
pub fn Java_org_mozilla_servoview_JNIServo_goBack(env: JNIEnv, _class: JClass) {
debug!("goBack");
- call(env, |s| s.go_back());
+ call(&env, |s| s.go_back());
}
#[no_mangle]
pub fn Java_org_mozilla_servoview_JNIServo_goForward(env: JNIEnv, _class: JClass) {
debug!("goForward");
- call(env, |s| s.go_forward());
+ call(&env, |s| s.go_forward());
}
#[no_mangle]
@@ -195,7 +188,7 @@ pub fn Java_org_mozilla_servoview_JNIServo_scrollStart(
y: jint,
) {
debug!("scrollStart");
- call(env, |s| s.scroll_start(dx as i32, dy as i32, x as u32, y as u32));
+ call(&env, |s| s.scroll_start(dx as i32, dy as i32, x as u32, y as u32));
}
#[no_mangle]
@@ -208,7 +201,7 @@ pub fn Java_org_mozilla_servoview_JNIServo_scrollEnd(
y: jint,
) {
debug!("scrollEnd");
- call(env, |s| s.scroll_end(dx as i32, dy as i32, x as u32, y as u32));
+ call(&env, |s| s.scroll_end(dx as i32, dy as i32, x as u32, y as u32));
}
@@ -222,7 +215,7 @@ pub fn Java_org_mozilla_servoview_JNIServo_scroll(
y: jint,
) {
debug!("scroll");
- call(env, |s| s.scroll(dx as i32, dy as i32, x as u32, y as u32));
+ call(&env, |s| s.scroll(dx as i32, dy as i32, x as u32, y as u32));
}
#[no_mangle]
@@ -234,7 +227,7 @@ pub fn Java_org_mozilla_servoview_JNIServo_pinchZoomStart(
y: jint,
) {
debug!("pinchZoomStart");
- call(env, |s| s.pinchzoom_start(factor as f32, x as u32, y as u32));
+ call(&env, |s| s.pinchzoom_start(factor as f32, x as u32, y as u32));
}
#[no_mangle]
@@ -246,7 +239,7 @@ pub fn Java_org_mozilla_servoview_JNIServo_pinchZoom(
y: jint,
) {
debug!("pinchZoom");
- call(env, |s| s.pinchzoom(factor as f32, x as u32, y as u32));
+ call(&env, |s| s.pinchzoom(factor as f32, x as u32, y as u32));
}
#[no_mangle]
@@ -258,14 +251,14 @@ pub fn Java_org_mozilla_servoview_JNIServo_pinchZoomEnd(
y: jint,
) {
debug!("pinchZoomEnd");
- call(env, |s| s.pinchzoom_end(factor as f32, x as u32, y as u32));
+ call(&env, |s| s.pinchzoom_end(factor as f32, x as u32, y as u32));
}
#[no_mangle]
pub fn Java_org_mozilla_servoview_JNIServo_click(env: JNIEnv, _: JClass, x: jint, y: jint) {
debug!("click");
- call(env, |s| s.click(x as u32, y as u32));
+ call(&env, |s| s.click(x as u32, y as u32));
}
pub struct WakeupCallback {
@@ -312,9 +305,10 @@ impl ReadFileTrait for ReadFileCallback {
fn readfile(&self, file: &str) -> Vec<u8> {
// FIXME: we'd rather use attach_current_thread but it detaches the VM too early.
let env = self.jvm.attach_current_thread_as_daemon().unwrap();
- let s = env.new_string(&file)
- .expect("Couldn't create java string")
- .into_inner();
+ let s = match new_string(&env, &file) {
+ Ok(s) => s,
+ Err(_) => return vec![],
+ };
let s = JValue::from(JObject::from(s));
let array = env.call_method(
self.callback.lock().unwrap().as_obj(),
@@ -366,9 +360,10 @@ impl HostTrait for HostCallbacks {
fn on_title_changed(&self, title: String) {
debug!("on_title_changed");
let env = self.jvm.get_env().unwrap();
- let s = env.new_string(&title)
- .expect("Couldn't create java string")
- .into_inner();
+ let s = match new_string(&env, &title) {
+ Ok(s) => s,
+ Err(_) => return,
+ };
let s = JValue::from(JObject::from(s));
env.call_method(
self.callbacks.as_obj(),
@@ -381,9 +376,10 @@ impl HostTrait for HostCallbacks {
fn on_url_changed(&self, url: String) {
debug!("on_url_changed");
let env = self.jvm.get_env().unwrap();
- let s = env.new_string(&url)
- .expect("Couldn't create java string")
- .into_inner();
+ let s = match new_string(&env, &url) {
+ Ok(s) => s,
+ Err(_) => return,
+ };
let s = JValue::Object(JObject::from(s));
env.call_method(
self.callbacks.as_obj(),
@@ -520,3 +516,97 @@ fn redirect_stdout_to_logcat() {
}
});
}
+
+fn throw(env: &JNIEnv, err: &str) {
+ if let Err(e) = env.throw(("java/lang/Exception", err)) {
+ warn!("Failed to throw Java exception: `{}`. Exception was: `{}`", e, err);
+ }
+}
+
+fn new_string(env: &JNIEnv, s: &str) -> Result<jstring, jstring> {
+ match env.new_string(s) {
+ Ok(s) => Ok(s.into_inner()),
+ Err(_) => {
+ throw(&env, "Couldn't create java string");
+ Err(JObject::null().into_inner())
+ },
+ }
+}
+
+fn get_field<'a>(
+ env: &'a JNIEnv,
+ obj: JObject,
+ field: &str,
+ type_: &str,
+) -> Result<Option<JValue<'a>>, String> {
+ if env.get_field_id(obj, field, type_).is_err() {
+ return Err(format!("Can't find `{}` field", &field));
+ }
+ env.get_field(obj, field, type_)
+ .map(|value| Some(value))
+ .or_else(|e| match *e.kind() {
+ errors::ErrorKind::NullPtr(_) => Ok(None),
+ _ => Err(format!(
+ "Can't find `{}` field: {}",
+ &field,
+ e.description()
+ )),
+ })
+}
+
+fn get_non_null_field<'a>(
+ env: &'a JNIEnv,
+ obj: JObject,
+ field: &str,
+ type_: &str,
+) -> Result<JValue<'a>, String> {
+ match get_field(env, obj, field, type_)? {
+ None => Err(format!("Field {} is null", field)),
+ Some(f) => Ok(f),
+ }
+}
+
+fn get_string(env: &JNIEnv, obj: JObject, field: &str) -> Result<Option<String>, String> {
+ let value = get_field(env, obj, field, "Ljava/lang/String;")?;
+ match value {
+ Some(value) => {
+ let string = value
+ .l()
+ .map_err(|_| format!("field `{}` is not an Object", field))?
+ .into();
+ Ok(env.get_string(string).map(|s| s.into()).ok())
+ },
+ None => Ok(None),
+ }
+}
+
+fn get_options(env: &JNIEnv, opts: JObject) -> Result<(InitOptions, bool, Option<String>), String> {
+ let args = get_string(env, opts, "args")?;
+ let url = get_string(env, opts, "url")?;
+ let log_str = get_string(env, opts, "logStr")?;
+ let width = get_non_null_field(env, opts, "width", "I")?
+ .i()
+ .map_err(|_| "width not an int")? as u32;
+ let height = get_non_null_field(env, opts, "height", "I")?
+ .i()
+ .map_err(|_| "height not an int")? as u32;
+ let density = get_non_null_field(env, opts, "density", "F")?
+ .f()
+ .map_err(|_| "densitiy not a float")? as f32;
+ let log = get_non_null_field(env, opts, "enableLogs", "Z")?
+ .z()
+ .map_err(|_| "enableLogs not a boolean")?;
+ let enable_subpixel_text_antialiasing =
+ get_non_null_field(env, opts, "enableSubpixelTextAntialiasing", "Z")?
+ .z()
+ .map_err(|_| "enableSubpixelTextAntialiasing not a boolean")?;
+ let opts = InitOptions {
+ args,
+ url,
+ width,
+ height,
+ density,
+ enable_subpixel_text_antialiasing,
+ };
+ Ok((opts, log, log_str))
+}
diff --git a/resources/prefs.json b/resources/prefs.json
index 375fd7ee9ee..ecdad8c9ba7 100644
--- a/resources/prefs.json
+++ b/resources/prefs.json
@@ -19,6 +19,7 @@
"dom.webgl2.enabled": false,
"dom.webvr.enabled": false,
"dom.webvr.event_polling_interval": 500,
+ "gfx.subpixel-text-antialiasing.enabled": true,
"js.asmjs.enabled": true,
"js.asyncstack.enabled": false,
"js.baseline.enabled": true,
diff --git a/support/android/apk/servoview/src/main/java/org/mozilla/servoview/JNIServo.java b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/JNIServo.java
index a48085ea628..004b91888a5 100644
--- a/support/android/apk/servoview/src/main/java/org/mozilla/servoview/JNIServo.java
+++ b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/JNIServo.java
@@ -20,13 +20,7 @@ public class JNIServo {
public native String version();
- public native void init(Activity activity,
- String args,
- String url,
- String logstr,
- Callbacks callbacks,
- int width, int height, float density,
- boolean log);
+ public native void init(Activity activity, ServoOptions options, Callbacks callbacks);
public native void setBatchMode(boolean mode);
@@ -60,6 +54,17 @@ public class JNIServo {
public native void click(int x, int y);
+ public static class ServoOptions {
+ public String args;
+ public String url;
+ public int width = 0;
+ public int height = 0;
+ public float density = 1;
+ public boolean enableSubpixelTextAntialiasing = true;
+ public String logStr;
+ public boolean enableLogs = false;
+ }
+
public interface Callbacks {
void wakeup();
diff --git a/support/android/apk/servoview/src/main/java/org/mozilla/servoview/Servo.java b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/Servo.java
index a4b3f6b651f..2f708552218 100644
--- a/support/android/apk/servoview/src/main/java/org/mozilla/servoview/Servo.java
+++ b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/Servo.java
@@ -14,6 +14,7 @@ import java.io.IOException;
import java.io.InputStream;
import org.freedesktop.gstreamer.GStreamer;
+import org.mozilla.servoview.JNIServo.ServoOptions;
public class Servo {
private static final String LOGTAG = "Servo";
@@ -23,15 +24,11 @@ public class Servo {
private boolean mSuspended;
public Servo(
+ ServoOptions options,
RunCallback runCallback,
GfxCallbacks gfxcb,
Client client,
- Activity activity,
- String args,
- String url,
- String logstr,
- int width, int height,
- float density, boolean log) {
+ Activity activity) {
mRunCallback = runCallback;
@@ -40,7 +37,7 @@ public class Servo {
Callbacks cbs = new Callbacks(client, gfxcb);
mRunCallback.inGLThread(() -> {
- mJNI.init(activity, args, url, logstr, cbs, width, height, density, log);
+ mJNI.init(activity, options, cbs);
});
try {
diff --git a/support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoSurface.java b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoSurface.java
index 95e55e58131..84dab5500ca 100644
--- a/support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoSurface.java
+++ b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoSurface.java
@@ -20,6 +20,7 @@ import android.os.Message;
import android.util.Log;
import android.view.Surface;
+import org.mozilla.servoview.JNIServo.ServoOptions;
import org.mozilla.servoview.Servo.Client;
import org.mozilla.servoview.Servo.GfxCallbacks;
import org.mozilla.servoview.Servo.RunCallback;
@@ -37,9 +38,9 @@ public class ServoSurface {
private int mHeight;
private Servo mServo;
private Client mClient = null;
- private String mServoArgs = "";
- private String mServoLog = "";
- private String mInitialUri = null;
+ private String mServoArgs;
+ private String mServoLog;
+ private String mInitialUri;
private Activity mActivity;
public ServoSurface(Surface surface, int width, int height) {
@@ -55,8 +56,8 @@ public class ServoSurface {
}
public void setServoArgs(String args, String log) {
- mServoArgs = args != null ? args : "";
- mServoLog = log != null ? log : "";
+ mServoArgs = args;
+ mServoLog = log;
}
public void setActivity(Activity activity) {
@@ -204,9 +205,17 @@ public class ServoSurface {
};
inUIThread(() -> {
- final boolean showLogs = true;
- String uri = mInitialUri == null ? null : mInitialUri;
- mServo = new Servo(this, surface, mClient, mActivity, mServoArgs, uri, mServoLog, mWidth, mHeight, 1, showLogs);
+ ServoOptions options = new ServoOptions();
+ options.args = mServoArgs;
+ options.width = mWidth;
+ options.height = mHeight;
+ options.density = 1;
+ options.url = mInitialUri == null ? null : mInitialUri;
+ options.logStr = mServoLog;
+ options.enableLogs = true;
+ options.enableSubpixelTextAntialiasing = false;
+
+ mServo = new Servo(options, this, surface, mClient, mActivity);
});
Looper.loop();
diff --git a/support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoView.java b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoView.java
index 8a3a82bba5d..4bb05cfa2cb 100644
--- a/support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoView.java
+++ b/support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoView.java
@@ -19,6 +19,7 @@ import android.view.MotionEvent;
import android.view.ScaleGestureDetector;
import android.widget.OverScroller;
+import org.mozilla.servoview.JNIServo.ServoOptions;
import org.mozilla.servoview.Servo.Client;
import org.mozilla.servoview.Servo.GfxCallbacks;
import org.mozilla.servoview.Servo.RunCallback;
@@ -41,8 +42,8 @@ public class ServoView extends GLSurfaceView
private Client mClient = null;
private Uri mInitialUri = null;
private boolean mAnimating;
- private String mServoArgs = "";
- private String mServoLog = "";
+ private String mServoArgs;
+ private String mServoLog;
private GestureDetector mGestureDetector;
private ScaleGestureDetector mScaleGestureDetector;
@@ -75,8 +76,8 @@ public class ServoView extends GLSurfaceView
}
public void setServoArgs(String args, String log) {
- mServoArgs = args != null ? args : "";
- mServoLog = log != null ? log : "";
+ mServoArgs = args;
+ mServoLog = log;
}
public void reload() {
@@ -135,16 +136,20 @@ public class ServoView extends GLSurfaceView
}
public void onGLReady() {
- final boolean showLogs = true;
- int width = getWidth();
- int height = getHeight();
+ ServoOptions options = new ServoOptions();
+ options.args = mServoArgs;
+ options.width = getWidth();
+ options.height = getHeight();
+ options.enableLogs = true;
+ options.enableSubpixelTextAntialiasing = true;
DisplayMetrics metrics = new DisplayMetrics();
mActivity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
- float density = metrics.density;
-
+ options.density = metrics.density;
inGLThread(() -> {
String uri = mInitialUri == null ? null : mInitialUri.toString();
- mServo = new Servo(this, this, mClient, mActivity, mServoArgs, uri, mServoLog, width, height, density, showLogs);
+ options.url = uri;
+ options.logStr = mServoLog;
+ mServo = new Servo(options, this, this, mClient, mActivity);
});
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-12 08:23:08 +0000