Commit Graph

496504 Commits

Author SHA1 Message Date
Chris Manchester
118614dbf3 Bug 1311431 - Unset CC/CXX for Mac artifact mozconfigs. r=armenzg
MozReview-Commit-ID: 2UdZ9G2dDfP

--HG--
extra : rebase_source : ff950d1915e5bc7d3448c1ab350af76b25742665
2016-10-20 21:43:11 -07:00
Manish Goregaokar
1feab4fa75 Bug 1311959 - Remove marker-offset; r=tromey,xidorn
MozReview-Commit-ID: 72Fse0z1BiY

--HG--
extra : rebase_source : 45743ae282b861fc84f3462d1e49abde9ca0997f
2016-10-21 15:34:46 +05:30
Gregory Szorc
1deb8dd0e5 Bug 1311791 - Explicitly declare path to shared hg store; r=dustin
332a08725ed0 changed the store path logic in a quick and crude manner.
The code could lead to multiple shared stores existing on a cache
if checkouts were in different parent directories.

This commit refactors the code to explicitly declare a path to the
shared hg store. This restores the behavior of ensuring there is only
a single shared store per cache.

MozReview-Commit-ID: 19Aa1QVrVQ8

--HG--
extra : rebase_source : f74c0ab9cba2bf18e335f24c86dd095335961723
2016-10-20 12:56:43 -07:00
Gregory Szorc
dc86faefcd Backed out changeset 361ac37d15d6 (bug 1311580) for breaking WPT's rather narrow expectations
On a CLOSED TREE.

--HG--
extra : amend_source : 6492a41c5c66da4ea0f5e8f260227dd05f681a61
2016-10-21 16:28:29 -07:00
Ryan VanderMeulen
23a915d778 Merge m-c to autoland on a CLOSED TREE. a=merge 2016-10-21 17:15:38 -04:00
Ryan VanderMeulen
75888fe1aa Merge autoland to m-c on a CLOSED TREE. a=merge 2016-10-21 17:12:27 -04:00
Ryan VanderMeulen
5c4d7020f2 Merge m-c to inbound. a=merge 2016-10-21 11:08:45 -04:00
Carsten "Tomcat" Book
acce25f747 merge fx-team to mozilla-central a=merge 2016-10-21 16:56:14 +02:00
Andreas Pehrson
ba771ca352 Bug 1294605 - Increase 'ended' timeout in test_gUM_trackEnded.html. r=jib
MozReview-Commit-ID: 84BXrFnrdrE

--HG--
extra : rebase_source : ad0e75d1a6521a82f45fa7457d283cfac8f281e5
2016-10-21 15:46:17 +02:00
Gabriel Luong
235258f136 Backed out changeset 183b9d08d264 (Bug 1297100) reverting feature r=gl 2016-10-20 23:31:02 -07:00
Mike Hommey
2a9930daf9 Bug 1311871 - Fix NSIS version check for NSIS version 3.0. r=chmanchester
--HG--
extra : rebase_source : 5e99dc999e2c54813ec447134bc4b008f7af826a
2016-10-21 09:15:34 +09:00
Joseph Yeh
e50268f472 Bug 1036595 - Convert the 'Clear recent history' dialog to be in-content; r=MattN
This required removing the minimum dialogFrame height since the Clear recent history dialog is smaller than the old default height.

MozReview-Commit-ID: CuJO3VtGwem
2016-10-20 15:09:12 -07:00
David Major
143b6829de Bug 1311825: Pass by reference in fromObjectVariant and related methods. r=billm
MozReview-Commit-ID: GIhK1zRMsYb

--HG--
extra : rebase_source : 7da47ec2ea86e73c9d00cd4e6c1e5c830a54d7e1
2016-10-20 15:37:26 -05:00
Chris Pearce
ea73ebebc8 Bug 1311848 - Don't call ConnectPendingPromiseIdWithToken in MediaKeySession::Load. r=kikuo
We don't need to call MediaKeys::ConnectPendingPromiseIdWithToken() on the
MediaKeySession::Load() path, we already know the session Id, and we've already
removed the session from the list of pending sessions in Load().

MozReview-Commit-ID: KBiEsY95Csi

--HG--
extra : rebase_source : aadc3204409df35e4bbcb9532c530f860681afd1
2016-10-21 10:52:26 +13:00
Chris Pearce
22b1ca7b53 Bug 1311864 - Reject MediaKeySession::Load() for non temporary session types. r=kikuo
We are required to do this by the draft EME spec.

MozReview-Commit-ID: FnIEFgVId1z

--HG--
extra : rebase_source : 23042d3acda6cfcb379db457224d648dc955f688
2016-10-21 11:43:05 +13:00
Daniel Holbert
d2f9598859 Bug 1311865: Refactor the grid "same sides" code into a simpler WritingMode::ParallelAxisHasSamePolarity() utility function. r=mats
MozReview-Commit-ID: G9FRriSlZaG

--HG--
extra : rebase_source : 6ecceaf0c8e21778787c567b6a7c2e4591c92283
2016-10-20 17:45:07 -07:00
Wes Kocher
f790931dd6 Merge m-c to fx-team, a=merge 2016-10-20 11:27:03 -07:00
Jason Laster
3f112fcb04 Bug 1307580 - Preferences Pane should show Debugger source maps checkbox. r=jlongster 2016-10-20 14:16:40 -04:00
Sebastian Hengst
84075be506 Backed out changeset 19d4e98a1191 (bug 1295352) for frequently failing mda test test_getUserMedia_trackEnded.html on Linux x64 debug. r=backout a=backout
--HG--
extra : source : 4693d5445f6755dea29f763a5568c456cbf3d8cb
extra : amend_source : 66a80de5c3fbed08cd94309439a351bd8f876fcc
2016-10-20 20:03:17 +02:00
Sebastian Hengst
971d25de22 Backed out changeset 4f5c09304792 (bug 1295352)
--HG--
extra : source : 0d2f0fcf7185290db6623557c66959e32b552c59
2016-10-20 20:03:17 +02:00
Sebastian Hengst
d0d2db5cab Backed out changeset d921975370c7 (bug 1295352)
--HG--
extra : source : eecba1a05d03f27cb3966948effe04a1c9bfec83
2016-10-20 20:03:17 +02:00
Sebastian Hengst
3f0c757970 Backed out changeset 081401df2032 (bug 1295352)
--HG--
extra : source : aee84ca17a022f97e4544bd07e6dc54690020640
2016-10-20 20:03:16 +02:00
Sebastian Hengst
ab4eaeff9f Backed out changeset 9a2ec23ccac7 (bug 1295352)
--HG--
extra : source : 60e3863206b89848720257e56b0a51fc454ec225
2016-10-20 20:03:16 +02:00
Sebastian Hengst
d5addf7d5c Backed out changeset 95f04e2c2b06 (bug 1295352)
--HG--
extra : source : 051a29aa9419a32d6295f9e79362ceb3611b53a5
2016-10-20 20:03:16 +02:00
Sebastian Hengst
d3910409f1 Backed out changeset d0d0f847d043 (bug 1295352)
--HG--
extra : source : be887787de62889d8761e4402b320f351d571d23
2016-10-20 20:03:16 +02:00
Sebastian Hengst
fa35a48d74 Backed out changeset 1978000eae5e (bug 1294605)
--HG--
extra : source : 45b00bb6727a744bdc733578297418df6c9b1b58
2016-10-20 20:03:16 +02:00
Sebastian Hengst
aa0990718c Backed out changeset eb930799bd15 (bug 1294605)
--HG--
extra : source : 5a542246049e4ff7fc0c49234fdb49605047a8e2
2016-10-20 20:03:16 +02:00
Sebastian Hengst
1456ec14f4 Backed out changeset 0593feead369 (bug 1294605)
--HG--
extra : source : 387012235302ccb073180d17ecea6e0d794dfcb3
2016-10-20 20:03:16 +02:00
Sebastian Hengst
775580cb98 Backed out changeset 443a94083e00 (bug 1294605)
--HG--
extra : source : b82347df2602f07c7b190f0fbf7a6991d6022044
2016-10-20 20:03:16 +02:00
Sebastian Hengst
2c7995c52e Backed out changeset c0c023815311 (bug 1294605)
--HG--
extra : source : 40fb588cb1bc706a9c86dd5a27442714bd236afb
2016-10-20 20:03:15 +02:00
Carsten "Tomcat" Book
8204fc16cb Merge mozilla-central to fx-team 2016-10-20 16:51:31 +02:00
Carsten "Tomcat" Book
2e7511ed5a merge mozilla-inbound to mozilla-central a=merge 2016-10-20 16:47:39 +02:00
Carsten "Tomcat" Book
d16ac34f1a merge autoland to mozilla-central a=merge 2016-10-20 16:45:10 +02:00
ffxbld
5337d18d89 No bug, Automated HPKP preload list update from host bld-linux64-spot-564 - a=hpkp-update 2016-10-20 06:10:28 -07:00
ffxbld
fc9e549c58 No bug, Automated HSTS preload list update from host bld-linux64-spot-564 - a=hsts-update 2016-10-20 06:10:26 -07:00
Iris Hsiao
703b663355 Backed out changeset a0f243dead30 (bug 1301649) for developers' request 2016-10-20 15:24:50 +08:00
Phil Ringnalda
3e17fd7779 Merge m-i to m-c, a=merge
MozReview-Commit-ID: 6ims5jd1FU5
2016-10-19 18:29:50 -07:00
Phil Ringnalda
5f307bd640 Merge f-t to m-c, a=merge
MozReview-Commit-ID: 2EvSTWDWg4t
2016-10-19 18:27:04 -07:00
Phil Ringnalda
7fd865b93f Merge autoland to m-c, a=merge
MozReview-Commit-ID: 3nuTAHtJkkD
2016-10-19 18:25:54 -07:00
Gregory Szorc
6790a0b48f Bug 1311492 - Increase timeout of Windows PGO builds from 2 to 2.5 hours; r=garndt
They were timing out after 2 hours. It appears the task was only a few
minutes away from completion. So an extra 30 minutes should be enough.

MozReview-Commit-ID: HbTbWG42iw5

--HG--
extra : rebase_source : 326de6140bda128d8d5a1ecd5b3057249fd4328e
2016-10-19 12:18:06 -07:00
Neil Deakin
0b294f9d27 Bug 1301673, convert the image width and height to device pixels so that custom drag images are drawn at the right size, r=tn 2016-10-19 15:01:40 -04:00
Neil Deakin
8ff837e37c Bug 1301673, properly handle disabled drag feedback image and failed drag feedbacks in content processes, r=tn 2016-10-19 15:01:39 -04:00
Neil Deakin
4ca7f3cb5f Bug 1301673, use the correct coordinates when drag feedback is disabled or fails; this allows the drag feedback on Mac to appear as a grey rectangle, r=tn 2016-10-19 15:01:39 -04:00
Neil Deakin
918a9cbcbe Bug 1301673, use css pixels for the drag region, add each rectangle to the clip region so that tree drag feedback in drawn properly, r=tn 2016-10-19 15:01:39 -04:00
Neil Deakin
68ac95182c Bug 1301673, use device pixels for the supplied drag position and the computed dragrectangle, r=tn 2016-10-19 15:01:39 -04:00
Neil Deakin
9bb6b7baf0 Bug 1301673, don't confuse different coordinate types in image offsets, r=tn 2016-10-19 15:01:39 -04:00
Neil Deakin
12c7b914da Bug 1301673, use more specific coordinates for screen position in drag calculations, r=tn 2016-10-19 15:01:39 -04:00
Valentin Gosu
92395971b8 Bug 1294719 - Make sure to check mIPCClosed before calling SendRedirect1Begin r=honzab
MozReview-Commit-ID: 7xE7p6tE2kR
2016-10-19 19:31:01 +02:00
James Long
8fe7d41942 Bug 1309722 - Update new debugger frontend r=me 2016-10-19 13:24:08 -04:00
Carsten "Tomcat" Book
c9b4e00160 Merge mozilla-central to fx-team 2016-10-19 17:04:49 +02:00