Commit Graph

420174 Commits

Author SHA1 Message Date
Shane Tomlinson
c5ec66d94f Bug 1146904: Add the FxAccountsWebChannel to drive Sync
* * *
fix tests
From 6bb486068a8b002f222f4658989968d86df9eff1 Mon Sep 17 00:00:00 2001
---
 .../test/general/browser_fxa_web_channel.html      |   2 +-
 .../test/general/browser_fxa_web_channel.js        | 131 +++++++++++----------
 services/fxaccounts/tests/xpcshell/test_profile.js |  26 ----
 3 files changed, 70 insertions(+), 89 deletions(-)

--HG--
rename : browser/base/content/test/general/browser_fxa_profile_channel.html => browser/base/content/test/general/browser_fxa_web_channel.html
rename : browser/base/content/test/general/browser_fxa_profile_channel.js => browser/base/content/test/general/browser_fxa_web_channel.js
rename : services/fxaccounts/FxAccountsProfileChannel.jsm => services/fxaccounts/FxAccountsWebChannel.jsm
rename : services/fxaccounts/tests/xpcshell/test_profile_channel.js => services/fxaccounts/tests/xpcshell/test_web_channel.js
2015-04-11 13:23:08 +01:00
Ryan VanderMeulen
a159fb7851 Merge m-c to fx-team. a=merge
CLOSED TREE
2015-05-06 16:29:44 -04:00
Ryan VanderMeulen
cc947f05d4 Merge inbound to m-c. a=merge 2015-05-06 16:26:26 -04:00
Ryan VanderMeulen
11cde0e724 Merge fx-team to m-c. a=merge 2015-05-06 16:20:55 -04:00
Robert Strong
3d9c259306 Bug 1096523 - Firefox Developer Edition bitmap looks awful with hiDPI (logo image). r=spohl 2015-05-06 13:01:57 -07:00
Ryan VanderMeulen
32f65d4f75 Merge b2g-inbound to m-c. a=merge 2015-05-06 16:01:31 -04:00
aus@mozilla.com
16141b0b23 backout of bug 1161579 - blocking smoketests. a=RyanVM 2015-05-06 11:25:29 -07:00
Ryan VanderMeulen
8c304a4876 Backed out changeset 0cecdb107e91 (bug 1162036) for e10s browser_privatebrowsing_DownloadLastDirWithCPS.js failures.
CLOSED TREE

--HG--
extra : rebase_source : d9021ec4b0e810314138858194a56f4479edf21d
2015-05-06 12:07:00 -04:00
Ryan VanderMeulen
37e75ba5e6 Backed out changesets 230adc57e016 and 61bd6e2c6e72 (bug 1072898) for reftest failures.
CLOSED TREE
2015-05-06 11:27:32 -04:00
Gervase Markham
9f37b79c96 Bug 1161823 - Remove Pakistan entries from the PSL because our UTF-8 converter doesn't like them. r=gerv
CLOSED TREE
2015-05-06 11:23:37 -04:00
Trevor Saunders
a75cca3a44 no bug - fix -Wreturn-type warning on a CLOSED TREE 2015-05-06 11:12:46 -04:00
Carsten "Tomcat" Book
1c5956542b Backed out changeset 18474e89292a (bug 1161634) for m4 perma failures on a CLOSED TREE 2015-05-06 17:07:23 +02:00
Carsten "Tomcat" Book
5568f37fd2 Backed out changeset 7141b7088a89 (bug 1161634) 2015-05-06 17:06:46 +02:00
Carsten "Tomcat" Book
5263fa2e35 Backed out changeset 5a0f9070dd94 (bug 1147736) for bustage on a CLOSED TREE 2015-05-06 17:03:13 +02:00
Carsten "Tomcat" Book
a953994a2b Backed out changeset a78ad976faf3 (bug 1147736) 2015-05-06 17:02:38 +02:00
Carsten "Tomcat" Book
9344729475 Backed out changeset 95e956a2ddb9 (bug 1147736) 2015-05-06 17:02:35 +02:00
Carsten "Tomcat" Book
a50ac5128e Backed out changeset 0098029a7bdd (bug 1147736) 2015-05-06 17:02:31 +02:00
Trevor Saunders
b66382e2ff bug 606080 - on windows give accessibles a unique 32 bit id r=surkov 2015-05-06 10:57:38 -04:00
Trevor Saunders
a2bc5996ae bug 606080 - add class to generate unique 32 bit ids r=froydnj 2015-05-06 10:57:24 -04:00
Trevor Saunders
ea477e7198 bug 606080 - add SplayTree::LookupOrAdd r=froydnj 2015-05-06 10:57:12 -04:00
Jan de Mooij
31cda07653 Bug 1160535 part 1 - Give JSFunction its own AllocKind. r=terrence 2015-05-06 16:52:46 +02:00
Bruce Sun
3ce88763fd Bug 1161939 - Correct bitwise checking on GATT characteristic write properties. r=jocelyn 2015-05-06 18:15:30 +08:00
Carsten "Tomcat" Book
6e929ef81c merge mozilla-inbound to mozilla-central a=merge 2015-05-06 11:59:15 +02:00
Carsten "Tomcat" Book
f63d9cb0e4 merge fx-team to mozilla-central a=merge 2015-05-06 11:48:46 +02:00
Seth Fowler
b699f89076 Bug 1161859 - Compute the size of animated image frames correctly in the SurfaceCache. r=dholbert 2015-05-05 22:19:30 -07:00
Gavin Sharp
6fcbc3a1c9 Bug 1153964 followup, use RELEASE_BUILD instead of !(NIGHTLY || DEV_EDITION) 2015-05-05 22:11:37 -07:00
Jared Wein
ee6179a264 Bug 1160678 - Pocket door hangers arent automatically closed. r=dolske 2015-05-06 00:11:32 -04:00
Wes Kocher
f5e3e4e026 Merge m-c to fx-team a=merge 2015-05-05 20:30:34 -07:00
Wes Kocher
a9a046c31a Merge m-c to b2ginbound a=merge 2015-05-05 20:29:54 -07:00
Wes Kocher
917dcc1026 Merge b2ginbound to m-c a=merge 2015-05-05 20:28:39 -07:00
B2G Bumper Bot
7712b87d57 Bumping manifests a=b2g-bump 2015-05-05 20:24:53 -07:00
B2G Bumper Bot
ce9cbc8ad9 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/78e99873114b
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #29856 from huchengtw-moz/bug-1159660-check-before-focus

Bug 1159660 - to check if activeElement is itself before calling focus o..., r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/8ae22666b2e7
Author: John Hu <johu@mozilla.com>
Desc: Bug 1159660 - to check if activeElement is itself before calling focus or blur a mozbrowser iframe

========

https://hg.mozilla.org/integration/gaia-central/rev/1138ea673815
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1159866 - merge pull request #29852 from cctuan:1159866 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/07946d06dad6
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 1159866 - publish lockscreenwindowmanager-deactivated when lockscreen is closed, r=alive
2015-05-05 20:22:40 -07:00
Wes Kocher
b3fd288964 Backed out changeset 7ca0864fc405 (bug 1146904) for b2g xpcshell failures
--HG--
rename : browser/base/content/test/general/browser_fxa_web_channel.html => browser/base/content/test/general/browser_fxa_profile_channel.html
rename : browser/base/content/test/general/browser_fxa_web_channel.js => browser/base/content/test/general/browser_fxa_profile_channel.js
rename : services/fxaccounts/FxAccountsWebChannel.jsm => services/fxaccounts/FxAccountsProfileChannel.jsm
rename : services/fxaccounts/tests/xpcshell/test_web_channel.js => services/fxaccounts/tests/xpcshell/test_profile_channel.js
2015-05-05 19:40:55 -07:00
Wes Kocher
f7e0fcaba8 Backed out changeset 7ca0864fc405 (bug 1146904) for b2g xpcshell failures
--HG--
rename : browser/base/content/test/general/browser_fxa_web_channel.html => browser/base/content/test/general/browser_fxa_profile_channel.html
rename : browser/base/content/test/general/browser_fxa_web_channel.js => browser/base/content/test/general/browser_fxa_profile_channel.js
rename : services/fxaccounts/FxAccountsWebChannel.jsm => services/fxaccounts/FxAccountsProfileChannel.jsm
rename : services/fxaccounts/tests/xpcshell/test_web_channel.js => services/fxaccounts/tests/xpcshell/test_profile_channel.js
extra : source : 092df73f4551786888c2accc8ca71fde3cc21a6d
2015-05-05 19:40:55 -07:00
Mark Hammond
3ef5dc624b Bug 622657 - catch invalid bookmark items and delete them when syncing bookmarks. r=rnewman 2015-05-06 11:42:07 +10:00
Mark Hammond
8f91295fc2 Bug 1153708 - put the FxA profile fetch behind the same pref used to display the avatar. r=zaach 2015-05-06 11:38:06 +10:00
Drew Willcoxon
579004be29 Bug 1155521 - Migrate Pocket add-on and social provider users to the new Pocket button (part 2, migration). r=jaws 2015-05-05 17:23:59 -07:00
Gijs Kruitbosch
c831107cdb Bug 1155521 - Migrate Pocket add-on and social provider users to the new Pocket button (part 1, CustomizableUI changes). r=jaws 2015-05-05 17:21:33 -07:00
Jordan Santell
80553d32fb Bug 1145187 - Implement polling for buffer status on performance actor facades. r=vp 2015-05-05 17:12:49 -07:00
Tim Taubert
00fed436ce Bug 1162036 - Remove pending/restoring tabs when receiving browser:purge-session-history instead of leaving empty tabs r=Yoric 2015-05-06 15:33:46 +02:00
Nathan Toone
0f9afa9766 Bug 1161195 - Part 2: Rename variables. r=nalexander
Rename variables to be consistent with the name used in confvars.sh.
2015-05-05 20:11:15 -06:00
Nathan Toone
79c3b4b7be Bug 1161195 - Part 1: Set java class names at compile time. r=nalexander
Rather than hardcoding the following classes in AppConstants.java.in and AndroidManifest.xml, they are set in
confvars.sh:
   org.mozilla.gecko.GeckoApplication (Specified using MOZ_ANDROID_APPLICATION_CLASS)
   org.mozilla.gecko.BrowserApp       (Specified using MOZ_ANDROID_BROWSER_INTENT_CLASS)
   org.mozilla.search.SearchActivity  (Specified using MOZ_ANDROID_SEARCH_INTENT_CLASS)
2015-05-05 20:10:50 -06:00
Jared Wein
12293f0ffe Bug 1161654 - Remove some dead code in Pocket.jsm and use pktApi for checking if the user is logged in. r=dolske 2015-05-05 17:05:45 -07:00
Allison Naaktgeboren
543db6baa4 Bug 1139232 - Door hanger on tablet shows up in the tab over view.r=liuche 2015-05-05 16:53:28 -07:00
Jordan Santell
29800b3126 Bug 1126457 - Implement a worker utility to easily offload tasks into a worker. r=bgrins 2015-05-05 16:39:48 -07:00
jlal@mozilla.com
3c72fb2b65 Bug 1131206 - Assume the worst and always update mozharness r=garndt
--HG--
extra : rebase_source : 761f4c8a22299f5d76bca2c1b82d8ca249eb443f
2015-05-05 15:46:09 -07:00
jlal@mozilla.com
ee580f4800 Bug 1131206 - Select mozharness version from in tree r=garndt
--HG--
extra : rebase_source : ad4983e3b67e222071a25271943940cc107e3e3e
2015-05-05 17:00:06 -07:00
jlal@mozilla.com
1cb1898cb6 Bug 1131206 - Remove the less useful commands from taskcluster mach r=garndt
--HG--
extra : rebase_source : 616d92504901aa4bebfc3cc287cd82baa594417f
2015-05-05 15:31:28 -07:00
Wes Kocher
07f72da916 Merge m-c to b2ginbound a=merge 2015-05-05 14:55:41 -07:00
Wes Kocher
3cc5a8fe89 Merge b2ginbound to m-c a=merge 2015-05-05 14:51:17 -07:00