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

Do not beautify title in libsimpleservo

Browse source
This commit is contained in:
Paul Rouget 2020-08-10 15:10:15 +02:00
parent 080e9dc6df
commit 0275afdfb4
2 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ports/libsimpleservo/api/src/lib.rs
View file

@ -112,7 +112,7 @@ pub trait HostTrait {
/// Throbber stops spinning. /// Throbber stops spinning.
fn on_load_ended(&self); fn on_load_ended(&self);
/// Page title has changed. /// Page title has changed.
fn on_title_changed(&self, title: String); fn on_title_changed(&self, title: Option<String>);
/// Allow Navigation. /// Allow Navigation.
fn on_allow_navigation(&self, url: String) -> bool; fn on_allow_navigation(&self, url: String) -> bool;
/// Page URL has changed. /// Page URL has changed.
@ -590,16 +590,6 @@ impl ServoGlue {
for (browser_id, event) in self.servo.get_events() { for (browser_id, event) in self.servo.get_events() {
match event { match event {
EmbedderMsg::ChangePageTitle(title) => { EmbedderMsg::ChangePageTitle(title) => {
let fallback_title: String = if let Some(ref current_url) = self.current_url {
current_url.to_string()
} else {
String::from("Untitled")
};
let title = match title {
Some(ref title) if title.len() > 0 => &**title,
_ => &fallback_title,
};
let title = format!("{} - Servo", title);
self.callbacks.host_callbacks.on_title_changed(title); self.callbacks.host_callbacks.on_title_changed(title);
}, },
EmbedderMsg::AllowNavigationRequest(pipeline_id, url) => { EmbedderMsg::AllowNavigationRequest(pipeline_id, url) => {

11
ports/libsimpleservo/capi/src/lib.rs
View file

@ -764,10 +764,15 @@ impl HostTrait for HostCallbacks {
(self.0.on_load_ended)(); (self.0.on_load_ended)();
} }
fn on_title_changed(&self, title: String) { fn on_title_changed(&self, title: Option<String>) {
debug!("on_title_changed"); debug!("on_title_changed");
let title = CString::new(title).expect("Can't create string"); match title {
(self.0.on_title_changed)(title.as_ptr()); None => (self.0.on_title_changed)(std::ptr::null()),
Some(title) => {
let title = CString::new(title).expect("Can't create string");
(self.0.on_title_changed)(title.as_ptr());
},
};
} }
fn on_allow_navigation(&self, url: String) -> bool { fn on_allow_navigation(&self, url: String) -> bool {