Commit Graph

398461 Commits

Author SHA1 Message Date
Randell Jesup
7cbc61a973 Bug 1109552: Fix incorrect scoped_ptr type (uint8_t array vs ptr) r=glandium 2014-12-23 18:16:02 -05:00
Nathan Froyd
8748a005b3 Bug 1114598 - move common IPDL file handling from recursivemake.py to common.py; r=gps
The recursivemake backend knows how to do several things with the IPDL
sources:

1) Determine the C++ sources that will be generated from given IPDL
   sources.
2) Write out all the makefile rules and variables for said sources.

The first part isn't unique to the recursivemake backend; other backends
would eventually like to know what C++ sources come from IPDL source
files for easier cross-referencing purposes, etc.  Let's take a first
cut at moving things into CommonBackend.  (This may not be the best
interface, since it relies on consume_finished being invoked, and not
all backends call CommonBackend.consume_finished.  Still, it's a start.)
2014-12-22 10:00:48 -05:00
Nathan Froyd
de2ba33faa Bug 1114596 - don't define GENERATED_INCLUDES in ipc/ipdl/moz.build; r=gps
The common include file /ipc/chromium/chromium-config.mozbuild already
defines this variable for us, and there's no point in telling the
compiler to look twice in the same directory for includes.
2014-12-22 09:59:34 -05:00
Nathan Froyd
204603bd32 Bug 1113730 - fix TypeError in the visualstudio backend; r=gps,f=philip.chee 2014-12-19 12:21:22 -05:00
Wes Kocher
0710669f0c Merge m-c to inbound a=merge CLOSED TREE 2014-12-23 16:54:09 -08:00
Wes Kocher
ab27d8e9b0 Merge inbound to mozilla-central a=merge CLOSED TREE 2014-12-23 16:47:42 -08:00
Wes Kocher
ce6e0dc416 Merge b2g-inbound to mozilla-central a=merge CLOSED TREE 2014-12-23 16:36:48 -08:00
Wes Kocher
f5c5fde40d Backed out changeset 45798e9a16c2 (bug 1114989) for mochitest-e10s-3 failures on a CLOSED TREE 2014-12-23 16:12:24 -08:00
Wes Kocher
de5ffe05db Backed out changeset 5910d49fed08 (bug 1114989) 2014-12-23 16:11:48 -08:00
Ehsan Akhgari
76b581d963 Bug 1114989 follow-up: fix the build bustage; landed on a CLOSED TREE
--HG--
extra : rebase_source : 47cc94e393c8d90584f1f2fc49d9732860a3278a
2014-12-23 18:18:22 -05:00
B2G Bumper Bot
d6d3be481e Bumping manifests a=b2g-bump 2014-12-23 13:19:04 -08:00
Ryan VanderMeulen
9efa5f5a79 Backed out changesets 248e0f88fa0a and 41995e096743 (bug 1033952) for B2G debug asserts/crashes. 2014-12-23 16:15:38 -05:00
Nick Alexander
694a293c49 Bug 1115064 - Fix small errors and make Gradle integration work in Android Studio 1.0.2. r=me
The important change here is that we allow the Android-Gradle plugin
to be version 0.14.4 or version 1.0.0, which appears to work in
IntelliJ 14.0.2 and in Android Studio 1.0.2.

Testing feedback came from imjalpreet and garvank.

--HG--
extra : rebase_source : 2b93dd91603666f1c6a1d2fe0fa7721d5741bdda
2014-12-23 11:39:15 -08:00
Kyle Machulis
8c0529c446 Bug 1098220 - Only print exception message in SettingsService in exceptional situations; r=gerard-majax 2014-12-23 11:11:20 -08:00
B2G Bumper Bot
b3a4cb616e Bumping manifests a=b2g-bump 2014-12-23 10:56:54 -08:00
B2G Bumper Bot
2ca81e770d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/71b84df868bb
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #26700 from Delphine/patch-4

Bug 1067554 / Bug Bug 1109383: Adding fi, hy-Am, ee, wo and ln locales t...

========

https://hg.mozilla.org/integration/gaia-central/rev/3023d02b77fd
Author: Delphine <delphine@mozilla.com>
Desc: Bug 1067554 / Bug Bug 1109383: Adding fi, hy-Am, ee, wo and ln locales to Firefox OS
2014-12-23 10:52:15 -08:00
Ryan VanderMeulen
42a3e6c0ea Merge m-c to inbound. a=merge 2014-12-23 13:18:02 -05:00
Ryan VanderMeulen
539cbb2493 Merge inbound to m-c. a=merge 2014-12-23 13:17:16 -05:00
Carsten "Tomcat" Book
405ad2ed16 merge fx-team to mozilla-inbound a=merge 2014-12-23 16:04:26 +01:00
Carsten "Tomcat" Book
5ea9eda8dd merge b2g-inbound to mozilla-central a=merge 2014-12-23 15:50:00 +01:00
Carsten "Tomcat" Book
693c44368a Backed out changeset 39853e6515eb (bug 1073003) for breaking B2G non-unified builds on a CLOSED TREE 2014-12-23 13:36:00 +01:00
Carsten "Tomcat" Book
45a3193668 Backed out changeset 4f6693a2f21b (bug 1073003) 2014-12-23 13:35:23 +01:00
Carsten "Tomcat" Book
ee357ede50 Backed out changeset a12d10d57fd5 (bug 1073003) 2014-12-23 13:35:18 +01:00
Carsten "Tomcat" Book
4d35b56fd1 Backed out changeset 07b42d1d60aa (bug 1073003) 2014-12-23 13:35:17 +01:00
Carsten "Tomcat" Book
6c63afac81 Backed out changeset d778ea49056a (bug 1073003) 2014-12-23 13:35:15 +01:00
Carsten "Tomcat" Book
c892ecf785 Backed out changeset 033bfc2c3483 (bug 1073003) 2014-12-23 13:35:13 +01:00
Carsten "Tomcat" Book
5df02ec579 Backed out changeset a0ef52a09f98 (bug 1073003) 2014-12-23 13:35:11 +01:00
Carsten "Tomcat" Book
d4099a3098 Backed out changeset 42e5e10c44f5 (bug 1073003) 2014-12-23 13:35:07 +01:00
Carsten "Tomcat" Book
bf58b7f6ca Backed out changeset aef3ce3b89b9 (bug 1073003) 2014-12-23 13:35:05 +01:00
Carsten "Tomcat" Book
86c35b85c1 Backed out changeset 3d81c5b78567 (bug 1073003) 2014-12-23 13:35:04 +01:00
Carsten "Tomcat" Book
2ab649cfb7 Backed out changeset ad0bb596da2c (bug 1073003) 2014-12-23 13:35:02 +01:00
Carsten "Tomcat" Book
42f8b57b0a Backed out changeset 4902a8efe178 (bug 1073003) 2014-12-23 13:34:57 +01:00
Carsten "Tomcat" Book
619828717a Backed out changeset 232c0f30075c (bug 1031203) for j1 test failures 2014-12-23 11:51:29 +01:00
Carsten "Tomcat" Book
592726d322 Backed out changeset 776c989112f1 (bug 1031203) 2014-12-23 11:51:08 +01:00
Bobby Holley
51e382d00c Bug 1114830 - Only enter buffering mode when the pending request is waiting for data. r=cpearce a=philor 2014-12-22 20:54:01 -08:00
B2G Bumper Bot
0eec681d66 Bumping manifests a=b2g-bump 2014-12-22 20:19:04 -08:00
B2G Bumper Bot
1c6d57438c Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/51051a09cdd5
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #26953 from dominickuo/bug-1092969

Bug 1092969 - [Music] only enable the text selection in the tiles and list search inputs, r=jimporter

========

https://hg.mozilla.org/integration/gaia-central/rev/29560fe9d77f
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Bug 1092969 - [Music] only enable the text selection in the tiles and list search inputs
2014-12-22 20:18:47 -08:00
Wes Kocher
e9cc9d9d1d Merge inbound to m-c to fix wError bustage a=merge CLOSED TREE 2014-12-22 15:31:29 -08:00
Ryan VanderMeulen
93534bdf01 Merge inbound to m-c. a=merge 2014-12-22 17:55:32 -05:00
Ryan VanderMeulen
f9e95a3452 Merge fx-team to m-c. a=merge 2014-12-22 17:35:26 -05:00
Richard Newman
d55f7227af Backed out changeset 93840f9b5af8 (bug 909434) for causing five new bugs. 2014-12-22 12:40:32 -08:00
Margaret Leibovic
2f802d5beb Bug 1113844 - Fix parameters in showInAboutDownloads call. r=mfinkle
--HG--
extra : rebase_source : 242b937e4722c4231eac183a3910f665f898c588
2014-12-22 15:07:24 -05:00
Margaret Leibovic
ab4715e09d Bug 1114593 - Replace defaultDownloadsDirectory calls in DirectoryProvider.js. r=mfinkle
--HG--
extra : rebase_source : 8e6574838cafecc5c26ed68a1d1a4b3cb6a6a617
2014-12-22 14:59:03 -05:00
Margaret Leibovic
18bdf973b0 Bug 1114506 - Update Sanitizer.jsm to use Downloads.jsm to clear downloads. r=mfinkle
--HG--
extra : rebase_source : 6a491763ce64715ea53ec76f6b9e116d25089cae
2014-12-22 16:14:32 -05:00
B2G Bumper Bot
880c471b34 Bumping manifests a=b2g-bump 2014-12-22 11:06:58 -08:00
B2G Bumper Bot
4d1767818e Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b60aedd37a5c
Author: Guillaume C. Marty <gmarty@users.noreply.github.com>
Desc: Merge pull request #26883 from gmarty/Bug-1093958-Lockscreen-only-displays-battery-icon-not-other-icons

Bug 1093958 - Lockscreen only displays battery icon, not other icons

========

https://hg.mozilla.org/integration/gaia-central/rev/079728f35f27
Author: Guillaume Marty <edo999@gmail.com>
Desc: Bug 1093958 - Lockscreen only displays battery icon, not other icons
2014-12-22 11:02:16 -08:00
B2G Bumper Bot
b1a0a0363a Bumping manifests a=b2g-bump 2014-12-22 10:36:56 -08:00
Margaret Leibovic
a55507efbe Bug 1114589 - Add compatibility layer for Uri.getQueryParameterNames. r=rnewman
--HG--
extra : rebase_source : 3b7d1fa11409cf3de9855df3a6575319b5a6f93c
2014-12-22 13:35:41 -05:00
Neil Deakin
fdf8d9d458 Bug 1066383, fix warning, CLOSED TREE 2014-12-22 13:29:23 -05:00
B2G Bumper Bot
37ee010f53 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/21dadcc13619
Author: Johan Lorenzo <jlorenzo@mozilla.com>
Desc: Revert "Bug 1114560 - Add a test to delete the whole phone number on the dialer"

This reverts commit 69bd4c80954e3ba48f8ce71f24939108f1e69829.
2014-12-22 10:27:17 -08:00