mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Do not beautify title in libsimpleservo
This commit is contained in:
parent
080e9dc6df
commit
0275afdfb4
2 changed files with 9 additions and 14 deletions
|
@ -112,7 +112,7 @@ pub trait HostTrait {
|
|||
/// Throbber stops spinning.
|
||||
fn on_load_ended(&self);
|
||||
/// Page title has changed.
|
||||
fn on_title_changed(&self, title: String);
|
||||
fn on_title_changed(&self, title: Option<String>);
|
||||
/// Allow Navigation.
|
||||
fn on_allow_navigation(&self, url: String) -> bool;
|
||||
/// Page URL has changed.
|
||||
|
@ -590,16 +590,6 @@ impl ServoGlue {
|
|||
for (browser_id, event) in self.servo.get_events() {
|
||||
match event {
|
||||
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);
|
||||
},
|
||||
EmbedderMsg::AllowNavigationRequest(pipeline_id, url) => {
|
||||
|
|
|
@ -764,10 +764,15 @@ impl HostTrait for HostCallbacks {
|
|||
(self.0.on_load_ended)();
|
||||
}
|
||||
|
||||
fn on_title_changed(&self, title: String) {
|
||||
fn on_title_changed(&self, title: Option<String>) {
|
||||
debug!("on_title_changed");
|
||||
let title = CString::new(title).expect("Can't create string");
|
||||
(self.0.on_title_changed)(title.as_ptr());
|
||||
match title {
|
||||
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 {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue