diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-10-31 11:19:01 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-31 11:19:01 -0500 |
commit | 0d46c7c708b226f25eae72f1d711e4e55fd04527 (patch) | |
tree | 785fcb2f67c719c5d80a52238d16a59fdd68a4e6 /components/script/dom/webidls | |
parent | cb8ac3f00cf3c55a17dadc68d9287c6cd7c92e1c (diff) | |
parent | e6b879048fa7224885605cd695ca5b853799f55a (diff) | |
download | servo-0d46c7c708b226f25eae72f1d711e4e55fd04527.tar.gz servo-0d46c7c708b226f25eae72f1d711e4e55fd04527.zip |
Auto merge of #13419 - Coder206:swPromise, r=jdm
ServiceWorkerContainer::Promise
<!-- Please describe your changes on the following line: -->
<!-- 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 fix #13409 (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes
<!-- 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/13419)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/webidls')
-rw-r--r-- | components/script/dom/webidls/ServiceWorkerContainer.webidl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/webidls/ServiceWorkerContainer.webidl b/components/script/dom/webidls/ServiceWorkerContainer.webidl index 45fb25063ff..6d183619af8 100644 --- a/components/script/dom/webidls/ServiceWorkerContainer.webidl +++ b/components/script/dom/webidls/ServiceWorkerContainer.webidl @@ -8,7 +8,7 @@ interface ServiceWorkerContainer : EventTarget { [Unforgeable] readonly attribute ServiceWorker? controller; //[SameObject] readonly attribute Promise<ServiceWorkerRegistration> ready; - [NewObject, Throws] ServiceWorkerRegistration register(USVString scriptURL, optional RegistrationOptions options); + [NewObject] Promise<ServiceWorkerRegistration> register(USVString scriptURL, optional RegistrationOptions options); //[NewObject] /*Promise<any>*/ any getRegistration(optional USVString clientURL = ""); //[NewObject] /* Promise */<sequence<ServiceWorkerRegistration>> getRegistrations(); |