Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #4585 : Ms2ger/servo/NavigatorInfo, r=jdm

Browse source 
It serves no purpose.
This commit is contained in:
bors-servo 2015-01-09 07:48:49 -07:00
commit 6b3c05cdd2
3 changed files with 33 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/script/dom/navigator.rs
View file

@ -7,7 +7,7 @@ use dom::bindings::codegen::Bindings::NavigatorBinding::NavigatorMethods;
use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JSRef, Temporary};
use dom::bindings::utils::{Reflector, reflect_dom_object};
use dom::navigatorinfo::NavigatorInfo;
use dom::navigatorinfo;
use dom::window::Window;
use servo_util::str::DOMString;
@ -32,27 +32,27 @@ impl Navigator {
impl<'a> NavigatorMethods for JSRef<'a, Navigator> {
fn Product(self) -> DOMString {
NavigatorInfo::Product()
navigatorinfo::Product()
}
fn TaintEnabled(self) -> bool {
NavigatorInfo::TaintEnabled()
navigatorinfo::TaintEnabled()
}
fn AppName(self) -> DOMString {
NavigatorInfo::AppName()
navigatorinfo::AppName()
}
fn AppCodeName(self) -> DOMString {
NavigatorInfo::AppCodeName()
navigatorinfo::AppCodeName()
}
fn Platform(self) -> DOMString {
NavigatorInfo::Platform()
navigatorinfo::Platform()
}
fn UserAgent(self) -> DOMString {
NavigatorInfo::UserAgent()
navigatorinfo::UserAgent()
}
}

42
components/script/dom/navigatorinfo.rs
View file

@ -5,33 +5,29 @@
use servo_util::str::DOMString;
use servo_util::opts;
pub struct NavigatorInfo;
pub fn Product() -> DOMString {
"Gecko".into_string()
}
impl NavigatorInfo {
pub fn Product() -> DOMString {
"Gecko".into_string()
}
pub fn TaintEnabled() -> bool {
false
}
pub fn TaintEnabled() -> bool {
false
}
pub fn AppName() -> DOMString {
"Netscape".into_string() // Like Gecko/Webkit
}
pub fn AppName() -> DOMString {
"Netscape".into_string() // Like Gecko/Webkit
}
pub fn AppCodeName() -> DOMString {
"Mozilla".into_string()
}
pub fn AppCodeName() -> DOMString {
"Mozilla".into_string()
}
pub fn Platform() -> DOMString {
"".into_string()
}
pub fn Platform() -> DOMString {
"".into_string()
}
pub fn UserAgent() -> DOMString {
match opts::get().user_agent {
Some(ref user_agent) => user_agent.clone(),
None => "".into_string(),
}
pub fn UserAgent() -> DOMString {
match opts::get().user_agent {
Some(ref user_agent) => user_agent.clone(),
None => "".into_string(),
}
}

14
components/script/dom/workernavigator.rs
View file

@ -7,7 +7,7 @@ use dom::bindings::codegen::Bindings::WorkerNavigatorBinding::WorkerNavigatorMet
use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JSRef, Temporary};
use dom::bindings::utils::{Reflector, reflect_dom_object};
use dom::navigatorinfo::NavigatorInfo;
use dom::navigatorinfo;
use dom::workerglobalscope::WorkerGlobalScope;
use servo_util::str::DOMString;
@ -32,27 +32,27 @@ impl WorkerNavigator {
impl<'a> WorkerNavigatorMethods for JSRef<'a, WorkerNavigator> {
fn Product(self) -> DOMString {
NavigatorInfo::Product()
navigatorinfo::Product()
}
fn TaintEnabled(self) -> bool {
NavigatorInfo::TaintEnabled()
navigatorinfo::TaintEnabled()
}
fn AppName(self) -> DOMString {
NavigatorInfo::AppName()
navigatorinfo::AppName()
}
fn AppCodeName(self) -> DOMString {
NavigatorInfo::AppCodeName()
navigatorinfo::AppCodeName()
}
fn Platform(self) -> DOMString {
NavigatorInfo::Platform()
navigatorinfo::Platform()
}
fn UserAgent(self) -> DOMString {
NavigatorInfo::UserAgent()
navigatorinfo::UserAgent()
}
}