Commit Graph

349409 Commits

Author SHA1 Message Date
Wes Kocher
eba0d2158d Merge m-c to inbound 2014-03-05 18:57:07 -08:00
Timothy Nikkel
b1852c5b93 Bug 980062. Make nsDisplaySubDocument use the visible rect of the contained list because it contains the enlarged area. r=roc
mVisibleRect contains the bounds after the scrolled content has been clipped to the scrollport. The visible rect on the contained list (mList) contain the bounds for all pre-drawn content in the displayport.
2014-03-05 20:52:54 -06:00
Wes Kocher
98e21b85ea Backed out changeset 9535abc58cd6 (bug 619487) for m-bc bustage 2014-03-05 18:45:05 -08:00
Wes Kocher
30b8684198 Backed out changeset 78c1e9b63491 (bug 979951) for m-bc bustage 2014-03-05 18:44:50 -08:00
Wes Kocher
006d4b42d4 Backed out changeset 3a5a9d48b90c (bug 968836) for m-bc bustage 2014-03-05 18:44:33 -08:00
Wes Kocher
73e32652fe Merge fxteam to m-c 2014-03-05 18:20:17 -08:00
Wes Kocher
67c5e1761c Merge inbound to m-c 2014-03-05 18:08:47 -08:00
Myk Melez
4aa1695140 Bug 966182 - implement Task.async; r=paolo 2014-03-05 18:06:17 -08:00
Wes Kocher
c4e9ca8e55 Backed out changeset 3b3d4ad70da0 (bug 660224) for turning textarea-focus.html permaorange on Windows 2014-03-05 18:01:32 -08:00
Nathan Froyd
e61fc8be4d Bug 968836 - fix a few already_AddRefed members in MediaManager.cpp; r=jesup 2014-03-05 17:58:13 -08:00
Kyle Huey
a315427893 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
d56fde36e2 Bug 619487: Assert when preferences are used off the main thread. r=dbaron 2014-03-05 17:58:01 -08:00
Jeff Gilbert
6ca9eaaa7d Bug 980108 - GLContext.h should not use GLAPIENTRY decls. - r=kamidphish 2014-03-05 17:35:40 -08:00
Robert Strong
00eb9e322d 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
Simon Sapin
4d169705e6 (no bug) Add labels to the various is() checks in test_initial_storage.html, to aid in diagnosing test-failures. r=dholbert 2014-03-05 16:53:08 -08:00
Alexander Surkov
cd3950ff3f Bug 977170 - can't query IAccessible from HTML area element having ISimpleDOMNode pointer, r=tbsaunde 2014-03-05 19:36:56 -05:00
Jonathan Watt
f5ba183f67 Bug 660224 - Test whether using MozReftestInvalidate and MozAfterPaint fixes the orange for layout/reftests/css-ui-invalid/default-style/textarea-focus.html. r=dholbert
--HG--
extra : rebase_source : a4134334ad32e4c8334856167f440d769c9b5643
2014-03-06 00:35:23 +00:00
Wes Kocher
4c3646d5ae Backed out changeset e91a61089c37 (bug 976082) for linux debug m-oth permafails 2014-03-05 16:33:46 -08:00
Ryan VanderMeulen
9ded68150d Merge m-c to inbound on a CLOSED TREE. 2014-03-05 16:08:02 -05:00
Ryan VanderMeulen
f12cc94c28 Merge b2g-inbound to m-c. 2014-03-05 16:01:53 -05:00
Ryan VanderMeulen
7b0d7d89be Merge fx-team to m-c. 2014-03-05 15:49:40 -05:00
Ryan VanderMeulen
41ed89f357 Merge inbound to m-c. 2014-03-05 15:43:21 -05:00
Ryan VanderMeulen
d0df766a7d Backed out changeset 6cc5a05281c3 (bug 976863) for xpcshell failures.
CLOSED TREE
2014-03-05 15:36:26 -05:00
Margaret Leibovic
4b50c126ef backout 4bc6027f5638 for causing bug 978741 2014-03-05 12:21:22 -08:00
Margaret Leibovic
53779e8bb3 backout 9ee8634f70dc because it didn't work 2014-03-05 12:21:20 -08:00
Ehsan Akhgari
2b37c097ed 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
6626f074d4 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
60176ce528 Backed out changesets 23ab61f4bba1, d0f6a0106f43, and 9b656ca5ec50 (bug 974575) for Linux crashtest asserts. 2014-03-05 15:23:26 -05:00
fx4waldi@yahoo.com
8730803ebf 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
8736068ff3 Bug 978003 - Update inContentUI.css for Windows 8 and up. r=mdeboer 2014-03-05 20:59:56 +01:00
Robert Strong
b35eeb1e93 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
29ae1e8242 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
5b22b1861b 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
d86e99dd28 Bug 896224 - Remove support for the version 1 manifest from the updater. r=bbondy 2014-03-05 11:43:03 -08:00
Robert Strong
40e187af87 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
376e960b5a bug 896223 - Remove the version 1 manifest from the mar creation scripts. r=nthomas 2014-03-05 11:42:48 -08:00
B2G Bumper Bot
4cbb1c08c4 Bumping manifests a=b2g-bump 2014-03-05 11:01:27 -08:00
B2G Bumper Bot
33134afb8d 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
20bf4662bd Bumping manifests a=b2g-bump 2014-03-05 10:36:27 -08:00
B2G Bumper Bot
13c1f82a4d 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
bdb128c112 Bumping manifests a=b2g-bump 2014-03-05 10:06:11 -08:00
B2G Bumper Bot
42962fc59c 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
e3d44a41c4 Bumping manifests a=b2g-bump 2014-03-05 09:51:29 -08:00
B2G Bumper Bot
c13ac4f42c Bumping manifests a=b2g-bump 2014-03-05 09:26:11 -08:00
B2G Bumper Bot
b6f64a5f3e 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
4167e4c2f5 Bumping manifests a=b2g-bump 2014-03-05 09:16:05 -08:00
B2G Bumper Bot
7ee153f595 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
2f7f4f0753 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
089da55967 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
014159ff40 Bug 978587 - Pre: Let Java JARs contain either sources or generated sources. r=blassey 2014-03-05 08:57:09 -08:00