Commit Graph

96387 Commits

Author SHA1 Message Date
Ehsan Akhgari
d21f28ef24 Merge mozilla-central into mozilla-inbound 2012-06-14 09:37:35 -04:00
Ed Morley
10a18d4b30 Backout 4d93e6ed8a49 (bug 764774) for mochitest-chrome failure in test_bug675492.xul 2012-06-14 14:34:42 +01:00
Ehsan Akhgari
dead1c5a1b Bug 757632 - Re-enable the test; r=rstrong 2012-06-13 10:30:07 -04:00
Ehsan Akhgari
7ce04794eb Bug 764587 - Do not throttle the download of a complete mar if we fall back to a complete update after attempting to stage a partial update; r=rstrong 2012-06-13 22:00:03 -04:00
Ehsan Akhgari
7c66e981ad Bug 764269 - Handle symbolic links properly when copying the installation directory before staging an update; r=rstrong 2012-06-13 20:38:56 -04:00
Aryeh Gregor
5bcb04ae9f Bug 543645 - Clean up nsContentSubtreeIterator (fixing a hang while we're at it); r=bz 2012-06-12 11:45:09 +03:00
Aryeh Gregor
b1c8f77493 Bug 762183 part 5 - Fix misleading comments/variable names; r=ehsan 2012-06-13 18:38:05 +03:00
Aryeh Gregor
9395a049ae Bug 762183 part 4 - Fix assertion in DeleteTextTxn::Init; r=ehsan 2012-06-12 19:05:27 +03:00
Aryeh Gregor
d99bb584ed Bug 762183 part 3 - Clean up some nsEditor methods; r=ehsan 2012-06-12 18:44:44 +03:00
Aryeh Gregor
56e7ece4d0 Bug 762183 part 2 - Publicize nsSelectionIterator; r=ehsan 2012-06-12 17:15:23 +03:00
Ehsan Akhgari
87bbd427a3 Bug 760577 - Part 4: Add full round-trip tests for keeping the mar file around and falling back to apply it at startup if replacing the application fails; r=rstrong
--HG--
rename : toolkit/mozapps/update/test/unit/test_0201_app_launch_apply_update.js => toolkit/mozapps/update/test/unit/test_0203_app_launch_apply_update.js
rename : toolkit/mozapps/update/test_svc/unit/test_0201_app_launch_apply_update_svc.js => toolkit/mozapps/update/test_svc/unit/test_0203_app_launch_apply_update_svc.js
2012-06-08 15:06:53 -04:00
Ehsan Akhgari
48639f87df Bug 760577 - Part 3: Verify the fallback behavior on all the locked file tests; r=rstrong
--HG--
rename : toolkit/mozapps/update/test/unit/test_0161_appInUse_xp_win_complete.js => toolkit/mozapps/update/test/unit/test_0162_appInUse_xp_win_complete.js
rename : toolkit/mozapps/update/test/unit/test_0172_fileLocked_xp_win_complete.js => toolkit/mozapps/update/test/unit/test_0174_fileLocked_xp_win_complete.js
rename : toolkit/mozapps/update/test/unit/test_0173_fileLocked_xp_win_partial.js => toolkit/mozapps/update/test/unit/test_0175_fileLocked_xp_win_partial.js
rename : toolkit/mozapps/update/test/unit/test_0184_fileInUse_xp_win_complete.js => toolkit/mozapps/update/test/unit/test_0188_fileInUse_xp_win_complete.js
rename : toolkit/mozapps/update/test/unit/test_0185_fileInUse_xp_win_partial.js => toolkit/mozapps/update/test/unit/test_0189_fileInUse_xp_win_partial.js
rename : toolkit/mozapps/update/test/unit/test_0186_rmrfdirFileInUse_xp_win_complete.js => toolkit/mozapps/update/test/unit/test_0190_rmrfdirFileInUse_xp_win_complete.js
rename : toolkit/mozapps/update/test/unit/test_0187_rmrfdirFileInUse_xp_win_partial.js => toolkit/mozapps/update/test/unit/test_0191_rmrfdirFileInUse_xp_win_partial.js
rename : toolkit/mozapps/update/test_svc/unit/test_0161_appInUse_xp_win_complete_svc.js => toolkit/mozapps/update/test_svc/unit/test_0162_appInUse_xp_win_complete_svc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0172_fileLocked_xp_win_complete_svc.js => toolkit/mozapps/update/test_svc/unit/test_0174_fileLocked_xp_win_complete_svc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0173_fileLocked_xp_win_partial_svc.js => toolkit/mozapps/update/test_svc/unit/test_0175_fileLocked_xp_win_partial_svc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0184_fileInUse_xp_win_complete_svc.js => toolkit/mozapps/update/test_svc/unit/test_0188_fileInUse_xp_win_complete_svc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0185_fileInUse_xp_win_partial_svc.js => toolkit/mozapps/update/test_svc/unit/test_0189_fileInUse_xp_win_partial_svc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0186_rmrfdirFileInUse_xp_win_complete_svc.js => toolkit/mozapps/update/test_svc/unit/test_0190_rmrfdirFileInUse_xp_win_complete_svc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0187_rmrfdirFileInUse_xp_win_partial_svc.js => toolkit/mozapps/update/test_svc/unit/test_0191_rmrfdirFileInUse_xp_win_partial_svc.js
2012-06-14 09:26:02 -04:00
Ehsan Akhgari
cee6e67eff Bug 760577 - Part 2: Fall back to regular updates if the replacing step fails after we've staged an update; r=rstrong 2012-06-14 09:25:24 -04:00
Ehsan Akhgari
97c7757142 Bug 760577 - Part 1: Keep the update files around when an update has been staged; r=rstrong 2012-06-14 09:21:13 -04:00
Malini Das
d24a45e4f4 bug 753022: debug builds should have marionette enabled and tested. r=bhearsum,ted 2012-06-14 08:46:12 -04:00
Ed Morley
1ecb6bde01 Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-06-14 10:20:43 +01:00
Mike Hommey
c91e85647a Bug 764237 - Add snprintf and strcasecmp definitions in nsXULRunnerApp.cpp for windows. r=bsmedberg 2012-06-14 08:14:55 +02:00
Mike Hommey
ce0eaee878 Bug 747393 - Avoid race condition creating directories in JarMaker. r=ted 2012-06-14 08:14:53 +02:00
Josh Aas
c4f4720b76 Bug 686335: Allow plugins that we previously considered duplicates to be loaded/registered. Prefer plugins with higher version numbers when picking a handler for content. r=bsmedberg 2012-06-13 22:51:21 -04:00
Honza Bambas
0cfa594bc6 Bug 762409 - localStorage throws 'The operation is insecure.' error with document.domain, r=bz 2012-06-14 02:48:09 +02:00
Benjamin Smedberg
11714e1c57 Bug 747683 - Don't unload the plugin library right before exiting the plugin process, because some plugins are using atexit handlers, r=josh 2012-06-13 15:03:03 -07:00
Sriram Ramasubramanian
64c4592e04 Bug 760267: Using proper naming convention for non-static menu variable. r=mfinkle r=blassey 2012-06-13 13:28:00 -07:00
Sriram Ramasubramanian
acd1901e47 Bug 760267: Making the menu variable a member variable than a static variable. r=blassey 2012-06-13 12:58:57 -07:00
Ryan VanderMeulen
3b596c5f53 Bug 764243 - Upgrade SQLite to version 3.7.13 (Mozilla changes). r=mak 2012-06-13 16:54:13 -04:00
Ryan VanderMeulen
ef098f25c3 Bug 764243 - Upgrade SQLite to version 3.7.13 (SQLite changes). r=mak 2012-06-13 16:53:27 -04:00
Matt Brubeck
cee86ebe22 Merge last green changeset from inbound to mozilla-central 2012-06-13 13:23:54 -07:00
L. David Baron
d4e4ff4aca Don't mark intrinsic widths dirty for font inflation width changes at box/block boundaries. (Bug 764354) r=bzbarsky 2012-06-13 12:49:41 -07:00
Scott Johnson
f79662623a Bug 733614: Whitespace change after backout of bug 695222. [r=none, whitespace-only, DONTBUILD] 2012-06-13 12:14:31 -05:00
Brian R. Bondy
4f18864be4 Bug 763474 - Firefox win32 l10n builds broken because Win2008R2 check not avail in NSIS 2.33. r=jimm 2012-06-13 12:33:15 -04:00
Scott Johnson
2332c9b000 Bug 733614: Backout changes from bug 695222 for mozilla 16 branch [r=dbaron]. 2012-06-13 11:00:56 -05:00
Myk Melez
29e57e06fc bug 755557 - support blocklisting flash versions; r=Unfocused 2012-06-13 08:50:15 -07:00
Gregory Szorc
c2d4d3532f Merge s-c into m-c 2012-06-13 08:37:44 -07:00
Gregory Szorc
239c666dc2 Merge m-c into s-c 2012-06-13 08:35:44 -07:00
Honza Bambas
1c2c744520 Bug 729182 - Followup - MPL2 headers, r=Ms2ger 2012-06-13 17:35:31 +02:00
Tim Taubert
3cc384cd72 merge m-c to fx-team 2012-06-13 15:34:08 +02:00
Cody Brocious
25d0f0e95b Bug 745137: Direct texturing for Gonk through gralloc, pref'd off. r=cjones 2012-06-12 21:20:27 -07:00
Ryan VanderMeulen
e5b407b3cc Backout ed4548cac45f (bug 764527) due to robocop perma-orange. 2012-06-13 21:32:14 -04:00
Oleg Romashin
f738c661cd Bug 763156 - Remove QSound and QtMultimedia dependency from Qt port. r=dougt 2012-06-12 22:58:16 -04:00
Sriram Ramasubramanian
d5ac673322 Bug 763851: Forward button's background MIA in tabs UI. [r=mfinkle] 2012-06-12 22:48:47 -07:00
Sriram Ramasubramanian
7f7be1da2f Bug 763049: Tablet animation should slide on phones, slide and shrink on tablets. [r=mfinkle] 2012-06-12 22:47:52 -07:00
Sriram Ramasubramanian
4f26fb1abb Bug 762955: Fixed height for tabs UI on phones. [r=mfinkle] 2012-06-12 22:29:23 -07:00
Sriram Ramasubramanian
b25e3f3ff0 Bug 762725: Tabs UI needs new plus icons. [r=mfinkle] 2012-06-12 15:59:02 -07:00
Sriram Ramasubramanian
fdabebe07c Bug 762725: Tabs UI need new sync icons. [r=mfinkle] 2012-06-12 15:58:24 -07:00
Chris Jones
27eb2547d2 Backed out changeset beba1a053f5e 2012-06-12 21:40:40 -07:00
Cody Brocious
607697b6ba Bug 745137: Direct texturing for Gonk through gralloc, pref'd off. r=cjones 2012-06-12 21:20:27 -07:00
Ehsan Akhgari
5f1dca309f Bug 758992 - Make the classes which use the XPCOM nsISupports implementation macros final, to avoid the warning about deleting using a pointer to a base class with virtual functions and no virtual dtor (uriloader parts); r=bzbarsky 2012-06-12 23:53:09 -04:00
Richard Newman
93fec4c994 Merge m-c to s-c. 2012-06-12 10:16:39 -07:00
Nathan Froyd
eafe48137b Bug 763991 - add MOZ_TELEMETRY_REPORTING=1 to mobile mozconfigs; r=blassey 2012-06-12 12:48:40 -04:00
Matt Brubeck
3f051f8536 Bug 763991 - Disable Telemetry UI for builds without MOZ_TELEMETRY_REPORTING; r=mfinkle
--HG--
rename : mobile/android/base/resources/xml/preferences.xml => mobile/android/base/resources/xml/preferences.xml.in
2012-06-13 08:27:11 -07:00
Ed Morley
283e84e0e8 Backout a55eea2c294d (bug 627699) for bustage 2012-06-13 16:07:22 +01:00