Commit Graph

172325 Commits

Author SHA1 Message Date
Wes Kocher
b2616208a1 Merge fxteam to m-c 2014-03-05 18:20:17 -08:00
Wes Kocher
452f25917a Merge inbound to m-c 2014-03-05 18:08:47 -08:00
Nathan Froyd
48dafcbc9b Bug 968836 - fix a few already_AddRefed members in MediaManager.cpp; r=jesup 2014-03-05 17:58:13 -08:00
Kyle Huey
012493c82a Bug 979951: Always preserve the worker wrapper to ensure that we have something to tell us what compartment to enter. r=bent 2014-03-05 17:58:03 -08:00
Kyle Huey
ffba529abe Bug 619487: Assert when preferences are used off the main thread. r=dbaron 2014-03-05 17:58:01 -08:00
Wes Kocher
0bbba6bb61 Unbacked out changeset 19fe1e621c5c (bug 966182) because it didn't actually introduce the new hazard. 2014-03-05 20:45:55 -08:00
Wes Kocher
125fecd1b8 Backed out changeset 3bfcf691690a (bug 966182) for adding a hazard. 2014-03-05 20:31:38 -08:00
Bobby Holley
0f2729e9aa Bug 960108 - Ignore saved frame chains and contexts in JS::DescribeStack. r=bz 2014-03-05 20:15:35 -08:00
Boris Zbarsky
f5e48ed89d Bug 951887. Treat form controls as mutable for purposes of constraint validation whether they're in a document tree or not. r=smaug 2014-03-05 22:48:04 -05:00
Boris Zbarsky
00d926a354 Bug 874788. Allow WebIDL HTMLAllCollection to emulate undefined. r=peterv 2014-03-05 22:48:04 -05:00
Boris Zbarsky
847fc61450 Bug 874787. Add support for legacycaller on proxy bindings. r=efaust,peterv 2014-03-05 22:48:03 -05:00
Blair McBride
c59582644a Bug 966933 - [Australis] UITour: Add a UI tour link in the Help menu. r=Gijs 2014-03-06 14:41:43 +13:00
Robert Strong
f0b0733229 Followup for Bug 900251 - remove check for extra channel-prefs.js and update-settings.ini files in the mar generation scripts. r=nthomas 2014-03-05 17:04:21 -08:00
Brian Nicholson
c117dc481c Backout d8018c23945a for NPE failures 2014-03-05 15:35:40 -08:00
Mike de Boer
83c00c2e87 [Australis] Bug 870593: add tip section to Customization Mode. r=jaws 2014-03-05 18:09:12 -05:00
Dão Gottwald
fdecda32ef Bug 941430 - Increase the tab max width. r=MattN 2014-03-06 00:09:17 +01:00
Ryan VanderMeulen
4de3678a20 Merge m-c to inbound on a CLOSED TREE. 2014-03-05 16:08:02 -05:00
Ryan VanderMeulen
24057b1ac1 Merge b2g-inbound to m-c. 2014-03-05 16:01:53 -05:00
Ryan VanderMeulen
633f9a6f80 Merge fx-team to m-c. 2014-03-05 15:49:40 -05:00
Ryan VanderMeulen
4f91210f63 Merge inbound to m-c. 2014-03-05 15:43:21 -05:00
Ryan VanderMeulen
bd02191519 Backed out changeset 6cc5a05281c3 (bug 976863) for xpcshell failures.
CLOSED TREE
2014-03-05 15:36:26 -05:00
Margaret Leibovic
5bf6ed5073 backout 4bc6027f5638 for causing bug 978741 2014-03-05 12:21:22 -08:00
Margaret Leibovic
8846766a7a backout 9ee8634f70dc because it didn't work 2014-03-05 12:21:20 -08:00
Ehsan Akhgari
4788926251 Bug 979816 - Backout bug 977701 because of a Talos regression
Landed on a CLOSED TREE
2014-03-05 15:18:09 -05:00
Ryan VanderMeulen
6e90795ee7 Backed out 8 changesets (bug 959150) for Linux debug build bustage on a CLOSED TREE.
Backed out changeset 30bdc9b15e8e (bug 959150)
Backed out changeset 630e489aed30 (bug 959150)
Backed out changeset c6874004efe7 (bug 959150)
Backed out changeset ebc67518a962 (bug 959150)
Backed out changeset 14441e528582 (bug 959150)
Backed out changeset 8d0ae8bffb08 (bug 959150)
Backed out changeset 603b63c33e9a (bug 959150)
Backed out changeset 261e2d244c54 (bug 959150)
2014-03-05 15:26:07 -05:00
Ryan VanderMeulen
7c3c52f385 Backed out changesets 23ab61f4bba1, d0f6a0106f43, and 9b656ca5ec50 (bug 974575) for Linux crashtest asserts. 2014-03-05 15:23:26 -05:00
fx4waldi@yahoo.com
61649be06a Bug 975794 - Toolbarbuttons in the menu panel shouldn't get an inverted dropmarker when using a dark LWT. r=dao 2014-03-05 21:00:43 +01:00
Dão Gottwald
76f600859b Bug 978003 - Update inContentUI.css for Windows 8 and up. r=mdeboer 2014-03-05 20:59:56 +01:00
Robert Strong
7f8b18af98 Test cleanup and tests for Bug 759469 - Add new updater instruction to add a file if it doesn't exist in the destination. r=bbondy
--HG--
rename : toolkit/mozapps/update/tests/unit_base_updater/marDirLockedStageFailure_win.js => toolkit/mozapps/update/tests/unit_base_updater/marAppApplyDirLockedStageFailure_win.js
rename : toolkit/mozapps/update/tests/unit_base_updater/marFileInUseStageSuccessComplete_win.js => toolkit/mozapps/update/tests/unit_base_updater/marFileInUseStageFailureComplete_win.js
rename : toolkit/mozapps/update/tests/unit_base_updater/marFileInUseStageSuccessPartial_win.js => toolkit/mozapps/update/tests/unit_base_updater/marFileInUseStageFailurePartial_win.js
rename : toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseStageSuccessComplete_win.js => toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseStageFailureComplete_win.js
rename : toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseStageSuccessPartial_win.js => toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseStageFailurePartial_win.js
rename : toolkit/mozapps/update/tests/unit_service_updater/marDirLockedStageFailureSvc_win.js => toolkit/mozapps/update/tests/unit_service_updater/marAppApplyDirLockedStageFailureSvc_win.js
rename : toolkit/mozapps/update/tests/unit_service_updater/marFileInUseStageSuccessCompleteSvc_win.js => toolkit/mozapps/update/tests/unit_service_updater/marFileInUseStageFailureCompleteSvc_win.js
rename : toolkit/mozapps/update/tests/unit_service_updater/marFileInUseStageSuccessPartialSvc_win.js => toolkit/mozapps/update/tests/unit_service_updater/marFileInUseStageFailurePartialSvc_win.js
rename : toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseStageSuccessCompleteSvc_win.js => toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseStageFailureCompleteSvc_win.js
rename : toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseStageSuccessPartialSvc_win.js => toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseStageFailurePartialSvc_win.js
2014-03-05 11:43:28 -08:00
Robert Strong
7452572980 Updated test binaries for Bug 759469 - Add new updater instruction to add a file if it doesn't exist in the destination. r=bbondy
--HG--
rename : toolkit/mozapps/update/tests/data/partial_in_use_win_before.exe => toolkit/mozapps/update/tests/data/complete.exe
rename : toolkit/mozapps/update/tests/data/partial_in_use_win_after.exe => toolkit/mozapps/update/tests/data/partial.exe
2014-03-05 11:43:20 -08:00
Robert Strong
b5acd8f651 Main patch for Bug 759469 - Add new updater instruction to add a file if it doesn't exist in the destination. r=bbondy 2014-03-05 11:43:11 -08:00
Robert Strong
050dafc89b Bug 896224 - Remove support for the version 1 manifest from the updater. r=bbondy 2014-03-05 11:43:03 -08:00
Robert Strong
b4c8aa075d Bug 900251 - Add support for add-if-not instruction added by bug 759469 to the mar generation scripts. r=nthomas 2014-03-05 11:42:56 -08:00
Robert Strong
8afb30bb0c bug 896223 - Remove the version 1 manifest from the mar creation scripts. r=nthomas 2014-03-05 11:42:48 -08:00
Brian Nicholson
0733c05983 Bug 979166 - Refactor dynamic toolbar code. r=lucasr
--HG--
extra : rebase_source : 9080c2ba012e608134f084cb5186195446ecad85
2014-03-05 11:07:04 -08:00
Ryan VanderMeulen
bf8677e172 Merge m-c to fx-team. 2014-03-05 16:06:46 -05:00
B2G Bumper Bot
8725dd6224 Bumping manifests a=b2g-bump 2014-03-05 11:01:27 -08:00
B2G Bumper Bot
582b3beeef Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5d470e57a891
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Revert "Merge pull request #16628 from 6a68/bug-972645-reset-password"

This reverts commit e2427df4eaf5b0b7ae207b256a51436b5b80d769, reversing
changes made to 117b06a09a1e15ce19f21eaaf53a7fe187b233d8.
2014-03-05 11:00:16 -08:00
B2G Bumper Bot
394a0443fc Bumping manifests a=b2g-bump 2014-03-05 10:36:27 -08:00
B2G Bumper Bot
4ea776cec3 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c7a5af5dc4e9
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Merge pull request #16678 from jonallengriffin/modules

Bug 977366 - Allow make node_modules to use git mirror, r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/d61735aa8cc5
Author: Jonathan Griffin <jonallengriffin@gmail.com>
Desc: Bug 977366 - Allow make node_modules to use git mirror, r=gaye
2014-03-05 10:35:19 -08:00
B2G Bumper Bot
afb4798ed8 Bumping manifests a=b2g-bump 2014-03-05 10:06:11 -08:00
B2G Bumper Bot
f3333e4ba9 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/765bd1e5dbef
Author: Ed Morley <emorley@mozilla.com>
Desc: Revert "Bug 975161 - Ensure SIM Pin inputs are visible. r=vingetun" for failures in system/test/unit/sim_settings_helper_test.js

This reverts commit fa25ec9e9491388beee916b35ad3c59cbfee2f30.
2014-03-05 10:00:22 -08:00
B2G Bumper Bot
75d5478f1a Bumping manifests a=b2g-bump 2014-03-05 09:51:29 -08:00
B2G Bumper Bot
881be82365 Bumping manifests a=b2g-bump 2014-03-05 09:26:11 -08:00
B2G Bumper Bot
2c72229aa3 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5d6a52354620
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #16628 from 6a68/bug-972645-reset-password

Bug 972645 - Implement Reset Password Firefox Accounts flow

========

https://hg.mozilla.org/integration/gaia-central/rev/6b4bfac91fae
Author: Jared Hirsch <ohai@6a68.net>
Desc: Bug 972645 - Implement Reset Password Firefox Accounts flow. r=ferjm

  Includes special case for reset password in FTE, see bug 965494 comment 1
2014-03-05 09:20:23 -08:00
B2G Bumper Bot
99e6266f58 Bumping manifests a=b2g-bump 2014-03-05 09:16:05 -08:00
B2G Bumper Bot
5fd25c5cc8 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e2b61960ea7c
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #16378 from KevinGrandon/bug_971447_system_action_menu_v2

Bug 971447 - [System2] Instantiable ActionMenu r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/f07aab93e438
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 971447 - [System2] Instantiable ActionMenu r=alive
2014-03-05 09:10:39 -08:00
Nick Alexander
774881c0de Bug 978587 - Make GeckoView package org.mozilla.gecko; don't include org.mozilla.gecko.R. r=blassey
This builds a new Java JAR containing only org.mozilla.gecko.R.  This
new JAR file is included in Fennec, but not included in
geckoview_library.  (Usually ant, gradle, or Eclipse arranges to produce
org.mozilla.gecko.R but not include it in the classes.jar output as part
of a library project.  This mimics that.)

Changing the GeckoView package to org.mozilla.gecko declares to
consuming applications that they should produce org.mozilla.gecko.R,
replacing what was removed above (but with correct resource IDs).
2014-03-05 08:57:09 -08:00
Nick Alexander
9640387d21 Bug 978587 - Pre: Make geckoview_library and BackgroundInstrumentationTests target android-16. r=blassey
This agrees with Fennec (and BrowserInstrumentationTests).
2014-03-05 08:57:09 -08:00
Nick Alexander
aea81467c8 Bug 978587 - Pre: Let Java JARs contain either sources or generated sources. r=blassey 2014-03-05 08:57:09 -08:00