8590635444ac68bf2808cf61900ec5c1e29a4ed4: Merge mozilla-central to mozilla-inbound
Carsten "Tomcat" Book <cbook@mozilla.com> - Fri, 23 Jun 2017 13:00:34 +0200 - rev 365781
Push 91811 by cbook@mozilla.com at Fri, 23 Jun 2017 11:09:36 +0000
Merge mozilla-central to mozilla-inbound
2f10d697c307a09a286faa1f11831644c40f778d: Backed out changeset dfdccf4dc6a1 (Bug 1368284) to fix bustage a=me
Carsten "Tomcat" Book <cbook@mozilla.com> - Fri, 23 Jun 2017 12:56:08 +0200 - rev 365780
Push 91811 by cbook@mozilla.com at Fri, 23 Jun 2017 11:09:36 +0000
Backed out changeset dfdccf4dc6a1 (Bug 1368284) to fix bustage a=me
4cd2e9bab7b22af27c2cb25e24591e77df8731e5: Merge mozilla-central to mozilla-inbound
Carsten "Tomcat" Book <cbook@mozilla.com> - Fri, 23 Jun 2017 12:22:24 +0200 - rev 365779
Push 91810 by cbook@mozilla.com at Fri, 23 Jun 2017 10:22:41 +0000
Merge mozilla-central to mozilla-inbound
2277b567b242d8fe1c4f7335834a1d1fbc9f079f: Bug 1365879 - Revert merge conflict resolution to fix bustage a=me
Carsten "Tomcat" Book <cbook@mozilla.com> - Fri, 23 Jun 2017 12:18:40 +0200 - rev 365778
Push 91810 by cbook@mozilla.com at Fri, 23 Jun 2017 10:22:41 +0000
Bug 1365879 - Revert merge conflict resolution to fix bustage a=me
a9bc98726bd7c426285546a952f1cffe264b93c3: Backed out changeset 8069471cda21 (bug 1365879)
Carsten "Tomcat" Book <cbook@mozilla.com> - Fri, 23 Jun 2017 12:15:35 +0200 - rev 365777
Push 91810 by cbook@mozilla.com at Fri, 23 Jun 2017 10:22:41 +0000
Backed out changeset 8069471cda21 (bug 1365879)
120d49a127d6798b852014186d9ad40fda9163fe: Backed out changeset 9d0048e04446 (bug 1365879)
Carsten "Tomcat" Book <cbook@mozilla.com> - Fri, 23 Jun 2017 12:15:32 +0200 - rev 365776
Push 91810 by cbook@mozilla.com at Fri, 23 Jun 2017 10:22:41 +0000
Backed out changeset 9d0048e04446 (bug 1365879)
db067dba1a217278dec88d0db8bdfd8f9e63187e: Backed out changeset be62d3eb3b3b (bug 1365879)
Carsten "Tomcat" Book <cbook@mozilla.com> - Fri, 23 Jun 2017 12:15:30 +0200 - rev 365775
Push 91810 by cbook@mozilla.com at Fri, 23 Jun 2017 10:22:41 +0000
Backed out changeset be62d3eb3b3b (bug 1365879)
b6153802d9d323cf44efd1806ef8f05c1b68de04: Backed out changeset 35129e4e204b (bug 1365879)
Carsten "Tomcat" Book <cbook@mozilla.com> - Fri, 23 Jun 2017 12:15:28 +0200 - rev 365774
Push 91810 by cbook@mozilla.com at Fri, 23 Jun 2017 10:22:41 +0000
Backed out changeset 35129e4e204b (bug 1365879)
d08fac2a15fb73de6f4fe2e608b76b4ac3a8becc: Backed out changeset ab715ee9ef99 (bug 1363879)
Carsten "Tomcat" Book <cbook@mozilla.com> - Fri, 23 Jun 2017 12:15:25 +0200 - rev 365773
Push 91810 by cbook@mozilla.com at Fri, 23 Jun 2017 10:22:41 +0000
Backed out changeset ab715ee9ef99 (bug 1363879)
0ead1fd2e1d4a97425e4badccac5e6fc43c124a7: Backed out changeset f05aa479a40e (bug 1365879)
Carsten "Tomcat" Book <cbook@mozilla.com> - Fri, 23 Jun 2017 12:15:23 +0200 - rev 365772
Push 91810 by cbook@mozilla.com at Fri, 23 Jun 2017 10:22:41 +0000
Backed out changeset f05aa479a40e (bug 1365879)
671f398507525103abbaf6eaf50a0d036e5030d6: Backed out changeset 20203c94ef23 (bug 1365879)
Carsten "Tomcat" Book <cbook@mozilla.com> - Fri, 23 Jun 2017 12:15:21 +0200 - rev 365771
Push 91810 by cbook@mozilla.com at Fri, 23 Jun 2017 10:22:41 +0000
Backed out changeset 20203c94ef23 (bug 1365879)
ab1d1b0135febb8a13915ac7a78c1173e0c71c77: Merge mozilla-central to mozilla-inbound
Carsten "Tomcat" Book <cbook@mozilla.com> - Fri, 23 Jun 2017 11:44:21 +0200 - rev 365770
Push 91809 by cbook@mozilla.com at Fri, 23 Jun 2017 09:44:41 +0000
Merge mozilla-central to mozilla-inbound
1466b62da7b2512669c6bc1a3a826fd4171e41a5: merge mozilla-inbound to mozilla-central a=merge
Carsten "Tomcat" Book <cbook@mozilla.com> - Fri, 23 Jun 2017 11:28:19 +0200 - rev 365769
Push 91809 by cbook@mozilla.com at Fri, 23 Jun 2017 09:44:41 +0000
merge mozilla-inbound to mozilla-central a=merge
3b468193c933806339fa4a8dee73d03a09e635ab: Backed out changeset de9bb450199d on request from glob
Carsten "Tomcat" Book <cbook@mozilla.com> - Fri, 23 Jun 2017 09:00:15 +0200 - rev 365768
Push 91809 by cbook@mozilla.com at Fri, 23 Jun 2017 09:44:41 +0000
Backed out changeset de9bb450199d on request from glob
0913080e2c6aee140050a840c9a61413eae164e1: Bug 1374174 - Package UITour-lib.js only in onboarding extension to prevent noreference error. r=mossop
Rex Lee <rexboy@mozilla.com> - Thu, 22 Jun 2017 16:19:16 +0800 - rev 365767
Push 91809 by cbook@mozilla.com at Fri, 23 Jun 2017 09:44:41 +0000
Bug 1374174 - Package UITour-lib.js only in onboarding extension to prevent noreference error. r=mossop MozReview-Commit-ID: Fbxexo179pk
e88dabd01b07b065112783611d5f66f7958e70c4: servo: Merge #17472 - return Option from GlobalScope::current (from moonlightdrive:globalscope-current-option); r=asajeffrey
Jyotsna Prakash <jyotsna.prakash@gmail.com> - Thu, 22 Jun 2017 22:01:43 -0700 - rev 365766
Push 91809 by cbook@mozilla.com at Fri, 23 Jun 2017 09:44:41 +0000
servo: Merge #17472 - return Option from GlobalScope::current (from moonlightdrive:globalscope-current-option); r=asajeffrey <!-- Please describe your changes on the following line: --> handles the case where `GlobalScope::current` calls `CurrentGlobalOrNull` and the result is null --- <!-- 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 #17238 <!-- Either: --> - [ ] There are tests for these changes OR - [X] These changes do not require tests because: no functionality change & ./mach build -d has no errors <!-- 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. --> Source-Repo: https://github.com/servo/servo Source-Revision: dd7540a5d4b81c1b7b72a2120b2ada948da7108e
c846596b4cb8cd51375621dd43fc75e0a887c61a: Bug 1374938 - use our own avfoundation wrapper. r=jib
Munro Mengjue Chiang <mchiang@mozilla.com> - Thu, 22 Jun 2017 14:22:10 +0800 - rev 365765
Push 91809 by cbook@mozilla.com at Fri, 23 Jun 2017 09:44:41 +0000
Bug 1374938 - use our own avfoundation wrapper. r=jib MozReview-Commit-ID: KObTvtvRk10
7e2c3de976857db485370c5fdecf70990216847b: Backed out 3 changesets (bug 1334550) for Windows timeouts in test-oop-extensions/test_ext_unlimitedStorage.html
Phil Ringnalda <philringnalda@gmail.com> - Thu, 22 Jun 2017 22:32:58 -0700 - rev 365764
Push 91809 by cbook@mozilla.com at Fri, 23 Jun 2017 09:44:41 +0000
Backed out 3 changesets (bug 1334550) for Windows timeouts in test-oop-extensions/test_ext_unlimitedStorage.html Backed out changeset 17c74c7634a2 (bug 1334550) Backed out changeset d3b0db4e50c5 (bug 1334550) Backed out changeset 4319f15e2496 (bug 1334550) MozReview-Commit-ID: 2vmxPAMJZW
a1ef8b48309052f2ab956b6a6820e0228e7e3e6f: Bug 1374441 - Backed out bug 1374173 (MediaCacheStream Seek&Read refactoring) - r=jwwang
Gerald Squelart <gsquelart@mozilla.com> - Fri, 23 Jun 2017 13:18:07 +1200 - rev 365763
Push 91809 by cbook@mozilla.com at Fri, 23 Jun 2017 09:44:41 +0000
Bug 1374441 - Backed out bug 1374173 (MediaCacheStream Seek&Read refactoring) - r=jwwang Bug 1374173 seems to be the cause of all MediaCache intermittent assertion failures. It's not an important bug, so let's back-out and verify that intermittents disappear. MozReview-Commit-ID: 2X8iW1hWu99
511c4f11a455019c050d9cfec9191dfcec47b74a: Bug 1354581 - Add unit tests for DEVELOPER_OPTIONS. r=chmanchester
Mike Hommey <mh+mozilla@glandium.org> - Thu, 22 Jun 2017 22:05:31 -0700 - rev 365762
Push 91809 by cbook@mozilla.com at Fri, 23 Jun 2017 09:44:41 +0000
Bug 1354581 - Add unit tests for DEVELOPER_OPTIONS. r=chmanchester MozReview-Commit-ID: JXNICUdzWzD
(0) -300000 -100000 -30000 -10000 -3000 -1000 -300 -100 -50 -20 +20 +50 +100 +300 +1000 +3000 +10000 +30000 +100000 tip