From 8161615fdf5e858cae61c470e52c44e3809b492b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 10:40:10 -0800 Subject: [PATCH 01/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/aecdb3f6cbde Author: Diego Marcos Desc: Merge pull request #15856 from dmarcos/bug961620 Bug 961620 - Pick activity sends the first picture taken instead of the ... ======== https://hg.mozilla.org/integration/gaia-central/rev/a3a8b1f2eacb Author: Diego Marcos Desc: Bug 961620 - Pick activity sends the first picture taken instead of the last one --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 276defb6962a..3d37a68e85de 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "a4d9c73e176e7dfc9a32d362f0f5e5cb5c21e323", + "revision": "aecdb3f6cbdef00b705a079d9875378a5b5c6d67", "repo_path": "/integration/gaia-central" } From 88e34eb25ef4a819d57523cbd065b6b70b4b2238 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 10:41:07 -0800 Subject: [PATCH 02/39] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index d8c010a1410d..ec434e02643c 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index d3c18c3d7024..8f0acb55e9fc 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index d8c010a1410d..ec434e02643c 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index c8d7a7031cbb..53679bd687e5 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index d37ae23616c1..19d2b6aafcd4 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 8ac9fafdde4b..9f8c7ece92f6 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index ee606c90c835..f0d8cd1f08e5 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 260f35b8163b..5e943c263bc7 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 389e5d1ec6d8..c57f709e32d1 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 493e726cb9a17aedca545bc66bdce11c7be73a4b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 11:05:10 -0800 Subject: [PATCH 03/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4073a9939e89 Author: Justin D'Arcangelo Desc: Merge pull request #15876 from justindarc/bug957709 Patch to throttle launching of Gallery activity (Bug 957709) ======== https://hg.mozilla.org/integration/gaia-central/rev/5565cefafd9e Author: Justin D'Arcangelo Desc: Patch to throttle launching of Gallery activity (Bug 957709) Patched Gallery for 1.4. --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 3d37a68e85de..e5b8c6a5545b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "aecdb3f6cbdef00b705a079d9875378a5b5c6d67", + "revision": "4073a9939e89835380d1ceff9042244e4ea10dc7", "repo_path": "/integration/gaia-central" } From c750bd8ea2d242682a4ff846779616f45e282e1b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 11:11:00 -0800 Subject: [PATCH 04/39] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index ec434e02643c..793d97174865 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 8f0acb55e9fc..bfd234dffd85 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index ec434e02643c..793d97174865 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 53679bd687e5..10e544513790 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 19d2b6aafcd4..72b11b7dce4a 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 9f8c7ece92f6..0a917d5c472d 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index f0d8cd1f08e5..40177d084da6 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 5e943c263bc7..1d3fd2092eec 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index c57f709e32d1..292f50bb3a71 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From dd5769adb7c9ef9f864cf579da6601c72aa9b79b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 11:16:02 -0800 Subject: [PATCH 05/39] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 793d97174865..14f70c5ee1a4 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index bfd234dffd85..3dc910461d72 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -14,7 +14,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 793d97174865..14f70c5ee1a4 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 10e544513790..f3b24b274d75 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -16,7 +16,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 0a917d5c472d..4474c2cb05b0 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 40177d084da6..6789dbd09118 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -16,7 +16,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 1d3fd2092eec..dd1a5f934d36 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -14,7 +14,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 292f50bb3a71..0c5664e565f5 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -16,7 +16,7 @@ - + From 6ce92b7a6a619b76e52282640fda6695de087ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Jim=C3=A9nez?= Date: Tue, 4 Feb 2014 20:32:16 +0100 Subject: [PATCH 06/39] Bug 967503 - Make HawkClient work in b2g. r=rnewman --- services/common/hawk.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/common/hawk.js b/services/common/hawk.js index a13298d16520..3c1d4d8e4b9e 100644 --- a/services/common/hawk.js +++ b/services/common/hawk.js @@ -45,7 +45,7 @@ Cu.import("resource://gre/modules/Promise.jsm"); * @param host * The url of the host */ -function HawkClient(host) { +this.HawkClient = function(host) { this.host = host; // Clock offset in milliseconds between our client's clock and the date @@ -53,7 +53,7 @@ function HawkClient(host) { this._localtimeOffsetMsec = 0; } -HawkClient.prototype = { +this.HawkClient.prototype = { /* * Construct an error message for a response. Private. From 040f81b463ac09f9ebc32e313e2097bbbf58c7bc Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 12:05:10 -0800 Subject: [PATCH 07/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4911c21ba545 Author: Jose Antonio Olivera Ortega Desc: Merge pull request #15869 from jaoo/947855 Bug 947855 - Automatic selection of APN relying on the IMSI code in the ICC card. r=kaze ======== https://hg.mozilla.org/integration/gaia-central/rev/17bc67b516e0 Author: Jose Antonio Olivera Ortega Desc: Bug 947855 - Automatic selection of APN relying on the IMSI code in the ICC card --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index e5b8c6a5545b..eb9fc2f468e5 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "4073a9939e89835380d1ceff9042244e4ea10dc7", + "revision": "4911c21ba5454eae8d6335377c6a9458fa7c8195", "repo_path": "/integration/gaia-central" } From 9ed75d04e7925caf88353b42d7dd1fcd0be4f838 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 12:11:04 -0800 Subject: [PATCH 08/39] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 14f70c5ee1a4..d437e470bb13 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 3dc910461d72..60628313ebce 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 14f70c5ee1a4..d437e470bb13 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index f3b24b274d75..8d8106e36faf 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 72b11b7dce4a..7f42e85f69a3 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 4474c2cb05b0..56bac89eb1b1 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 6789dbd09118..bd9972a7e7ae 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index dd1a5f934d36..2ea32ba602fd 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 0c5664e565f5..d3871067ccfd 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From cae082adc6767f90adeff3fa733dd9b42e3c11dd Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 13:35:10 -0800 Subject: [PATCH 09/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/4a117a1a34bd Author: Mihai Cîrlănaru Desc: Merge pull request #9343 from mihai/bug_846595 Bug 846595 - [BB] Align value-selector tick to left for RTL languages… r=@rnowm ======== https://hg.mozilla.org/integration/gaia-central/rev/b053ba6fa055 Author: Mihai Cirlanaru Desc: Bug 846595 - [BB] Align value-selector tick to left for RTL languages (i.e. Arabic). r=arnau --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index eb9fc2f468e5..657055b718a9 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "4911c21ba5454eae8d6335377c6a9458fa7c8195", + "revision": "4a117a1a34bd1b581e2b0e11e5a6554d6fffa8f8", "repo_path": "/integration/gaia-central" } From 9d6fa40f3fbc30c83d9b4e8143ae7f567a04f265 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 13:41:09 -0800 Subject: [PATCH 10/39] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index d437e470bb13..d6e7c2eb5b7c 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 60628313ebce..da2095c4ec02 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index d437e470bb13..d6e7c2eb5b7c 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 8d8106e36faf..f1fb2c5c975c 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 7f42e85f69a3..2f02ab99dc07 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 56bac89eb1b1..6013f8fc8189 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index bd9972a7e7ae..01d003dee6e2 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 2ea32ba602fd..c54bcb757109 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index d3871067ccfd..60c684203c9a 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 394e1c4f5de1db32cfcd7b4250259124deead89d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 14:00:11 -0800 Subject: [PATCH 11/39] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b7aaa057a974 Author: Zac Desc: Merge pull request #15832 from zacc/bug959217 Bug 959217 - Switch tests to the new Marionette Wait class ======== https://hg.mozilla.org/integration/gaia-central/rev/a68b1549db02 Author: Zac Campbell Desc: Bug 959217 - Switch tests to the new Marionette Wait class (refine dhunt's pull) ======== https://hg.mozilla.org/integration/gaia-central/rev/2e27bb5f7d76 Author: Dave Hunt Desc: Bug 959217 - Switch tests to the new Marionette Wait class. r=bsilverberg r=zcampbell --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 657055b718a9..686866c9bdb7 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "4a117a1a34bd1b581e2b0e11e5a6554d6fffa8f8", + "revision": "b7aaa057a97424c8253b15f5e114a6cca3bc9931", "repo_path": "/integration/gaia-central" } From d4f16ce1f1b041fb734ebd8782e478de7fa3f9f0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 14:06:00 -0800 Subject: [PATCH 12/39] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index d6e7c2eb5b7c..b0a9a1226d0e 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index da2095c4ec02..a5d7cb4158cc 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index d6e7c2eb5b7c..b0a9a1226d0e 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index f1fb2c5c975c..c1a8e45263ac 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 2f02ab99dc07..4ae94e7bbd16 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 6013f8fc8189..40c92e74821e 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 01d003dee6e2..21b851692acb 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index c54bcb757109..4083e59a059f 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 60c684203c9a..173cdaa9321f 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From a7789f158cdaf0cafb2793ebde9cae73d44430f3 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 14:50:11 -0800 Subject: [PATCH 13/39] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/3bf11691dd7c Author: Arnau Desc: Merge pull request #15862 from rnowm/966217 Bug 966217 - [VDR] Change bottom background where buttons sit ======== https://hg.mozilla.org/integration/gaia-central/rev/758c821a561e Author: rnowm Desc: Bug 966217 - [VDR] Change bottom background where buttons sit ======== https://hg.mozilla.org/integration/gaia-central/rev/1d3ec6e9f932 Author: Casey Yee Desc: Merge pull request #15830 from caseyyee/bug-962366 Bug 962366 - Replace software home button with something that is not the... ======== https://hg.mozilla.org/integration/gaia-central/rev/b5962b7c7de2 Author: Casey Yee Desc: Bug 962366 - Replace software home button with something that is not the browser icon --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 686866c9bdb7..026d5c5bde50 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "b7aaa057a97424c8253b15f5e114a6cca3bc9931", + "revision": "3bf11691dd7c70e007e247c59217d70fbdd9689c", "repo_path": "/integration/gaia-central" } From 1d1b447feae8d282b0227390ec1a5101b04bad66 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 14:56:28 -0800 Subject: [PATCH 14/39] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index b0a9a1226d0e..130df235c553 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index a5d7cb4158cc..0b962d0d65ae 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index b0a9a1226d0e..130df235c553 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index c1a8e45263ac..1a374dd3e3e9 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 4ae94e7bbd16..d6697acccf27 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 40c92e74821e..8b71019d371e 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 21b851692acb..574c156ab51e 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 4083e59a059f..f41948f404e2 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 173cdaa9321f..7997cdf349d8 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 0d364de614280bfc125b88ced42dab1ec3e0801a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 15:40:10 -0800 Subject: [PATCH 15/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8720f41b0ad5 Author: Kevin Grandon Desc: Merge pull request #15949 from KevinGrandon/bug_967579_indentation Bug 967579 - Build test code style ======== https://hg.mozilla.org/integration/gaia-central/rev/72e80c60e8a3 Author: Kevin Grandon Desc: Bug 967579 - Build test code style r=ochameau --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 026d5c5bde50..ca399195e74e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "3bf11691dd7c70e007e247c59217d70fbdd9689c", + "revision": "8720f41b0ad52dbc3c9f59d44a9a8f257cb01136", "repo_path": "/integration/gaia-central" } From 129f670a8c878c36afbd630e239dee91a954204c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 15:46:00 -0800 Subject: [PATCH 16/39] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 130df235c553..01b5a9a8f22c 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 0b962d0d65ae..ea651b0a1528 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 130df235c553..01b5a9a8f22c 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 1a374dd3e3e9..9ba728a5277f 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index d6697acccf27..e50f80b448e8 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 8b71019d371e..1b921abc9526 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 574c156ab51e..270901ba6aa0 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index f41948f404e2..7587c603f28f 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 7997cdf349d8..87cb874e3b0e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From ad38d329537d501ad5a0fb625462814176abdd84 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 16:24:12 -0800 Subject: [PATCH 17/39] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/cef0c9746df8 Author: Zac Desc: Bug 967908 Fix timing in test_sms_contact_validation r=me a=testonly --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index ca399195e74e..6fefcab7b676 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "8720f41b0ad52dbc3c9f59d44a9a8f257cb01136", + "revision": "cef0c9746df83433d45220f9556ca32377ad9943", "repo_path": "/integration/gaia-central" } From f5c6f972a8f2bb38460bb29bef7b3f3a84030d73 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 16:24:20 -0800 Subject: [PATCH 18/39] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 01b5a9a8f22c..ea6454f721d8 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index ea651b0a1528..1868c5747d68 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 01b5a9a8f22c..ea6454f721d8 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 9ba728a5277f..fa6e11955948 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index e50f80b448e8..b1932312f93c 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 1b921abc9526..9c469337b661 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 270901ba6aa0..4101a4786f62 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 7587c603f28f..e1492edefed4 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 87cb874e3b0e..de7164305ad3 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 882b8bdc1c6fed78290e82866b7331172495091d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 16:30:10 -0800 Subject: [PATCH 19/39] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/569e03bef166 Author: Jonathan Griffin Desc: Bug 947855 - Revert "Merge pull request #15869 from jaoo/947855" for gaia-unit bustage on TBPL. This reverts commit 8b298d51cb928f92b216b0f47e75d224568b9dfb, reversing changes made to 853a44a11f04974086a1105b54393a1b171db05e. --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 6fefcab7b676..8bb398ffdf2e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "cef0c9746df83433d45220f9556ca32377ad9943", + "revision": "569e03bef166c428bf4c7a2fda5486602010cc27", "repo_path": "/integration/gaia-central" } From 207d667ee5549df91e2d5927c28e4c589bc7131f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 16:36:16 -0800 Subject: [PATCH 20/39] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index ea6454f721d8..438a7f2c36f5 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 1868c5747d68..ae5245348d4b 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index ea6454f721d8..438a7f2c36f5 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index fa6e11955948..cf5e29378951 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index b1932312f93c..e2bfae075117 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 9c469337b661..a4ed158eeb32 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 4101a4786f62..1174b83f4752 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index e1492edefed4..f33ec05d7bcd 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index de7164305ad3..7b9583460756 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 58174b5241879dbd53e5235c5c695d2ea987d1f4 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 18:20:10 -0800 Subject: [PATCH 21/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/82fec5898683 Author: John Hu Desc: Merge pull request #15631 from huchengtw-moz/gallery/Bug_948362_nfc_sharing Bug 948362 - [Gaia][Gallery] gallery application: handle data transfer, r=dmarcos ======== https://hg.mozilla.org/integration/gaia-central/rev/4529ef9d5547 Author: John Hu Desc: Bug 948362 - [Gaia][Gallery] gallery application: handle data transfer --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 8bb398ffdf2e..06868751f9a7 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "569e03bef166c428bf4c7a2fda5486602010cc27", + "revision": "82fec589868343b8911581737b4dde0396050ab9", "repo_path": "/integration/gaia-central" } From b56cbbed2c7bbd14ac3f5b66e4e8b0f04e81261c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 18:26:03 -0800 Subject: [PATCH 22/39] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 438a7f2c36f5..fb764c1f2af6 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index ae5245348d4b..ddcb3aeeb6dc 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 438a7f2c36f5..fb764c1f2af6 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index cf5e29378951..a80106a32202 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index e2bfae075117..ed5a427b3001 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index a4ed158eeb32..266432f22da6 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 1174b83f4752..8c19026c203d 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index f33ec05d7bcd..f5861fc7a561 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 7b9583460756..1f7dadc38f5b 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 893e6c69e7f5d230b8b959d29b2fe7f1e91a13a9 Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Tue, 4 Feb 2014 23:10:43 -0500 Subject: [PATCH 23/39] Bug 960873: Part 2: Create AudioCompactor class to minimize allocation slop. r=cpearce Based on original patch written by :gal. --- content/media/AudioCompactor.cpp | 72 ++++++++++++ content/media/AudioCompactor.h | 121 +++++++++++++++++++++ content/media/MediaDecoderReader.cpp | 4 +- content/media/MediaDecoderReader.h | 7 ++ content/media/MediaDecoderStateMachine.cpp | 7 ++ content/media/MediaDecoderStateMachine.h | 7 ++ content/media/moz.build | 2 + 7 files changed, 218 insertions(+), 2 deletions(-) create mode 100644 content/media/AudioCompactor.cpp create mode 100644 content/media/AudioCompactor.h diff --git a/content/media/AudioCompactor.cpp b/content/media/AudioCompactor.cpp new file mode 100644 index 000000000000..1164f862aa46 --- /dev/null +++ b/content/media/AudioCompactor.cpp @@ -0,0 +1,72 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "AudioCompactor.h" +#if defined(MOZ_MEMORY) +# include "mozmemory.h" +#endif + +namespace mozilla { + +static size_t +MallocGoodSize(size_t aSize) +{ +# if defined(MOZ_MEMORY) + return malloc_good_size(aSize); +# else + return aSize; +# endif +} + +static size_t +TooMuchSlop(size_t aSize, size_t aAllocSize, size_t aMaxSlop) +{ + // If the allocated size is less then our target size, then we + // are chunking. This means it will be completely filled with + // zero slop. + size_t slop = (aAllocSize > aSize) ? (aAllocSize - aSize) : 0; + return slop > aMaxSlop; +} + +uint32_t +AudioCompactor::GetChunkSamples(uint32_t aFrames, uint32_t aChannels, + size_t aMaxSlop) +{ + size_t size = AudioDataSize(aFrames, aChannels); + size_t chunkSize = MallocGoodSize(size); + + // Reduce the chunk size until we meet our slop goal or the chunk + // approaches an unreasonably small size. + while (chunkSize > 64 && TooMuchSlop(size, chunkSize, aMaxSlop)) { + chunkSize = MallocGoodSize(chunkSize / 2); + } + + // Calculate the number of samples based on expected malloc size + // in order to allow as many frames as possible to be packed. + return chunkSize / sizeof(AudioDataValue); +} + +uint32_t +AudioCompactor::NativeCopy::operator()(AudioDataValue *aBuffer, size_t aSamples) +{ + NS_ASSERTION(aBuffer, "cannot copy to null buffer pointer"); + NS_ASSERTION(aSamples, "cannot copy zero values"); + + size_t bufferBytes = aSamples * sizeof(AudioDataValue); + size_t maxBytes = std::min(bufferBytes, mSourceBytes - mNextByte); + uint32_t frames = maxBytes / BytesPerFrame(mChannels); + size_t bytes = frames * BytesPerFrame(mChannels); + + NS_ASSERTION((mNextByte + bytes) <= mSourceBytes, + "tried to copy beyond source buffer"); + NS_ASSERTION(bytes <= bufferBytes, "tried to copy beyond destination buffer"); + + memcpy(aBuffer, mSource + mNextByte, bytes); + + mNextByte += bytes; + return frames; +} + +} // namespace mozilla diff --git a/content/media/AudioCompactor.h b/content/media/AudioCompactor.h new file mode 100644 index 000000000000..99e89508a08b --- /dev/null +++ b/content/media/AudioCompactor.h @@ -0,0 +1,121 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#if !defined(AudioCompactor_h) +#define AudioCompactor_h + +#include "MediaQueue.h" +#include "MediaData.h" +#include "VideoUtils.h" + +namespace mozilla { + +class AudioCompactor +{ +public: + AudioCompactor(MediaQueue& aQueue) + : mQueue(aQueue) + { } + + // Push audio data into the underlying queue with minimal heap allocation + // slop. This method is responsible for allocating AudioDataValue[] buffers. + // The caller must provide a functor to copy the data into the buffers. The + // functor must provide the following signature: + // + // uint32_t operator()(AudioDataValue *aBuffer, size_t aSamples); + // + // The functor must copy as many complete frames as possible to the provided + // buffer given its length (in AudioDataValue elements). The number of frames + // copied must be returned. This copy functor must support being called + // multiple times in order to copy the audio data fully. The copy functor + // must copy full frames as partial frames will be ignored. + template + bool Push(int64_t aOffset, int64_t aTime, int32_t aSampleRate, + uint32_t aFrames, uint32_t aChannels, CopyFunc aCopyFunc) + { + // If we are losing more than a reasonable amount to padding, try to chunk + // the data. + size_t maxSlop = AudioDataSize(aFrames, aChannels) / MAX_SLOP_DIVISOR; + + while (aFrames > 0) { + uint32_t samples = GetChunkSamples(aFrames, aChannels, maxSlop); + nsAutoArrayPtr buffer(new AudioDataValue[samples]); + + // Copy audio data to buffer using caller-provided functor. + uint32_t framesCopied = aCopyFunc(buffer, samples); + + NS_ASSERTION(framesCopied <= aFrames, "functor copied too many frames"); + + CheckedInt64 duration = FramesToUsecs(framesCopied, aSampleRate); + if (!duration.isValid()) { + return false; + } + + mQueue.Push(new AudioData(aOffset, + aTime, + duration.value(), + framesCopied, + buffer.forget(), + aChannels)); + + // Remove the frames we just pushed into the queue and loop if there is + // more to be done. + aTime += duration.value(); + aFrames -= framesCopied; + + // NOTE: No need to update aOffset as its only an approximation anyway. + } + + return true; + } + + // Copy functor suitable for copying audio samples already in the + // AudioDataValue format/layout expected by AudioStream on this platform. + class NativeCopy + { + public: + NativeCopy(const uint8_t* aSource, size_t aSourceBytes, + uint32_t aChannels) + : mSource(aSource) + , mSourceBytes(aSourceBytes) + , mChannels(aChannels) + , mNextByte(0) + { } + + uint32_t operator()(AudioDataValue *aBuffer, size_t aSamples); + + private: + const uint8_t* const mSource; + const size_t mSourceBytes; + const uint32_t mChannels; + size_t mNextByte; + }; + + // Allow 12.5% slop before chunking kicks in. Public so that the gtest can + // access it. + static const size_t MAX_SLOP_DIVISOR = 8; + +private: + // Compute the number of AudioDataValue samples that will be fit the most + // frames while keeping heap allocation slop less than the given threshold. + static uint32_t + GetChunkSamples(uint32_t aFrames, uint32_t aChannels, size_t aMaxSlop); + + static size_t BytesPerFrame(uint32_t aChannels) + { + return sizeof(AudioDataValue) * aChannels; + } + + static size_t AudioDataSize(uint32_t aFrames, uint32_t aChannels) + { + return aFrames * BytesPerFrame(aChannels); + } + + MediaQueue &mQueue; +}; + +} // namespace mozilla + +#endif // AudioCompactor_h diff --git a/content/media/MediaDecoderReader.cpp b/content/media/MediaDecoderReader.cpp index 0a6200dcc28f..6856bc0004e8 100644 --- a/content/media/MediaDecoderReader.cpp +++ b/content/media/MediaDecoderReader.cpp @@ -45,7 +45,8 @@ void* MediaDecoderReader::VideoQueueMemoryFunctor::operator()(void* anObject) { } MediaDecoderReader::MediaDecoderReader(AbstractMediaDecoder* aDecoder) - : mDecoder(aDecoder), + : mAudioCompactor(mAudioQueue), + mDecoder(aDecoder), mIgnoreAudioOutputFormat(false) { MOZ_COUNT_CTOR(MediaDecoderReader); @@ -280,4 +281,3 @@ MediaDecoderReader::GetBuffered(mozilla::dom::TimeRanges* aBuffered, } } // namespace mozilla - diff --git a/content/media/MediaDecoderReader.h b/content/media/MediaDecoderReader.h index 0176048ac49a..957c5a07760e 100644 --- a/content/media/MediaDecoderReader.h +++ b/content/media/MediaDecoderReader.h @@ -10,6 +10,7 @@ #include "MediaInfo.h" #include "MediaData.h" #include "MediaQueue.h" +#include "AudioCompactor.h" namespace mozilla { @@ -105,6 +106,12 @@ protected: // the decoder, state machine, and main threads. MediaQueue mVideoQueue; + // An adapter to the audio queue which first copies data to buffers with + // minimal allocation slop and then pushes them to the queue. This is + // useful for decoders working with formats that give awkward numbers of + // frames such as mp3. + AudioCompactor mAudioCompactor; + public: // Populates aBuffered with the time ranges which are buffered. aStartTime // must be the presentation time of the first frame in the media, e.g. diff --git a/content/media/MediaDecoderStateMachine.cpp b/content/media/MediaDecoderStateMachine.cpp index dff3b9481bcb..8f4386a8edb6 100644 --- a/content/media/MediaDecoderStateMachine.cpp +++ b/content/media/MediaDecoderStateMachine.cpp @@ -45,6 +45,13 @@ extern PRLogModuleInfo* gMediaDecoderLog; #define DECODER_LOG(type, msg) #endif +// GetCurrentTime is defined in winbase.h as zero argument macro forwarding to +// GetTickCount() and conflicts with MediaDecoderStateMachine::GetCurrentTime +// implementation. With unified builds, putting this in headers is not enough. +#ifdef GetCurrentTime +#undef GetCurrentTime +#endif + // Wait this number of seconds when buffering, then leave and play // as best as we can if the required amount of data hasn't been // retrieved. diff --git a/content/media/MediaDecoderStateMachine.h b/content/media/MediaDecoderStateMachine.h index dab2fc111c30..64bf7582c80a 100644 --- a/content/media/MediaDecoderStateMachine.h +++ b/content/media/MediaDecoderStateMachine.h @@ -92,6 +92,13 @@ namespace mozilla { class AudioSegment; class VideoSegment; +// GetCurrentTime is defined in winbase.h as zero argument macro forwarding to +// GetTickCount() and conflicts with MediaDecoderStateMachine::GetCurrentTime +// implementation. +#ifdef GetCurrentTime +#undef GetCurrentTime +#endif + /* The state machine class. This manages the decoding and seeking in the MediaDecoderReader on the decode thread, and A/V sync on the shared diff --git a/content/media/moz.build b/content/media/moz.build index c69932f3a8d6..98e6e58903c3 100644 --- a/content/media/moz.build +++ b/content/media/moz.build @@ -58,6 +58,7 @@ EXPORTS += [ 'AbstractMediaDecoder.h', 'AudioAvailableEventManager.h', 'AudioChannelFormat.h', + 'AudioCompactor.h', 'AudioEventTimeline.h', 'AudioNodeEngine.h', 'AudioNodeExternalInputStream.h', @@ -114,6 +115,7 @@ EXPORTS.mozilla.dom += [ UNIFIED_SOURCES += [ 'AudioAvailableEventManager.cpp', 'AudioChannelFormat.cpp', + 'AudioCompactor.cpp', 'AudioNodeEngine.cpp', 'AudioNodeExternalInputStream.cpp', 'AudioNodeStream.cpp', From 0723cf47bec54b6f631cea01cf56f7ac15677abc Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Tue, 4 Feb 2014 23:10:43 -0500 Subject: [PATCH 24/39] Bug 960873: Part 3: AudioCompactor gtest unit tests. r=cpearce --- content/media/gtest/TestAudioCompactor.cpp | 131 +++++++++++++++++++++ content/media/gtest/moz.build | 1 + 2 files changed, 132 insertions(+) create mode 100644 content/media/gtest/TestAudioCompactor.cpp diff --git a/content/media/gtest/TestAudioCompactor.cpp b/content/media/gtest/TestAudioCompactor.cpp new file mode 100644 index 000000000000..40b86992c150 --- /dev/null +++ b/content/media/gtest/TestAudioCompactor.cpp @@ -0,0 +1,131 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "gtest/gtest.h" +#include "AudioCompactor.h" +#include "MediaDecoderReader.h" + +using mozilla::AudioCompactor; +using mozilla::AudioData; +using mozilla::AudioDataValue; +using mozilla::MediaDecoderReader; +using mozilla::MediaQueue; + +class TestCopy +{ +public: + TestCopy(uint32_t aFrames, uint32_t aChannels, + uint32_t &aCallCount, uint32_t &aFrameCount) + : mFrames(aFrames) + , mChannels(aChannels) + , mCallCount(aCallCount) + , mFrameCount(aFrameCount) + { } + + uint32_t operator()(AudioDataValue *aBuffer, uint32_t aSamples) + { + mCallCount += 1; + uint32_t frames = std::min(mFrames - mFrameCount, aSamples / mChannels); + mFrameCount += frames; + return frames; + } + +private: + const uint32_t mFrames; + const uint32_t mChannels; + uint32_t &mCallCount; + uint32_t &mFrameCount; +}; + +static void TestAudioCompactor(size_t aBytes) +{ + MediaQueue queue; + AudioCompactor compactor(queue); + + uint64_t offset = 0; + uint64_t time = 0; + uint32_t sampleRate = 44000; + uint32_t channels = 2; + uint32_t frames = aBytes / (channels * sizeof(AudioDataValue)); + size_t maxSlop = aBytes / AudioCompactor::MAX_SLOP_DIVISOR; + + uint32_t callCount = 0; + uint32_t frameCount = 0; + + compactor.Push(offset, time, sampleRate, frames, channels, + TestCopy(frames, channels, callCount, frameCount)); + + EXPECT_GT(callCount, 0U) << "copy functor never called"; + EXPECT_EQ(frames, frameCount) << "incorrect number of frames copied"; + + MediaDecoderReader::AudioQueueMemoryFunctor memoryFunc; + queue.LockedForEach(memoryFunc); + size_t allocSize = memoryFunc.mSize - (callCount * sizeof(AudioData)); + size_t slop = allocSize - aBytes; + EXPECT_LE(slop, maxSlop) << "allowed too much allocation slop"; +} + +TEST(Media, AudioCompactor_4000) +{ + TestAudioCompactor(4000); +} + +TEST(Media, AudioCompactor_4096) +{ + TestAudioCompactor(4096); +} + +TEST(Media, AudioCompactor_5000) +{ + TestAudioCompactor(5000); +} + +TEST(Media, AudioCompactor_5256) +{ + TestAudioCompactor(5256); +} + +TEST(Media, AudioCompactor_NativeCopy) +{ + const uint32_t channels = 2; + const size_t srcBytes = 32; + const uint32_t srcSamples = srcBytes / sizeof(AudioDataValue); + const uint32_t srcFrames = srcSamples / channels; + uint8_t src[srcBytes]; + + for (uint32_t i = 0; i < srcBytes; ++i) { + src[i] = i; + } + + AudioCompactor::NativeCopy copy(src, srcBytes, channels); + + const uint32_t dstSamples = srcSamples * 2; + AudioDataValue dst[dstSamples]; + + const AudioDataValue notCopied = 0xffff; + for (uint32_t i = 0; i < dstSamples; ++i) { + dst[i] = notCopied; + } + + const uint32_t copyCount = 8; + uint32_t copiedFrames = 0; + uint32_t nextSample = 0; + for (uint32_t i = 0; i < copyCount; ++i) { + uint32_t copySamples = dstSamples / copyCount; + copiedFrames += copy(dst + nextSample, copySamples); + nextSample += copySamples; + } + + EXPECT_EQ(srcFrames, copiedFrames) << "copy exact number of source frames"; + + // Verify that the only the correct bytes were copied. + for (uint32_t i = 0; i < dstSamples; ++i) { + if (i < srcSamples) { + EXPECT_NE(notCopied, dst[i]) << "should have copied over these bytes"; + } else { + EXPECT_EQ(notCopied, dst[i]) << "should not have copied over these bytes"; + } + } +} diff --git a/content/media/gtest/moz.build b/content/media/gtest/moz.build index 85c816a44496..a5d80ff5c8c6 100644 --- a/content/media/gtest/moz.build +++ b/content/media/gtest/moz.build @@ -7,6 +7,7 @@ LIBRARY_NAME = 'media_gtest' UNIFIED_SOURCES += [ + 'TestAudioCompactor.cpp', 'TestTrackEncoder.cpp', ] From afd768e3f3584021d0773801455a318df1f0d25b Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Tue, 4 Feb 2014 23:10:43 -0500 Subject: [PATCH 25/39] Bug 960873: Part 4: Make OMX use AudioCompactor. r=cpearce --- content/media/omx/MediaOmxReader.cpp | 32 ++++++++++++---------------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/content/media/omx/MediaOmxReader.cpp b/content/media/omx/MediaOmxReader.cpp index d8342e4c17a4..db4e2de1a631 100644 --- a/content/media/omx/MediaOmxReader.cpp +++ b/content/media/omx/MediaOmxReader.cpp @@ -312,33 +312,29 @@ bool MediaOmxReader::DecodeAudioData() int64_t pos = mDecoder->GetResource()->Tell(); // Read next frame - MPAPI::AudioFrame frame; - if (!mOmxDecoder->ReadAudio(&frame, mAudioSeekTimeUs)) { + MPAPI::AudioFrame source; + if (!mOmxDecoder->ReadAudio(&source, mAudioSeekTimeUs)) { return false; } mAudioSeekTimeUs = -1; // Ignore empty buffer which stagefright media read will sporadically return - if (frame.mSize == 0) { + if (source.mSize == 0) { return true; } - nsAutoArrayPtr buffer(new AudioDataValue[frame.mSize/2] ); - memcpy(buffer.get(), frame.mData, frame.mSize); + uint32_t frames = source.mSize / (source.mAudioChannels * + sizeof(AudioDataValue)); - uint32_t frames = frame.mSize / (2 * frame.mAudioChannels); - CheckedInt64 duration = FramesToUsecs(frames, frame.mAudioSampleRate); - if (!duration.isValid()) { - return false; - } - - mAudioQueue.Push(new AudioData(pos, - frame.mTimeUs, - duration.value(), - frames, - buffer.forget(), - frame.mAudioChannels)); - return true; + typedef AudioCompactor::NativeCopy OmxCopy; + return mAudioCompactor.Push(pos, + source.mTimeUs, + source.mAudioSampleRate, + frames, + source.mAudioChannels, + OmxCopy(static_cast(source.mData), + source.mSize, + source.mAudioChannels)); } nsresult MediaOmxReader::Seek(int64_t aTarget, int64_t aStartTime, int64_t aEndTime, int64_t aCurrentTime) From 82e090143945134707a3ae239ec9703cf2fa538a Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Tue, 4 Feb 2014 23:10:43 -0500 Subject: [PATCH 26/39] Bug 960873: Part 5: Make gstreamer use AudioCompactor. r=cpearce --- content/media/gstreamer/GStreamerReader.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/content/media/gstreamer/GStreamerReader.cpp b/content/media/gstreamer/GStreamerReader.cpp index 32d8425f556e..98451491309d 100644 --- a/content/media/gstreamer/GStreamerReader.cpp +++ b/content/media/gstreamer/GStreamerReader.cpp @@ -532,20 +532,20 @@ bool GStreamerReader::DecodeAudioData() timestamp = gst_segment_to_stream_time(&mAudioSegment, GST_FORMAT_TIME, timestamp); timestamp = GST_TIME_AS_USECONDS(timestamp); - int64_t duration = 0; - if (GST_CLOCK_TIME_IS_VALID(GST_BUFFER_DURATION(buffer))) - duration = GST_TIME_AS_USECONDS(GST_BUFFER_DURATION(buffer)); int64_t offset = GST_BUFFER_OFFSET(buffer); unsigned int size = GST_BUFFER_SIZE(buffer); int32_t frames = (size / sizeof(AudioDataValue)) / mInfo.mAudio.mChannels; - ssize_t outSize = static_cast(size / sizeof(AudioDataValue)); - nsAutoArrayPtr data(new AudioDataValue[outSize]); - memcpy(data, GST_BUFFER_DATA(buffer), GST_BUFFER_SIZE(buffer)); - AudioData* audio = new AudioData(offset, timestamp, duration, - frames, data.forget(), mInfo.mAudio.mChannels); - mAudioQueue.Push(audio); + typedef AudioCompactor::NativeCopy GstCopy; + mAudioCompactor.Push(offset, + timestamp, + mInfo.mAudio.mRate, + frames, + mInfo.mAudio.mChannels, + GstCopy(GST_BUFFER_DATA(buffer), + size, + mInfo.mAudio.mChannels)); gst_buffer_unref(buffer); return true; From 13e6e8f7bedb665776aab565485c7162fc919a8b Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Tue, 4 Feb 2014 23:10:43 -0500 Subject: [PATCH 27/39] Bug 960873: Part 6: Make DirectShow use AudioCompactor. r=cpearce --- content/media/directshow/DirectShowReader.cpp | 74 +++++++++++++------ 1 file changed, 53 insertions(+), 21 deletions(-) diff --git a/content/media/directshow/DirectShowReader.cpp b/content/media/directshow/DirectShowReader.cpp index 260ec960940e..7830da318c36 100644 --- a/content/media/directshow/DirectShowReader.cpp +++ b/content/media/directshow/DirectShowReader.cpp @@ -1,4 +1,5 @@ -/* vim:set ts=2 sw=2 sts=2 et cindent: */ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -247,6 +248,48 @@ DirectShowReader::Finish(HRESULT aStatus) return false; } +class DirectShowCopy +{ +public: + DirectShowCopy(uint8_t *aSource, uint32_t aBytesPerSample, + uint32_t aSamples, uint32_t aChannels) + : mSource(aSource) + , mBytesPerSample(aBytesPerSample) + , mSamples(aSamples) + , mChannels(aChannels) + , mNextSample(0) + { } + + uint32_t operator()(AudioDataValue *aBuffer, size_t aSamples) + { + size_t maxSamples = std::min(aSamples, mSamples - mNextSample); + uint32_t frames = maxSamples / mChannels; + size_t byteOffset = mNextSample * mBytesPerSample; + if (mBytesPerSample == 1) { + for (uint32_t i = 0; i < maxSamples; ++i) { + uint8_t *sample = mSource + byteOffset; + aBuffer[i] = UnsignedByteToAudioSample(*sample); + byteOffset += mBytesPerSample; + } + } else if (mBytesPerSample == 2) { + for (uint32_t i = 0; i < maxSamples; ++i) { + int16_t *sample = reinterpret_cast(mSource + byteOffset); + aBuffer[i] = AudioSampleToFloat(*sample); + byteOffset += mBytesPerSample; + } + } + mNextSample = maxSamples; + return frames; + } + +private: + uint8_t * const mSource; + const uint32_t mBytesPerSample; + const uint32_t mSamples; + const uint32_t mChannels; + uint32_t mNextSample; +}; + bool DirectShowReader::DecodeAudioData() { @@ -281,26 +324,15 @@ DirectShowReader::DecodeAudioData() hr = sample->GetPointer(&data); NS_ENSURE_TRUE(SUCCEEDED(hr), Finish(hr)); - nsAutoArrayPtr buffer(new AudioDataValue[numSamples]); - AudioDataValue* dst = buffer.get(); - if (mBytesPerSample == 1) { - uint8_t* src = reinterpret_cast(data); - for (int32_t i = 0; i < numSamples; ++i) { - dst[i] = UnsignedByteToAudioSample(src[i]); - } - } else if (mBytesPerSample == 2) { - int16_t* src = reinterpret_cast(data); - for (int32_t i = 0; i < numSamples; ++i) { - dst[i] = AudioSampleToFloat(src[i]); - } - } - - mAudioQueue.Push(new AudioData(mDecoder->GetResource()->Tell(), - RefTimeToUsecs(start), - RefTimeToUsecs(end - start), - numFrames, - buffer.forget(), - mNumChannels)); + mAudioCompactor.Push(mDecoder->GetResource()->Tell(), + RefTimeToUsecs(start), + mInfo.mAudio.mRate, + numFrames, + mNumChannels, + DirectShowCopy(reinterpret_cast(data), + mBytesPerSample, + numSamples, + mNumChannels)); return true; } From 41fc4101cfebe99a6681a6f3d940e2219feaa1ff Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Tue, 4 Feb 2014 23:10:43 -0500 Subject: [PATCH 28/39] Bug 960873: Part 7: Reduce apple mp3 MAX_AUDIO_FRAMES to minimize alloc slop. r=cpearce --- content/media/apple/AppleMP3Reader.cpp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/content/media/apple/AppleMP3Reader.cpp b/content/media/apple/AppleMP3Reader.cpp index 50f5827e6724..d2fea06425eb 100644 --- a/content/media/apple/AppleMP3Reader.cpp +++ b/content/media/apple/AppleMP3Reader.cpp @@ -12,8 +12,12 @@ #define AUDIO_READ_BYTES 4096 // Maximum number of audio frames we will accept from the audio decoder in one -// go. -#define MAX_AUDIO_FRAMES 4096 +// go. Carefully select this to work well with both the mp3 1152 max frames +// per block and power-of-2 allocation sizes. Since we must pre-allocate the +// buffer we cannot use AudioCompactor without paying for an additional +// allocation and copy. Therefore, choosing a value that divides exactly into +// 1152 is most memory efficient. +#define MAX_AUDIO_FRAMES 128 namespace mozilla { @@ -201,7 +205,8 @@ AppleMP3Reader::AudioSampleCallback(UInt32 aNumBytes, LOGD("got %u bytes, %u packets\n", aNumBytes, aNumPackets); // 1 frame per packet * num channels * 32-bit float - uint32_t decodedSize = MAX_AUDIO_FRAMES * mAudioChannels * 4; + uint32_t decodedSize = MAX_AUDIO_FRAMES * mAudioChannels * + sizeof(AudioDataValue); // descriptions for _decompressed_ audio packets. ignored. nsAutoArrayPtr @@ -238,6 +243,14 @@ AppleMP3Reader::AudioSampleCallback(UInt32 aNumBytes, break; } + // If we decoded zero frames then AudiOConverterFillComplexBuffer is out + // of data to provide. We drained its internal buffer completely on the + // last pass. + if (numFrames == 0 && rv == kNeedMoreData) { + LOGD("FillComplexBuffer out of data exactly\n"); + break; + } + int64_t time = FramesToUsecs(mCurrentAudioFrame, mAudioSampleRate).value(); int64_t duration = FramesToUsecs(numFrames, mAudioSampleRate).value(); From 2451191a39d6bd915a3950c3d51c00ed01e1dde4 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Tue, 4 Feb 2014 22:31:38 -0800 Subject: [PATCH 29/39] Bug 968051 - Disable test_sessionStorageClone.html on debug b2g, since it only passed based on what chunk it ran in CLOSED TREE --- testing/mochitest/b2g-debug.json | 1 + 1 file changed, 1 insertion(+) diff --git a/testing/mochitest/b2g-debug.json b/testing/mochitest/b2g-debug.json index 13f3c2940a8f..6b0d0b6e7ac6 100644 --- a/testing/mochitest/b2g-debug.json +++ b/testing/mochitest/b2g-debug.json @@ -381,6 +381,7 @@ "dom/tests/mochitest/localstorage/test_localStorageReplace.html":"", "dom/tests/mochitest/sessionstorage/test_cookieSession.html":"", "dom/tests/mochitest/sessionstorage/test_sessionStorageBaseSessionOnly.html":"", + "dom/tests/mochitest/sessionstorage/test_sessionStorageClone.html":"bug 968051", "dom/tests/mochitest/pointerlock/test_pointerlock-api.html":"window.open focus issues (using fullscreen)", "dom/tests/mochitest/sessionstorage/test_sessionStorageBase.html":"", From 2ad00a3216fd2caa6488278123b9c3af84c75405 Mon Sep 17 00:00:00 2001 From: Gregor Wagner Date: Wed, 5 Feb 2014 07:57:16 +0100 Subject: [PATCH 30/39] [Bug 967342] Server not found pages have '&f=regular' appended to url. r=bz --- .../base/content/test/chrome/test_aboutCrashed.xul | 4 ++-- docshell/base/nsDocShell.cpp | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/browser/base/content/test/chrome/test_aboutCrashed.xul b/browser/base/content/test/chrome/test_aboutCrashed.xul index f7512e94b23a..7a68076f185e 100644 --- a/browser/base/content/test/chrome/test_aboutCrashed.xul +++ b/browser/base/content/test/chrome/test_aboutCrashed.xul @@ -65,7 +65,7 @@ frame1.docShell.chromeEventHandler.removeAttribute("crashedPageTitle"); SimpleTest.is(frame1.contentDocument.documentURI, - "about:tabcrashed?e=tabcrashed&u=http%3A//www.example.com/1&c=UTF-8&d=pageTitle&f=regular", + "about:tabcrashed?e=tabcrashed&u=http%3A//www.example.com/1&c=UTF-8&f=regular&d=pageTitle", "Correct about:tabcrashed displayed for page with title."); errorPageReady = waitForErrorPage(frame2); @@ -74,7 +74,7 @@ yield errorPageReady; SimpleTest.is(frame2.contentDocument.documentURI, - "about:tabcrashed?e=tabcrashed&u=http%3A//www.example.com/2&c=UTF-8&d=%20&f=regular", + "about:tabcrashed?e=tabcrashed&u=http%3A//www.example.com/2&c=UTF-8&f=regular&d=%20", "Correct about:tabcrashed displayed for page with no title."); SimpleTest.finish(); diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index b867192a47d0..51b6141e5496 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -4776,8 +4776,10 @@ nsDocShell::LoadErrorPage(nsIURI *aURI, const char16_t *aURL, } errorPageUrl.AppendLiteral("&c="); errorPageUrl.AppendASCII(escapedCharset.get()); - errorPageUrl.AppendLiteral("&d="); - errorPageUrl.AppendASCII(escapedDescription.get()); + + nsAutoCString frameType(FrameTypeToString(mFrameType)); + errorPageUrl.AppendLiteral("&f="); + errorPageUrl.AppendASCII(frameType.get()); // Append the manifest URL if the error comes from an app. nsString manifestURL; @@ -4791,9 +4793,10 @@ nsDocShell::LoadErrorPage(nsIURI *aURI, const char16_t *aURL, errorPageUrl.AppendASCII(manifestParam.get()); } - nsAutoCString frameType(FrameTypeToString(mFrameType)); - errorPageUrl.AppendLiteral("&f="); - errorPageUrl.AppendASCII(frameType.get()); + // netError.xhtml's getDescription only handles the "d" parameter at the + // end of the URL, so append it last. + errorPageUrl.AppendLiteral("&d="); + errorPageUrl.AppendASCII(escapedDescription.get()); nsCOMPtr errorPageURI; rv = NS_NewURI(getter_AddRefs(errorPageURI), errorPageUrl); From 896abd90a76794ee488c097a078bb77fc06af158 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Tue, 4 Feb 2014 23:03:45 -0800 Subject: [PATCH 31/39] Bug 967737 - Disable test_sessionStorageBaseSessionOnly.html on opt b2g, , since it only passed based on what chunk it ran in --HG-- extra : rebase_source : 3e5bf4e64656e2427cf4b614ff4504e31285a3da --- testing/mochitest/b2g.json | 1 + 1 file changed, 1 insertion(+) diff --git a/testing/mochitest/b2g.json b/testing/mochitest/b2g.json index 5a2e8093980f..e9c7e03ec5f6 100644 --- a/testing/mochitest/b2g.json +++ b/testing/mochitest/b2g.json @@ -358,6 +358,7 @@ "dom/tests/mochitest/localstorage/test_localStorageQuotaSessionOnly2.html":"needs https support", "dom/tests/mochitest/sessionstorage/test_cookieSession.html":"4 failures", "dom/tests/mochitest/sessionstorage/test_sessionStorageBase.html":"no storage chrome event received", + "dom/tests/mochitest/sessionstorage/test_sessionStorageBaseSessionOnly.html":"bug 967737", "dom/tests/mochitest/sessionstorage/test_sessionStorageHttpHttps.html":"needs https to work", "dom/tests/mochitest/pointerlock/test_pointerlock-api.html":"window.open focus issues (using fullscreen)", From f9cdffb7f1e70dea22095e4625e46070797ffa7b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 23:30:11 -0800 Subject: [PATCH 32/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/5b4d3028e817 Author: dwi2 Desc: Merge pull request #15960 from dwi2/bug964755 Bug 964755 - Make sure WifiHelper.getCapabilities() return non-null valu... ======== https://hg.mozilla.org/integration/gaia-central/rev/5dbc35834894 Author: tzhuang Desc: Bug 964755 - Make sure WifiHelper.getCapabilities() return non-null value for network not in the air --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 06868751f9a7..061ef53f8cfd 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "82fec589868343b8911581737b4dde0396050ab9", + "revision": "5b4d3028e817f92c8c51e199c8ccca2b1c05ba98", "repo_path": "/integration/gaia-central" } From 0d4769adf3aaef9fce4791ef80cd75e9a2fdb363 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 4 Feb 2014 23:36:05 -0800 Subject: [PATCH 33/39] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index fb764c1f2af6..ba6731ff2926 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index ddcb3aeeb6dc..aba020a991e4 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index fb764c1f2af6..ba6731ff2926 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index a80106a32202..96204b601ce7 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index ed5a427b3001..36e2ac6e309f 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 266432f22da6..b85c30f7cd28 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 8c19026c203d..939ea99656ee 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index f5861fc7a561..b39992d96f7e 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 1f7dadc38f5b..34e43865d8d9 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 2a9ea68ad8f5252ea4f0eae9b1f444d3674cf1e0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Feb 2014 00:05:10 -0800 Subject: [PATCH 34/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/25a845d52f3e Author: George Desc: Merge pull request #15723 from cctuan/955995 Bug 955995 - Running settings.js on node.js ======== https://hg.mozilla.org/integration/gaia-central/rev/218941065148 Author: cctuan Desc: Bug 955995 - Running settings.js on node.js --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 061ef53f8cfd..7377f0e1eed5 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "5b4d3028e817f92c8c51e199c8ccca2b1c05ba98", + "revision": "25a845d52f3e11247beb67d9cb69dbb8a6ee0cc3", "repo_path": "/integration/gaia-central" } From 9f78e8aacef90d53094e3ffcbab4e1cb624e9c4a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Feb 2014 00:10:56 -0800 Subject: [PATCH 35/39] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index ba6731ff2926..758880eab5a1 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index aba020a991e4..d762ce1abb09 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index ba6731ff2926..758880eab5a1 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 96204b601ce7..d545fab06290 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 36e2ac6e309f..40700c0a61ca 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index b85c30f7cd28..764ded7852eb 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 939ea99656ee..5b79324aa2b3 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index b39992d96f7e..580979266209 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 34e43865d8d9..2689cb70b043 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 8f521737f3b68cce7a14291bec02a647660c8cba Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Feb 2014 00:30:10 -0800 Subject: [PATCH 36/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/5746057ab313 Author: Thomas Zimmermann Desc: Merge pull request #15907 from tdz/bug-966243 Bug 966243: Fix ICC detection handlers in Settings app ======== https://hg.mozilla.org/integration/gaia-central/rev/aef67c3ac9de Author: Thomas Zimmermann Desc: Bug 966243: Fix ICC detection handlers in Settings app, r=arthur.chen While running the Settings app several errors about self.* not being defined show up in the logcat. An example is E/GeckoConsole( 440): [JavaScript Error: "TypeError: self.updateSimPinsUI \ is not a function" {file: "app://settings.gaiamobile.org/js/simcard_lock.js" \ line: 232}] This is caused by 'self' not being set in the event handlers for ICC detection. As a result, the UI update does not work correctly when the ICC changes state. Setting the variable 'self' fixes this problem. Signed-off-by: Thomas Zimmermann --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 7377f0e1eed5..c8f67c7c25f8 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "25a845d52f3e11247beb67d9cb69dbb8a6ee0cc3", + "revision": "5746057ab313920ee0f1f6c2019691097acd792d", "repo_path": "/integration/gaia-central" } From 7c6e4958da6321b89c90f01393cbdd8071828435 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Feb 2014 00:35:56 -0800 Subject: [PATCH 37/39] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 758880eab5a1..aba8f13a06e7 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index d762ce1abb09..672c68bfa41b 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 758880eab5a1..aba8f13a06e7 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index d545fab06290..c7ee1b883dd8 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 40700c0a61ca..72bd52fe4c52 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 764ded7852eb..3a8f3ed21927 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 5b79324aa2b3..9b6fc2d6a90a 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 580979266209..ac62a92def47 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 2689cb70b043..0fefb0290bae 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From d30b8d02da3c448bb5bdbfcf4c4e0a43f5f35df9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Feb 2014 01:10:11 -0800 Subject: [PATCH 38/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/cea79abbb7a9 Author: Timothy Guan-tin Chien Desc: Merge pull request #15966 from timdream/keyboard-build-2 Revert "Revert "Merge pull request #15857 from comoyo/bug964216"" ======== https://hg.mozilla.org/integration/gaia-central/rev/9778b9f6a597 Author: Timothy Guan-tin Chien Desc: Revert "Revert "Merge pull request #15857 from comoyo/bug964216"" This reverts commit 33eb812eadb61f76744103105e099972a8255843. --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index c8f67c7c25f8..f19f1324509f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "5746057ab313920ee0f1f6c2019691097acd792d", + "revision": "cea79abbb7a97c0bd67051087bcdf40d25611930", "repo_path": "/integration/gaia-central" } From d034cb070fdcd18ed2b0247d3edb80a18b66efcf Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 5 Feb 2014 01:10:57 -0800 Subject: [PATCH 39/39] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index aba8f13a06e7..1b98184173b8 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 672c68bfa41b..db64220d842e 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index aba8f13a06e7..1b98184173b8 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index c7ee1b883dd8..de2bdbd7ff06 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 72bd52fe4c52..d6436870f58b 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -10,7 +10,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 3a8f3ed21927..24ef56030566 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -12,7 +12,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 9b6fc2d6a90a..423f36da597b 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index ac62a92def47..bdae239e0e40 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -11,7 +11,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 0fefb0290bae..e04570049877 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - +