auto merge of #5457 : deokjinkim/servo/navigator_appversion, r=jdm

In my mistake, I close PR for this commit.
I'm sorry for inconvenience.

@jdm 's comment
The test expectations for /tests/wpt/web-platform-tests/html/dom/interfaces.html and /tests/wpt/web-platform-tests/workers/interfaces.workers.js will need to be updated - http://mxr.mozilla.org/servo/search?string=appversion

According to your guide, I revised commit. Is this your intention?
r? @jdm 

cc @yichoi
This commit is contained in:
bors-servo 2015-03-31 11:51:55 -06:00
commit 225d7d2ece
7 changed files with 14 additions and 16 deletions

View file

@ -54,5 +54,9 @@ impl<'a> NavigatorMethods for JSRef<'a, Navigator> {
fn UserAgent(self) -> DOMString {
navigatorinfo::UserAgent()
}
fn AppVersion(self) -> DOMString {
navigatorinfo::AppVersion()
}
}

View file

@ -33,3 +33,7 @@ pub fn UserAgent() -> DOMString {
None => "".to_owned(),
}
}
pub fn AppVersion() -> DOMString {
"4.0".to_owned()
}

View file

@ -19,7 +19,7 @@ Navigator implements NavigatorID;
interface NavigatorID {
readonly attribute DOMString appCodeName; // constant "Mozilla"
readonly attribute DOMString appName;
//readonly attribute DOMString appVersion;
readonly attribute DOMString appVersion;
readonly attribute DOMString platform;
readonly attribute DOMString product; // constant "Gecko"
boolean taintEnabled(); // constant false

View file

@ -55,5 +55,9 @@ impl<'a> WorkerNavigatorMethods for JSRef<'a, WorkerNavigator> {
fn UserAgent(self) -> DOMString {
navigatorinfo::UserAgent()
}
fn AppVersion(self) -> DOMString {
navigatorinfo::AppVersion()
}
}

View file

@ -14,6 +14,7 @@ is(nav.taintEnabled(), false);
is(nav.appName, "Netscape");
is(nav.appCodeName, "Mozilla");
is(nav.platform, "");
is(nav.appVersion, "4.0");
</script>
</body>
</html>

View file

@ -8637,9 +8637,6 @@
[Navigator interface object length]
expected: FAIL
[Navigator interface: attribute appVersion]
expected: FAIL
[Navigator interface: attribute language]
expected: FAIL
@ -8682,9 +8679,6 @@
[Navigator interface: attribute javaEnabled]
expected: FAIL
[Navigator interface: window.navigator must inherit property "appVersion" with the proper type (2)]
expected: FAIL
[Navigator interface: window.navigator must inherit property "language" with the proper type (7)]
expected: FAIL
@ -9231,9 +9225,6 @@
[WorkerNavigator interface object length]
expected: FAIL
[WorkerNavigator interface: attribute appVersion]
expected: FAIL
[WorkerNavigator interface: attribute language]
expected: FAIL

View file

@ -81,9 +81,6 @@
[WorkerNavigator interface object length]
expected: FAIL
[WorkerNavigator interface: attribute appVersion]
expected: FAIL
[WorkerNavigator interface: attribute language]
expected: FAIL
@ -93,9 +90,6 @@
[WorkerNavigator interface: attribute onLine]
expected: FAIL
[WorkerNavigator interface: self.navigator must inherit property "appVersion" with the proper type (2)]
expected: FAIL
[WorkerNavigator interface: self.navigator must inherit property "language" with the proper type (7)]
expected: FAIL