Skip to content
Permalink
Browse files

Auto merge of #23551 - asajeffrey:script-navigatorid, r=<try>

Added missing NavigatorId attributes

<!-- Please describe your changes on the following line: -->

Add the missing attributes from https://html.spec.whatwg.org/multipage/system-state.html#navigatorid

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because there are already tests for Navigator

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23551)
<!-- Reviewable:end -->
  • Loading branch information...
bors-servo committed Jun 12, 2019
2 parents 8e78357 + 54ba32b commit 6955e2527653a1cbb7a9f083c41eda3610cb5b42
@@ -66,6 +66,21 @@ impl NavigatorMethods for Navigator {
navigatorinfo::Product()
}

// https://html.spec.whatwg.org/multipage/#dom-navigator-productsub
fn ProductSub(&self) -> DOMString {
navigatorinfo::ProductSub()
}

// https://html.spec.whatwg.org/multipage/#dom-navigator-vendor
fn Vendor(&self) -> DOMString {
navigatorinfo::Vendor()
}

// https://html.spec.whatwg.org/multipage/#dom-navigator-vendorsub
fn VendorSub(&self) -> DOMString {
navigatorinfo::VendorSub()
}

// https://html.spec.whatwg.org/multipage/#dom-navigator-taintenabled
fn TaintEnabled(&self) -> bool {
navigatorinfo::TaintEnabled()
@@ -9,6 +9,18 @@ pub fn Product() -> DOMString {
DOMString::from("Gecko")
}

pub fn ProductSub() -> DOMString {
DOMString::from("20100101")
}

pub fn Vendor() -> DOMString {
DOMString::from("")
}

pub fn VendorSub() -> DOMString {
DOMString::from("")
}

pub fn TaintEnabled() -> bool {
false
}
@@ -22,8 +22,11 @@ interface NavigatorID {
readonly attribute DOMString appVersion;
readonly attribute DOMString platform;
readonly attribute DOMString product; // constant "Gecko"
[Exposed=Window] readonly attribute DOMString productSub;
boolean taintEnabled(); // constant false
readonly attribute DOMString userAgent;
[Exposed=Window] readonly attribute DOMString vendor;
[Exposed=Window] readonly attribute DOMString vendorSub; // constant ""
};

// https://webbluetoothcg.github.io/web-bluetooth/#navigator-extensions
@@ -42,6 +42,21 @@ impl WorkerNavigatorMethods for WorkerNavigator {
navigatorinfo::Product()
}

// https://html.spec.whatwg.org/multipage/#dom-navigator-productsub
fn ProductSub(&self) -> DOMString {
navigatorinfo::ProductSub()
}

// https://html.spec.whatwg.org/multipage/#dom-navigator-vendor
fn Vendor(&self) -> DOMString {
navigatorinfo::Vendor()
}

// https://html.spec.whatwg.org/multipage/#dom-navigator-vendorsub
fn VendorSub(&self) -> DOMString {
navigatorinfo::VendorSub()
}

// https://html.spec.whatwg.org/multipage/#dom-navigator-taintenabled
fn TaintEnabled(&self) -> bool {
navigatorinfo::TaintEnabled()
@@ -4976,15 +4976,6 @@
[PromiseRejectionEvent interface: attribute promise]
expected: FAIL

[Navigator interface: attribute productSub]
expected: FAIL

[Navigator interface: attribute vendor]
expected: FAIL

[Navigator interface: attribute vendorSub]
expected: FAIL

[Navigator interface: attribute oscpu]
expected: FAIL

@@ -5003,15 +4994,6 @@
[Navigator interface: attribute hardwareConcurrency]
expected: FAIL

[Navigator interface: window.navigator must inherit property "productSub" with the proper type]
expected: FAIL

[Navigator interface: window.navigator must inherit property "vendor" with the proper type]
expected: FAIL

[Navigator interface: window.navigator must inherit property "vendorSub" with the proper type]
expected: FAIL

[Navigator interface: window.navigator must inherit property "oscpu" with the proper type]
expected: FAIL

@@ -10049,15 +10031,6 @@
[PromiseRejectionEvent interface: attribute promise]
expected: FAIL

[Navigator interface: attribute productSub]
expected: FAIL

[Navigator interface: attribute vendor]
expected: FAIL

[Navigator interface: attribute vendorSub]
expected: FAIL

[Navigator interface: attribute oscpu]
expected: FAIL

@@ -10076,15 +10049,6 @@
[Navigator interface: attribute hardwareConcurrency]
expected: FAIL

[Navigator interface: window.navigator must inherit property "productSub" with the proper type]
expected: FAIL

[Navigator interface: window.navigator must inherit property "vendor" with the proper type]
expected: FAIL

[Navigator interface: window.navigator must inherit property "vendorSub" with the proper type]
expected: FAIL

[Navigator interface: window.navigator must inherit property "oscpu" with the proper type]
expected: FAIL

@@ -630,6 +630,24 @@
[WorkerNavigator interface: self.navigator must not have property "taintEnabled"]
expected: FAIL
[WorkerNavigator interface: self.navigator must not have property "vendor"]
expected: FAIL
[WorkerNavigator interface: self.navigator must not have property "vendorSub"]
expected: FAIL
[WorkerNavigator interface: self.navigator must not have property "productSub"]
expected: FAIL
[WorkerNavigator interface: member vendor]
expected: FAIL
[WorkerNavigator interface: member vendorSub]
expected: FAIL
[WorkerNavigator interface: member productSub]
expected: FAIL
[OffscreenCanvasRenderingContext2D interface: operation arc(unrestricted double, unrestricted double, unrestricted double, unrestricted double, unrestricted double, boolean)]
expected: FAIL
@@ -30,6 +30,24 @@
[WorkerNavigator interface: attribute onLine]
expected: FAIL

[WorkerNavigator interface: member productSub]
expected: FAIL

[WorkerNavigator interface: member vendor]
expected: FAIL

[WorkerNavigator interface: member vendorSub]
expected: FAIL

[WorkerNavigator interface: self.navigator must not have property "productSub"]
expected: FAIL

[WorkerNavigator interface: self.navigator must not have property "vendor"]
expected: FAIL

[WorkerNavigator interface: self.navigator must not have property "vendorSub"]
expected: FAIL

[WorkerNavigator interface: self.navigator must inherit property "languages" with the proper type (7)]
expected: FAIL

0 comments on commit 6955e25

Please sign in to comment.
You can’t perform that action at this time.