From e957861ce044ca13f7e63d8774e4442de866061e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 00:05:53 -0800 Subject: [PATCH 01/58] Bumping manifests a=b2g-bump --- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 385b17c19df1..c2ddf9bab7e7 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -124,7 +124,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index c540701dcc36..4b119e909096 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -121,7 +121,7 @@ - + From 705497e6eb0482c12c23b5ebd7bcced2e09fa991 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 00:10:10 -0800 Subject: [PATCH 02/58] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/2bada567e78f Author: Timothy Guan-tin Chien Desc: Merge pull request #15969 from timdream/zh-layout-rename Bug 967237 - Shorten the Zh layout labels, r=rudyl ======== https://hg.mozilla.org/integration/gaia-central/rev/d26decb398ea Author: Timothy Guan-tin Chien Desc: Bug 967237 - Shorten the Zh layout labels --- 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 5a2e7b30b849..172b7f11ef18 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "9e58b7068dc8cc4883ed092c8599ece51ebb2575", + "revision": "2bada567e78f4d191b4a7f9e44e9c23a0d3df023", "repo_path": "/integration/gaia-central" } From 01bc32aa620f708d8fbdc590c9ceaee1d6fd2efc Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 00:16:03 -0800 Subject: [PATCH 03/58] 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 4927af41ce15..3836cb4f4c39 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 c2ddf9bab7e7..c13f0a074573 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 4927af41ce15..3836cb4f4c39 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 5bdfcc37759f..1d818430cf57 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 8fc58b40ccdf..395a9b1e4846 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 93eb0ee877a0..33af54c36af3 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 94e3cff159b1..2c286fa996f7 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 4b119e909096..8fde4a6f31de 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 040d152550f9..0ae7034bfc3a 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 787a42df429c87816f4274cb61a8301aef3fb99e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 01:15:12 -0800 Subject: [PATCH 04/58] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8da926267a7e Author: Julien Wajsberg Desc: Merge pull request #15736 from fcampo/subject-too-high-bug963050 Bug 963050 - [SMS] Subject's line-height in composer is too high r=julien ======== https://hg.mozilla.org/integration/gaia-central/rev/f4751bd645e2 Author: Fernando Campo Desc: Bug 963050 - [SMS] Subject's line-height in composer is too high ======== https://hg.mozilla.org/integration/gaia-central/rev/62c20e1815be Author: Julien Wajsberg Desc: Merge pull request #15823 from mihai/bug_952554 Bug 952554 - [SMS] Find contacts when searching with multiple terms... r=julien ======== https://hg.mozilla.org/integration/gaia-central/rev/e87cc9bdf3f7 Author: Mihai Cirlanaru Desc: Bug 952554 - [SMS] Find contacts when searching with multiple terms which also include tel number --- 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 172b7f11ef18..d970272f6eaa 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "2bada567e78f4d191b4a7f9e44e9c23a0d3df023", + "revision": "8da926267a7ed53c07aefe1294f3ae4d3a419828", "repo_path": "/integration/gaia-central" } From 54ae6b57f1e8a65c93b817b84d48e6adcdc60216 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 01:20:59 -0800 Subject: [PATCH 05/58] 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 3836cb4f4c39..cda6ad8f2119 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 c13f0a074573..8f692acfa16f 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 3836cb4f4c39..cda6ad8f2119 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 1d818430cf57..de3ce78e507f 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 395a9b1e4846..fac4909a7824 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 33af54c36af3..de6bf340c11f 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 2c286fa996f7..abe2ae577364 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 8fde4a6f31de..f5d6ae67f61b 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 0ae7034bfc3a..a34b532ca9a7 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From cd927491a269eb84faa734d99d6799836afa4ca5 Mon Sep 17 00:00:00 2001 From: Gregor Wagner Date: Thu, 6 Feb 2014 10:27:04 +0100 Subject: [PATCH 06/58] Bug 966899 - Rocketbar is not enabled after OTA update. Bump settingsDB version to read settins.json. r=bent --- dom/settings/SettingsDB.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/settings/SettingsDB.jsm b/dom/settings/SettingsDB.jsm index 034ef5af301f..c8c71b97b9fd 100644 --- a/dom/settings/SettingsDB.jsm +++ b/dom/settings/SettingsDB.jsm @@ -19,7 +19,7 @@ function debug(s) { } this.SETTINGSDB_NAME = "settings"; -this.SETTINGSDB_VERSION = 2; +this.SETTINGSDB_VERSION = 3; this.SETTINGSSTORE_NAME = "settings"; Cu.import("resource://gre/modules/IndexedDBHelper.jsm"); From 7cb8c36963de5b0702fcfd6614d9b19832de6afd Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 01:40:10 -0800 Subject: [PATCH 07/58] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/989491c72232 Author: cctuan Desc: Bug 962938 - Inconsistent file path in zip file ======== https://hg.mozilla.org/integration/gaia-central/rev/9888e443d4ab Author: Fabrice Desre Desc: Bug 962976 - Use a blacklist to avoid compressing specific file types which are already compressed r=yurenju ======== https://hg.mozilla.org/integration/gaia-central/rev/ec0c974e434e Author: Yuren Ju Desc: Merge pull request #15961 from yurenju/uncompress-2 Bug 957497 - Allow include of uncompressed data files in the package apps r=@timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/50c1ebb651a7 Author: Yuren Ju Desc: Bug 957497 - Allow include of uncompressed data files in the package apps Conflicts: build/utils-xpc.js build/utils.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 d970272f6eaa..eea66878302c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "8da926267a7ed53c07aefe1294f3ae4d3a419828", + "revision": "989491c722320293bd9b10ebf29e36e3a7d12375", "repo_path": "/integration/gaia-central" } From eb58ce389f55b8ca12a152c3b3d419147e486458 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 01:40:56 -0800 Subject: [PATCH 08/58] 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 cda6ad8f2119..88aa2abae546 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 8f692acfa16f..6748ab71141c 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 cda6ad8f2119..88aa2abae546 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 de3ce78e507f..4d56bd59fb78 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 fac4909a7824..7fd79c574884 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 de6bf340c11f..25347f3b1488 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 abe2ae577364..80b77c81660f 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 f5d6ae67f61b..923fdc9c24de 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 a34b532ca9a7..c0f2e450df75 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From e26c76f40af2262f4e0bb223558b83287dd322de Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 01:50:10 -0800 Subject: [PATCH 09/58] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c2c906ac5327 Author: dwi2 Desc: Merge pull request #14298 from dwi2/bug938080 Bug 938080 - set 'xyz'.suspended to false if user toggle 'xyz'.enabled on manually r=crh0716 ======== https://hg.mozilla.org/integration/gaia-central/rev/32b377b516bd Author: tzhuang Desc: Bug 938080 - set 'xyz'.suspended to false if user toggle 'xyz'.enabled on manually --- 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 eea66878302c..e817c43e82d0 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "989491c722320293bd9b10ebf29e36e3a7d12375", + "revision": "c2c906ac532794ddf56e5ada6441e322fa6069ef", "repo_path": "/integration/gaia-central" } From ca91bcdcb4366837629c9803aeb0410b7916caeb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 01:56:00 -0800 Subject: [PATCH 10/58] 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 88aa2abae546..af060d4815b1 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 6748ab71141c..164fa54d3d65 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 88aa2abae546..af060d4815b1 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 4d56bd59fb78..685ce813f68e 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 7fd79c574884..a22f3a10ca7f 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 25347f3b1488..30c4b5685446 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 80b77c81660f..56822ba07820 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 923fdc9c24de..a06c827c5631 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 c0f2e450df75..5415001d5772 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 3c3ecc0d396ed2c456a7c5bd2a75228d506b30e1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 02:05:10 -0800 Subject: [PATCH 11/58] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1ee8f4c86de4 Author: Jose M. Cantera Desc: Merge pull request #16024 from jmcanterafonseca/fb_sync_fixed Bug 952691 - [B2G][Contacts][Facebook Sync]Contacts imported from Facebo... ======== https://hg.mozilla.org/integration/gaia-central/rev/543c71092e7d Author: Jose M. Cantera Desc: Bug 952691 - [B2G][Contacts][Facebook Sync]Contacts imported from Facebook do not sync every 24 hours to reflect profile changes. --- 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 e817c43e82d0..4214f08b084f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "c2c906ac532794ddf56e5ada6441e322fa6069ef", + "revision": "1ee8f4c86de4920d58694950983b16f2aad6d3a7", "repo_path": "/integration/gaia-central" } From 2215a617007d1ec76f2391a20c3a46198e3ad124 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 02:10:56 -0800 Subject: [PATCH 12/58] 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 af060d4815b1..ded7d4c6c9cf 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 164fa54d3d65..9a90dd3eca93 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 af060d4815b1..ded7d4c6c9cf 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 685ce813f68e..8b164bef1a9c 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 a22f3a10ca7f..590a6decd48f 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 30c4b5685446..b9a37b2280b0 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 56822ba07820..a0bc79b02dfb 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 a06c827c5631..d5bda32dde93 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 5415001d5772..346a86f461d6 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 894d64ef6c833f18e0529b6e508eac096316e1d1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 02:55:09 -0800 Subject: [PATCH 13/58] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ac5067e8cc18 Author: Zac Desc: Merge pull request #15938 from AndreiH/bug964820 Bug 964820 - Re-enable test_cards_view_kill_apps_with_two_apps on device ======== https://hg.mozilla.org/integration/gaia-central/rev/775716fc21d9 Author: Andrei Hutusoru Desc: Bug 964820 - Re-enable test_cards_view_kill_apps_with_two_apps on device --- 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 4214f08b084f..d07fcd9205d1 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "1ee8f4c86de4920d58694950983b16f2aad6d3a7", + "revision": "ac5067e8cc188d2c69283d16b95c36d71310b506", "repo_path": "/integration/gaia-central" } From fc51791f8685b666d37f911339ab826537950d1c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 03:00:57 -0800 Subject: [PATCH 14/58] 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 ded7d4c6c9cf..18ed3c2252d8 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 9a90dd3eca93..13bd81350480 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 ded7d4c6c9cf..18ed3c2252d8 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 8b164bef1a9c..9dc6395986f8 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 590a6decd48f..dabeb8739f2a 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 b9a37b2280b0..08dd2dedd22c 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 a0bc79b02dfb..441cd3b42e36 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 d5bda32dde93..3fd646d2cca0 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 346a86f461d6..431ceecd2b40 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 94cfc35a553e388963f9141243b944acc9717b48 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 04:00:10 -0800 Subject: [PATCH 15/58] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/043cb94030d0 Author: Kevin Grandon Desc: Merge pull request #16029 from KevinGrandon/bug_968103_cancel_rocketbar Bug 968103 - [Rocketbar] Cancel button launches active card r=auswerk ======== https://hg.mozilla.org/integration/gaia-central/rev/2985fc64e9a8 Author: Kevin Grandon Desc: Bug 968103 - [Rocketbar] Cancel button launches active card r=auswerk --- 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 d07fcd9205d1..63cc749dd2ed 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "ac5067e8cc188d2c69283d16b95c36d71310b506", + "revision": "043cb94030d03dee892b82e52a7a3d364bcc8140", "repo_path": "/integration/gaia-central" } From 9b51a88540b411f526f1b33b8411c9592b561112 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 04:06:02 -0800 Subject: [PATCH 16/58] 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 18ed3c2252d8..c39dcf65407e 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 13bd81350480..8158e66c2460 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 18ed3c2252d8..c39dcf65407e 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 9dc6395986f8..e22915fa2d08 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 dabeb8739f2a..5e577fe7cf23 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 08dd2dedd22c..e8aea1f00b2a 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 441cd3b42e36..48437c711ddb 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 3fd646d2cca0..277c1ed08a34 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 431ceecd2b40..4e79d0fae1ab 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 69481dd2ce5b480ca92c949be8a74657f13a8357 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 04:20:17 -0800 Subject: [PATCH 17/58] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/11293bff4b77 Author: Kevin Grandon Desc: Merge pull request #15939 from KevinGrandon/bug_966902_rocketbar_search_clearing Bug 966902 - [Rocketbar] Input handling. Do not clear search term. ======== https://hg.mozilla.org/integration/gaia-central/rev/72c4c83ad8f2 Author: Kevin Grandon Desc: Bug 966902 - [Rocketbar] Input handling. Do not clear search term. r=benfrancis --- 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 63cc749dd2ed..9656ad2045e6 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "043cb94030d03dee892b82e52a7a3d364bcc8140", + "revision": "11293bff4b77c9e707661578aee946f850327997", "repo_path": "/integration/gaia-central" } From 872dcaee064831894c9bbb73d99c5ae27e123fe1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 04:26:08 -0800 Subject: [PATCH 18/58] 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 c39dcf65407e..f36c9236c4ec 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 8158e66c2460..1abd9e2c2f3b 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 c39dcf65407e..f36c9236c4ec 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 e22915fa2d08..0c3a833ef9eb 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 5e577fe7cf23..f3e5a0ccfe85 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 e8aea1f00b2a..ffd4181ef2f3 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 48437c711ddb..b9ade2a80394 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 277c1ed08a34..1991529358f2 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 4e79d0fae1ab..202b84fe1056 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 70952d5569b8c9afa49ef219310a0cebde5fd77c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 04:35:19 -0800 Subject: [PATCH 19/58] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/0466de7e605c Author: Jan Jongboom Desc: Merge pull request #15967 from comoyo/bug968085 Bug 968085 - Don't rely on global variable from keyboard.js in render.js. r=RudyL ======== https://hg.mozilla.org/integration/gaia-central/rev/4dade487755f Author: Jan Jongboom Desc: Bug 968085 - Don't rely on global variable from keyboard.js in render.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 9656ad2045e6..25a4e36a9545 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "11293bff4b77c9e707661578aee946f850327997", + "revision": "0466de7e605c2b55deb932690521ffc43e791d4f", "repo_path": "/integration/gaia-central" } From 3daea10d355371fffb4f59d6ddce5c5cdf974ff9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 04:41:27 -0800 Subject: [PATCH 20/58] 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 f36c9236c4ec..05e9d2dcbd6a 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 1abd9e2c2f3b..3a2268d1e03b 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 f36c9236c4ec..05e9d2dcbd6a 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 0c3a833ef9eb..4129ae32d8fd 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 f3e5a0ccfe85..6455fbc11fd4 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 ffd4181ef2f3..09fc4dc2a6f8 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 b9ade2a80394..eb553ca49416 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 1991529358f2..e42c322a2d11 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 202b84fe1056..ccb48997f2ea 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 4f63fd3fe06d2099dd85aca7262edf67c8701086 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Thu, 6 Feb 2014 13:44:46 +0100 Subject: [PATCH 21/58] Bug 964817: Invoke DBus send operations on I/O thread, r=echou Currently, the DBus connection for Bluetooth is shared between the main thread and the I/O thread. This causes race conditions when starting or stopping Bluetooth. This patch moves all occurences of main-thread-invoked DBus send operations to the I/O thread. This is mostly refactoring. Internally, send operations are already executed on the main thread, so there is no change in the over all logic of these methods. --- .../bluez/linux/BluetoothDBusService.cpp | 1553 +++++++++++------ .../bluez/linux/BluetoothDBusService.h | 34 +- 2 files changed, 1074 insertions(+), 513 deletions(-) diff --git a/dom/bluetooth/bluez/linux/BluetoothDBusService.cpp b/dom/bluetooth/bluez/linux/BluetoothDBusService.cpp index 04876aa4125c..554794be84cf 100644 --- a/dom/bluetooth/bluez/linux/BluetoothDBusService.cpp +++ b/dom/bluetooth/bluez/linux/BluetoothDBusService.cpp @@ -1323,7 +1323,6 @@ private: nsRefPtr handler = new RegisterAgentReplyHandler(aAgentVTable); - MOZ_ASSERT(handler.get()); MOZ_ASSERT(!sAdapterPath.IsEmpty()); bool success = connection->SendWithReply( @@ -1342,6 +1341,52 @@ private: } }; +class AddReservedServiceRecordsTask : public Task +{ +public: + AddReservedServiceRecordsTask(const nsACString& aAdapterPath) + : mAdapterPath(aAdapterPath) + { + MOZ_ASSERT(!aAdapterPath.IsEmpty()); + } + + void Run() + { + static const dbus_uint32_t sServices[] = { + BluetoothServiceClass::HANDSFREE_AG, + BluetoothServiceClass::HEADSET_AG, + BluetoothServiceClass::OBJECT_PUSH + }; + + MOZ_ASSERT(!NS_IsMainThread()); // I/O thread + + RawDBusConnection* connection = GetDBusConnection(); + if (!connection) { + BT_WARNING("%s: DBus connection has been closed.", __FUNCTION__); + return; + } + + nsRefPtr handler = + new AddReservedServiceRecordsReplyHandler(); + + const dbus_uint32_t* services = sServices; + + bool success = connection->SendWithReply( + DBusReplyHandler::Callback, handler.get(), -1, + mAdapterPath.get(), + DBUS_ADAPTER_IFACE, "AddReservedServiceRecords", + DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, + &services, ArrayLength(sServices), DBUS_TYPE_INVALID); + + NS_ENSURE_TRUE_VOID(success); + + handler.forget(); + } + +private: + const nsCString mAdapterPath; +}; + class PrepareAdapterRunnable : public nsRunnable { public: @@ -1353,40 +1398,13 @@ public: { MOZ_ASSERT(NS_IsMainThread()); - static const dbus_uint32_t sServices[] = { - BluetoothServiceClass::HANDSFREE_AG, - BluetoothServiceClass::HEADSET_AG, - BluetoothServiceClass::OBJECT_PUSH - }; - - MOZ_ASSERT(NS_IsMainThread()); - - RawDBusConnection* connection = GetDBusConnection(); - - if (!connection) { - BT_WARNING("%s: DBus connection has been closed.", __FUNCTION__); - return NS_ERROR_FAILURE; - } - sAdapterPath = mAdapterPath; sAuthorizedServiceClass.AppendElement(BluetoothServiceClass::A2DP); sAuthorizedServiceClass.AppendElement(BluetoothServiceClass::HID); - nsRefPtr handler = - new AddReservedServiceRecordsReplyHandler(); - - const dbus_uint32_t* services = sServices; - - bool success = connection->SendWithReply( - DBusReplyHandler::Callback, handler.get(), -1, - NS_ConvertUTF16toUTF8(sAdapterPath).get(), - DBUS_ADAPTER_IFACE, "AddReservedServiceRecords", - DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, - &services, ArrayLength(sServices), DBUS_TYPE_INVALID); - - NS_ENSURE_TRUE(success, NS_ERROR_FAILURE); - - handler.forget(); + Task* task = new + AddReservedServiceRecordsTask(NS_ConvertUTF16toUTF8(sAdapterPath)); + DispatchToDBusThread(task); return NS_OK; } @@ -1965,6 +1983,39 @@ private: nsString mAdapterPath; }; +class DefaultAdapterTask : public Task +{ +public: + DefaultAdapterTask(BluetoothReplyRunnable* aRunnable) + : mRunnable(aRunnable) + { + MOZ_ASSERT(mRunnable); + } + + void Run() MOZ_OVERRIDE + { + MOZ_ASSERT(!NS_IsMainThread()); // I/O thread + + nsRefPtr handler = + new DefaultAdapterPathReplyHandler(mRunnable); + + RawDBusConnection* connection = GetDBusConnection(); + MOZ_ASSERT(connection); + + bool success = connection->SendWithReply( + DefaultAdapterPathReplyHandler::Callback, + handler.get(), 1000, + "/", DBUS_MANAGER_IFACE, "DefaultAdapter", + DBUS_TYPE_INVALID); + NS_ENSURE_TRUE_VOID(success); + + handler.forget(); + } + +private: + nsRefPtr mRunnable; +}; + nsresult BluetoothDBusService::GetDefaultAdapterPathInternal( BluetoothReplyRunnable* aRunnable) @@ -1977,21 +2028,8 @@ BluetoothDBusService::GetDefaultAdapterPathInternal( return NS_OK; } - nsRefPtr handler = - new DefaultAdapterPathReplyHandler(aRunnable); - - RawDBusConnection* connection = GetDBusConnection(); - MOZ_ASSERT(connection); - - bool success = connection->SendWithReply( - DefaultAdapterPathReplyHandler::Callback, - handler.get(), 1000, - "/", DBUS_MANAGER_IFACE, "DefaultAdapter", - DBUS_TYPE_INVALID); - - NS_ENSURE_TRUE(success, NS_ERROR_FAILURE); - - handler.forget(); + Task* task = new DefaultAdapterTask(aRunnable); + DispatchToDBusThread(task); return NS_OK; } @@ -2013,6 +2051,45 @@ OnSendDiscoveryMessageReply(DBusMessage *aReply, void *aData) DispatchBluetoothReply(runnable.get(), BluetoothValue(true), errorStr); } +class SendDiscoveryMessageTask : public Task +{ +public: + SendDiscoveryMessageTask(const nsACString& aAdapterPath, + const char* aMessageName, + BluetoothReplyRunnable* aRunnable) + : mAdapterPath(aAdapterPath) + , mMessageName(aMessageName) + , mRunnable(aRunnable) + { + MOZ_ASSERT(!mAdapterPath.IsEmpty()); + MOZ_ASSERT(!mMessageName.IsEmpty()); + MOZ_ASSERT(mRunnable); + } + + void Run() MOZ_OVERRIDE + { + MOZ_ASSERT(!NS_IsMainThread()); // I/O thread + + RawDBusConnection* connection = GetDBusConnection(); + MOZ_ASSERT(connection); + + bool success = connection->SendWithReply( + OnSendDiscoveryMessageReply, + static_cast(mRunnable.get()), -1, + mAdapterPath.get(), + DBUS_ADAPTER_IFACE, mMessageName.get(), + DBUS_TYPE_INVALID); + NS_ENSURE_TRUE_VOID(success); + + mRunnable.forget(); + } + +private: + const nsCString mAdapterPath; + const nsCString mMessageName; + nsRefPtr mRunnable; +}; + nsresult BluetoothDBusService::SendDiscoveryMessage(const char* aMessageName, BluetoothReplyRunnable* aRunnable) @@ -2026,21 +2103,9 @@ BluetoothDBusService::SendDiscoveryMessage(const char* aMessageName, return NS_OK; } - nsRefPtr runnable(aRunnable); - - RawDBusConnection* connection = GetDBusConnection(); - MOZ_ASSERT(connection); - - bool success = connection->SendWithReply( - OnSendDiscoveryMessageReply, - static_cast(aRunnable), -1, - NS_ConvertUTF16toUTF8(sAdapterPath).get(), - DBUS_ADAPTER_IFACE, aMessageName, - DBUS_TYPE_INVALID); - - NS_ENSURE_TRUE(success, NS_ERROR_FAILURE); - - runnable.forget(); + Task* task = new SendDiscoveryMessageTask( + NS_ConvertUTF16toUTF8(sAdapterPath), aMessageName, aRunnable); + DispatchToDBusThread(task); return NS_OK; } @@ -2064,6 +2129,50 @@ BluetoothDBusService::SendInputMessage(const nsAString& aDeviceAddress, return SendAsyncDBusMessage(objectPath, DBUS_INPUT_IFACE, aMessage, callback); } +class SendAsyncDBusMessageTask : public Task +{ +public: + SendAsyncDBusMessageTask(DBusReplyCallback aCallback, + BluetoothServiceClass* aServiceClass, + const nsACString& aObjectPath, + const char* aInterface, + const nsACString& aMessage) + : mCallback(aCallback) + , mServiceClass(aServiceClass) + , mObjectPath(aObjectPath) + , mInterface(aInterface) + , mMessage(aMessage) + { + MOZ_ASSERT(mServiceClass); + MOZ_ASSERT(!mObjectPath.IsEmpty()); + MOZ_ASSERT(!mInterface.IsEmpty()); + MOZ_ASSERT(!mMessage.IsEmpty()); + } + + void Run() MOZ_OVERRIDE + { + MOZ_ASSERT(!NS_IsMainThread()); // I/O thread + + RawDBusConnection* connection = GetDBusConnection(); + MOZ_ASSERT(connection); + + bool success = connection->SendWithReply( + mCallback, static_cast(mServiceClass), -1, + mObjectPath.get(), mInterface.get(), mMessage.get(), + DBUS_TYPE_INVALID); + NS_ENSURE_TRUE_VOID(success); + + mServiceClass.forget(); + } + +private: + DBusReplyCallback mCallback; + nsAutoPtr mServiceClass; + const nsCString mObjectPath; + const nsCString mInterface; + const nsCString mMessage; +}; + nsresult BluetoothDBusService::SendAsyncDBusMessage(const nsAString& aObjectPath, const char* aInterface, @@ -2076,8 +2185,6 @@ BluetoothDBusService::SendAsyncDBusMessage(const nsAString& aObjectPath, MOZ_ASSERT(!aObjectPath.IsEmpty()); MOZ_ASSERT(aInterface); - NS_ENSURE_TRUE(GetDBusConnection(), NS_ERROR_FAILURE); - nsAutoPtr serviceClass(new BluetoothServiceClass()); if (!strcmp(aInterface, DBUS_SINK_IFACE)) { *serviceClass = BluetoothServiceClass::A2DP; @@ -2088,16 +2195,12 @@ BluetoothDBusService::SendAsyncDBusMessage(const nsAString& aObjectPath, return NS_ERROR_FAILURE; } - RawDBusConnection* connection = GetDBusConnection(); - MOZ_ASSERT(connection); - - bool ret = connection->SendWithReply( - aCallback, static_cast(serviceClass.forget()), -1, - NS_ConvertUTF16toUTF8(aObjectPath).get(), - aInterface, NS_ConvertUTF16toUTF8(aMessage).get(), - DBUS_TYPE_INVALID); - - NS_ENSURE_TRUE(ret, NS_ERROR_FAILURE); + Task* task = new SendAsyncDBusMessageTask(aCallback, + serviceClass.forget(), + NS_ConvertUTF16toUTF8(aObjectPath), + aInterface, + NS_ConvertUTF16toUTF8(aMessage)); + DispatchToDBusThread(task); return NS_OK; } @@ -2137,14 +2240,17 @@ class BluetoothArrayOfDevicePropertiesReplyHandler : public DBusReplyHandler { public: BluetoothArrayOfDevicePropertiesReplyHandler( + const nsString& aAdapterPath, const nsTArray& aDeviceAddresses, const FilterFunc aFilterFunc, BluetoothReplyRunnable* aRunnable) - : mDeviceAddresses(aDeviceAddresses) + : mAdapterPath(aAdapterPath) + , mDeviceAddresses(aDeviceAddresses) , mProcessedDeviceAddresses(0) , mFilterFunc(aFilterFunc) , mRunnable(aRunnable) , mValues(InfallibleTArray()) { + MOZ_ASSERT(!mAdapterPath.IsEmpty()); MOZ_ASSERT(mRunnable); } @@ -2230,10 +2336,10 @@ protected: bool SendNextGetProperties() { MOZ_ASSERT(mProcessedDeviceAddresses < mDeviceAddresses.Length()); - MOZ_ASSERT(!sAdapterPath.IsEmpty()); + MOZ_ASSERT(!mAdapterPath.IsEmpty()); // cache object path for reply - mObjectPath = GetObjectPathFromAddress(sAdapterPath, + mObjectPath = GetObjectPathFromAddress(mAdapterPath, mDeviceAddresses[mProcessedDeviceAddresses]); RawDBusConnection* connection = GetDBusConnection(); @@ -2260,6 +2366,7 @@ protected: } private: + nsString mAdapterPath; nsString mObjectPath; const nsTArray mDeviceAddresses; nsTArray::size_type mProcessedDeviceAddresses; @@ -2268,6 +2375,31 @@ private: BluetoothValue mValues; }; +class ProcessRemainingDeviceAddressesTask : public Task +{ +public: + ProcessRemainingDeviceAddressesTask( + BluetoothArrayOfDevicePropertiesReplyHandler* aHandler, + BluetoothReplyRunnable* aRunnable) + : mHandler(aHandler) + , mRunnable(aRunnable) + { + MOZ_ASSERT(mHandler); + MOZ_ASSERT(mRunnable); + } + + void Run() MOZ_OVERRIDE + { + MOZ_ASSERT(!NS_IsMainThread()); // I/O thread + + mHandler->ProcessRemainingDeviceAddresses(); + } + +private: + nsRefPtr mHandler; + nsRefPtr mRunnable; +}; + nsresult BluetoothDBusService::GetConnectedDevicePropertiesInternal(uint16_t aServiceUuid, BluetoothReplyRunnable* aRunnable) @@ -2297,12 +2429,13 @@ BluetoothDBusService::GetConnectedDevicePropertiesInternal(uint16_t aServiceUuid deviceAddresses.AppendElement(address); } - nsRefPtr runnable = aRunnable; - nsRefPtr handler = - new BluetoothArrayOfDevicePropertiesReplyHandler(deviceAddresses, + BluetoothArrayOfDevicePropertiesReplyHandler* handler = + new BluetoothArrayOfDevicePropertiesReplyHandler(sAdapterPath, + deviceAddresses, GetConnectedDevicesFilter, - runnable); - handler->ProcessRemainingDeviceAddresses(); + aRunnable); + Task* task = new ProcessRemainingDeviceAddressesTask(handler, aRunnable); + DispatchToDBusThread(task); return NS_OK; } @@ -2320,16 +2453,152 @@ BluetoothDBusService::GetPairedDevicePropertiesInternal( return NS_OK; } - nsRefPtr runnable = aRunnable; - nsRefPtr handler = - new BluetoothArrayOfDevicePropertiesReplyHandler(aDeviceAddresses, + BluetoothArrayOfDevicePropertiesReplyHandler* handler = + new BluetoothArrayOfDevicePropertiesReplyHandler(sAdapterPath, + aDeviceAddresses, GetPairedDevicesFilter, - runnable); - handler->ProcessRemainingDeviceAddresses(); + aRunnable); + Task* task = new ProcessRemainingDeviceAddressesTask(handler, aRunnable); + DispatchToDBusThread(task); return NS_OK; } +class SetPropertyTask : public Task +{ +public: + SetPropertyTask(const nsACString& aAdapterPath, + BluetoothObjectType aType, + const nsACString& aName, + BluetoothReplyRunnable* aRunnable) + : mAdapterPath(aAdapterPath) + , mType(aType) + , mName(aName) + , mRunnable(aRunnable) + { + MOZ_ASSERT(!mAdapterPath.IsEmpty()); + MOZ_ASSERT(mRunnable); + } + + void Send(unsigned int aType, const void* aValue) + { + MOZ_ASSERT(!NS_IsMainThread()); // I/O thread + + DBusMessage* msg = + dbus_message_new_method_call("org.bluez", + mAdapterPath.get(), + sBluetoothDBusIfaces[mType], + "SetProperty"); + if (!msg) { + BT_WARNING("Could not allocate D-Bus message object!"); + return; + } + + const char* name = mName.get(); + if (!dbus_message_append_args(msg, DBUS_TYPE_STRING, &name, + DBUS_TYPE_INVALID)) { + BT_WARNING("Couldn't append arguments to dbus message!"); + return; + } + + DBusMessageIter value_iter, iter; + dbus_message_iter_init_append(msg, &iter); + char var_type[2] = {(char)aType, '\0'}; + if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT, + var_type, &value_iter) || + !dbus_message_iter_append_basic(&value_iter, aType, aValue) || + !dbus_message_iter_close_container(&iter, &value_iter)) { + BT_WARNING("Could not append argument to method call!"); + dbus_message_unref(msg); + return; + } + + RawDBusConnection* connection = GetDBusConnection(); + MOZ_ASSERT(connection); + + // msg is unref'd as part of SendWithReply + bool success = connection->SendWithReply(GetVoidCallback, + static_cast(mRunnable), + 1000, msg); + NS_ENSURE_TRUE_VOID(success); + + mRunnable.forget(); + } + +private: + const nsCString mAdapterPath; + BluetoothObjectType mType; + const nsCString mName; + nsRefPtr mRunnable; +}; + +class SetUInt32PropertyTask : public SetPropertyTask +{ +public: + SetUInt32PropertyTask(const nsACString& aAdapterPath, + BluetoothObjectType aType, + const nsACString& aName, + uint32_t aValue, + BluetoothReplyRunnable* aRunnable) + : SetPropertyTask(aAdapterPath, aType, aName, aRunnable) + , mValue(aValue) + { + } + + void Run() MOZ_OVERRIDE + { + Send(DBUS_TYPE_UINT32, &mValue); + } + +private: + dbus_uint32_t mValue; +}; + +class SetStringPropertyTask : public SetPropertyTask +{ +public: + SetStringPropertyTask(const nsACString& aAdapterPath, + BluetoothObjectType aType, + const nsACString& aName, + const nsACString& aValue, + BluetoothReplyRunnable* aRunnable) + : SetPropertyTask(aAdapterPath, aType, aName, aRunnable) + , mValue(aValue) + { + } + + void Run() MOZ_OVERRIDE + { + const char* value = mValue.get(); + Send(DBUS_TYPE_STRING, &value); + } + +private: + const nsCString mValue; +}; + +class SetBooleanPropertyTask : public SetPropertyTask +{ +public: + SetBooleanPropertyTask(const nsACString& aAdapterPath, + BluetoothObjectType aType, + const nsACString& aName, + dbus_bool_t aValue, + BluetoothReplyRunnable* aRunnable) + : SetPropertyTask(aAdapterPath, aType, aName, aRunnable) + , mValue(aValue) + { + } + + void Run() MOZ_OVERRIDE + { + Send(DBUS_TYPE_BOOLEAN, &mValue); + } + +private: + dbus_bool_t mValue; +}; + nsresult BluetoothDBusService::SetProperty(BluetoothObjectType aType, const BluetoothNamedValue& aValue, @@ -2343,149 +2612,171 @@ BluetoothDBusService::SetProperty(BluetoothObjectType aType, return NS_OK; } - MOZ_ASSERT(aType < (int)ArrayLength(sBluetoothDBusIfaces)); - MOZ_ASSERT(!sAdapterPath.IsEmpty()); - const char* interface = sBluetoothDBusIfaces[aType]; + Task* task; - /* Compose the command */ - DBusMessage* msg = dbus_message_new_method_call( - "org.bluez", - NS_ConvertUTF16toUTF8(sAdapterPath).get(), - interface, - "SetProperty"); - - if (!msg) { - BT_WARNING("Could not allocate D-Bus message object!"); - return NS_ERROR_FAILURE; - } - - nsCString intermediatePropName(NS_ConvertUTF16toUTF8(aValue.name())); - const char* propName = intermediatePropName.get(); - if (!dbus_message_append_args(msg, DBUS_TYPE_STRING, &propName, - DBUS_TYPE_INVALID)) { - BT_WARNING("Couldn't append arguments to dbus message!"); - return NS_ERROR_FAILURE; - } - - int type; - int tmp_int; - void* val; - const char* tempStr; - nsCString str; if (aValue.value().type() == BluetoothValue::Tuint32_t) { - tmp_int = aValue.value().get_uint32_t(); - val = &tmp_int; - type = DBUS_TYPE_UINT32; + task = new SetUInt32PropertyTask( + NS_ConvertUTF16toUTF8(sAdapterPath), aType, + NS_ConvertUTF16toUTF8(aValue.name()), + aValue.value().get_uint32_t(), aRunnable); } else if (aValue.value().type() == BluetoothValue::TnsString) { - str = NS_ConvertUTF16toUTF8(aValue.value().get_nsString()); - tempStr = str.get(); - val = &tempStr; - type = DBUS_TYPE_STRING; + task = new SetStringPropertyTask( + NS_ConvertUTF16toUTF8(sAdapterPath), aType, + NS_ConvertUTF16toUTF8(aValue.name()), + NS_ConvertUTF16toUTF8(aValue.value().get_nsString()), aRunnable); } else if (aValue.value().type() == BluetoothValue::Tbool) { - tmp_int = aValue.value().get_bool() ? 1 : 0; - val = &(tmp_int); - type = DBUS_TYPE_BOOLEAN; + task = new SetBooleanPropertyTask( + NS_ConvertUTF16toUTF8(sAdapterPath), aType, + NS_ConvertUTF16toUTF8(aValue.name()), + aValue.value().get_bool(), aRunnable); } else { BT_WARNING("Property type not handled!"); - dbus_message_unref(msg); return NS_ERROR_FAILURE; } + DispatchToDBusThread(task); - DBusMessageIter value_iter, iter; - dbus_message_iter_init_append(msg, &iter); - char var_type[2] = {(char)type, '\0'}; - if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT, - var_type, &value_iter) || - !dbus_message_iter_append_basic(&value_iter, type, val) || - !dbus_message_iter_close_container(&iter, &value_iter)) { - BT_WARNING("Could not append argument to method call!"); - dbus_message_unref(msg); - return NS_ERROR_FAILURE; - } - - nsRefPtr runnable = aRunnable; - - RawDBusConnection* connection = GetDBusConnection(); - MOZ_ASSERT(connection); - - // msg is unref'd as part of SendWithReply - bool success = connection->SendWithReply(GetVoidCallback, - (void*)aRunnable, - 1000, msg); - if (!success) { - BT_WARNING("SendWithReply failed"); - return NS_ERROR_FAILURE; - } - runnable.forget(); return NS_OK; } +class CreatePairedDeviceInternalTask : public Task +{ +public: + CreatePairedDeviceInternalTask(const nsACString& aAdapterPath, + const nsACString& aDeviceAddress, + int aTimeout, + BluetoothReplyRunnable* aRunnable) + : mAdapterPath(aAdapterPath) + , mDeviceAddress(aDeviceAddress) + , mTimeout(aTimeout) + , mRunnable(aRunnable) + { + MOZ_ASSERT(!mAdapterPath.IsEmpty()); + MOZ_ASSERT(!mDeviceAddress.IsEmpty()); + MOZ_ASSERT(mRunnable); + } + + void Run() MOZ_OVERRIDE + { + MOZ_ASSERT(!NS_IsMainThread()); // I/O thread + + const char *deviceAddress = mDeviceAddress.get(); + const char *deviceAgentPath = KEY_REMOTE_AGENT; + const char *capabilities = B2G_AGENT_CAPABILITIES; + + RawDBusConnection* connection = GetDBusConnection(); + MOZ_ASSERT(connection); + + // Then send CreatePairedDevice, it will register a temp device agent then + // unregister it after pairing process is over + bool success = connection->SendWithReply( + GetObjectPathCallback, static_cast(mRunnable), mTimeout, + mAdapterPath.get(), + DBUS_ADAPTER_IFACE, + "CreatePairedDevice", + DBUS_TYPE_STRING, &deviceAddress, + DBUS_TYPE_OBJECT_PATH, &deviceAgentPath, + DBUS_TYPE_STRING, &capabilities, + DBUS_TYPE_INVALID); + NS_ENSURE_SUCCESS_VOID(success); + + mRunnable.forget(); + + /** + * FIXME: Bug 820274 + * + * If the user turns off Bluetooth in the middle of pairing process, + * the callback function GetObjectPathCallback may still be called + * while enabling next time by dbus daemon. To prevent this from + * happening, added a flag to distinguish if Bluetooth has been + * turned off. Nevertheless, we need a check if there is a better + * solution. + * + * Please see Bug 818696 for more information. + */ + sIsPairing++; + } + +private: + const nsCString mAdapterPath; + const nsCString mDeviceAddress; + int mTimeout; + nsRefPtr mRunnable; +}; + nsresult BluetoothDBusService::CreatePairedDeviceInternal( const nsAString& aDeviceAddress, int aTimeout, BluetoothReplyRunnable* aRunnable) { - const char *capabilities = B2G_AGENT_CAPABILITIES; - const char *deviceAgentPath = KEY_REMOTE_AGENT; + Task* task = new CreatePairedDeviceInternalTask( + NS_ConvertUTF16toUTF8(sAdapterPath), + NS_ConvertUTF16toUTF8(aDeviceAddress), + aTimeout, aRunnable); + DispatchToDBusThread(task); - nsCString tempDeviceAddress = NS_ConvertUTF16toUTF8(aDeviceAddress); - const char *deviceAddress = tempDeviceAddress.get(); - - /** - * FIXME: Bug 820274 - * - * If the user turns off Bluetooth in the middle of pairing process, the - * callback function GetObjectPathCallback (see the third argument of the - * function call above) may still be called while enabling next time by - * dbus daemon. To prevent this from happening, added a flag to distinguish - * if Bluetooth has been turned off. Nevertheless, we need a check if there - * is a better solution. - * - * Please see Bug 818696 for more information. - */ - sIsPairing++; - - nsRefPtr runnable = aRunnable; - MOZ_ASSERT(!sAdapterPath.IsEmpty()); - - RawDBusConnection* connection = GetDBusConnection(); - MOZ_ASSERT(connection); - - // Then send CreatePairedDevice, it will register a temp device agent then - // unregister it after pairing process is over - bool ret = connection->SendWithReply( - GetObjectPathCallback, (void*)runnable, aTimeout, - NS_ConvertUTF16toUTF8(sAdapterPath).get(), - DBUS_ADAPTER_IFACE, - "CreatePairedDevice", - DBUS_TYPE_STRING, &deviceAddress, - DBUS_TYPE_OBJECT_PATH, &deviceAgentPath, - DBUS_TYPE_STRING, &capabilities, - DBUS_TYPE_INVALID); - if (!ret) { - BT_WARNING("Could not start async function!"); - return NS_ERROR_FAILURE; - } - - runnable.forget(); return NS_OK; } -static void -OnRemoveDeviceReply(DBusMessage *aReply, void *aData) +class RemoveDeviceTask : public Task { - nsAutoString errorStr; - - if (!aReply) { - errorStr.AssignLiteral("RemoveDevice failed"); +public: + RemoveDeviceTask(const nsString& aAdapterPath, + const nsAString& aDeviceAddress, + BluetoothReplyRunnable* aRunnable) + : mAdapterPath(aAdapterPath) + , mDeviceAddress(aDeviceAddress) + , mRunnable(aRunnable) + { + MOZ_ASSERT(!mAdapterPath.IsEmpty()); + MOZ_ASSERT(!mDeviceAddress.IsEmpty()); + MOZ_ASSERT(mRunnable); } - nsRefPtr runnable = - dont_AddRef(static_cast(aData)); + void Run() MOZ_OVERRIDE + { + MOZ_ASSERT(!NS_IsMainThread()); // I/O thread - DispatchBluetoothReply(runnable.get(), BluetoothValue(true), errorStr); -} + nsCString deviceObjectPath = + NS_ConvertUTF16toUTF8(GetObjectPathFromAddress(mAdapterPath, + mDeviceAddress)); + const char* cstrDeviceObjectPath = deviceObjectPath.get(); + + RawDBusConnection* connection = GetDBusConnection(); + MOZ_ASSERT(connection); + + bool success = connection->SendWithReply( + OnRemoveDeviceReply, static_cast(mRunnable.get()), -1, + NS_ConvertUTF16toUTF8(mAdapterPath).get(), + DBUS_ADAPTER_IFACE, "RemoveDevice", + DBUS_TYPE_OBJECT_PATH, &cstrDeviceObjectPath, + DBUS_TYPE_INVALID); + NS_ENSURE_TRUE_VOID(success); + + mRunnable.forget(); + } + +protected: + static void OnRemoveDeviceReply(DBusMessage* aReply, void* aData) + { + nsAutoString errorStr; + + if (!aReply) { + errorStr.AssignLiteral("RemoveDevice failed"); + } + + nsRefPtr runnable = + dont_AddRef( + static_cast(aData)); + + DispatchBluetoothReply(runnable.get(), BluetoothValue(true), errorStr); + } + +private: + const nsString mAdapterPath; + const nsString mDeviceAddress; + nsRefPtr mRunnable; +}; nsresult BluetoothDBusService::RemoveDeviceInternal(const nsAString& aDeviceAddress, @@ -2499,128 +2790,230 @@ BluetoothDBusService::RemoveDeviceInternal(const nsAString& aDeviceAddress, return NS_OK; } - MOZ_ASSERT(!sAdapterPath.IsEmpty()); - nsCString deviceObjectPath = - NS_ConvertUTF16toUTF8(GetObjectPathFromAddress(sAdapterPath, - aDeviceAddress)); - const char* cstrDeviceObjectPath = deviceObjectPath.get(); - - nsRefPtr runnable(aRunnable); - - RawDBusConnection* connection = GetDBusConnection(); - MOZ_ASSERT(connection); - - bool success = connection->SendWithReply( - OnRemoveDeviceReply, static_cast(runnable.get()), -1, - NS_ConvertUTF16toUTF8(sAdapterPath).get(), - DBUS_ADAPTER_IFACE, "RemoveDevice", - DBUS_TYPE_OBJECT_PATH, &cstrDeviceObjectPath, - DBUS_TYPE_INVALID); - - NS_ENSURE_TRUE(success, NS_ERROR_FAILURE); - - runnable.forget(); + Task* task = new RemoveDeviceTask(sAdapterPath, aDeviceAddress, aRunnable); + DispatchToDBusThread(task); return NS_OK; } +class SetPinCodeTask : public Task +{ +public: + SetPinCodeTask(const nsAString& aDeviceAddress, + const nsACString& aPinCode, + BluetoothReplyRunnable* aRunnable) + : mDeviceAddress(aDeviceAddress) + , mPinCode(aPinCode) + , mRunnable(aRunnable) + { + MOZ_ASSERT(!mDeviceAddress.IsEmpty()); + MOZ_ASSERT(mRunnable); + } + + void Run() MOZ_OVERRIDE + { + MOZ_ASSERT(!NS_IsMainThread()); // I/O thread + + nsAutoString errorStr; + BluetoothValue v = true; + DBusMessage *msg; + if (!sPairingReqTable->Get(mDeviceAddress, &msg)) { + BT_WARNING("%s: Couldn't get original request message.", __FUNCTION__); + errorStr.AssignLiteral("Couldn't get original request message."); + DispatchBluetoothReply(mRunnable, v, errorStr); + return; + } + + DBusMessage *reply = dbus_message_new_method_return(msg); + + if (!reply) { + BT_WARNING("%s: Memory can't be allocated for the message.", __FUNCTION__); + dbus_message_unref(msg); + errorStr.AssignLiteral("Memory can't be allocated for the message."); + DispatchBluetoothReply(mRunnable, v, errorStr); + return; + } + + const char* pinCode = mPinCode.get(); + + if (!dbus_message_append_args(reply, + DBUS_TYPE_STRING, &pinCode, + DBUS_TYPE_INVALID)) { + BT_WARNING("%s: Couldn't append arguments to dbus message.", __FUNCTION__); + errorStr.AssignLiteral("Couldn't append arguments to dbus message."); + } else { + RawDBusConnection* connection = GetDBusConnection(); + MOZ_ASSERT(connection); + connection->Send(reply); + } + + dbus_message_unref(msg); + dbus_message_unref(reply); + + sPairingReqTable->Remove(mDeviceAddress); + DispatchBluetoothReply(mRunnable, v, errorStr); + } + +private: + const nsString mDeviceAddress; + const nsCString mPinCode; + nsRefPtr mRunnable; +}; + bool BluetoothDBusService::SetPinCodeInternal(const nsAString& aDeviceAddress, const nsAString& aPinCode, BluetoothReplyRunnable* aRunnable) { - nsAutoString errorStr; - BluetoothValue v = true; - DBusMessage *msg; - if (!sPairingReqTable->Get(aDeviceAddress, &msg)) { - BT_WARNING("%s: Couldn't get original request message.", __FUNCTION__); - errorStr.AssignLiteral("Couldn't get original request message."); - DispatchBluetoothReply(aRunnable, v, errorStr); - return false; - } + Task* task = new SetPinCodeTask(aDeviceAddress, + NS_ConvertUTF16toUTF8(aPinCode), + aRunnable); + DispatchToDBusThread(task); - DBusMessage *reply = dbus_message_new_method_return(msg); - - if (!reply) { - BT_WARNING("%s: Memory can't be allocated for the message.", __FUNCTION__); - dbus_message_unref(msg); - errorStr.AssignLiteral("Memory can't be allocated for the message."); - DispatchBluetoothReply(aRunnable, v, errorStr); - return false; - } - - bool result; - - nsCString tempPinCode = NS_ConvertUTF16toUTF8(aPinCode); - const char* pinCode = tempPinCode.get(); - - if (!dbus_message_append_args(reply, - DBUS_TYPE_STRING, &pinCode, - DBUS_TYPE_INVALID)) { - BT_WARNING("%s: Couldn't append arguments to dbus message.", __FUNCTION__); - errorStr.AssignLiteral("Couldn't append arguments to dbus message."); - result = false; - } else { - RawDBusConnection* connection = GetDBusConnection(); - MOZ_ASSERT(connection); - result = connection->Send(reply); - } - - dbus_message_unref(msg); - dbus_message_unref(reply); - - sPairingReqTable->Remove(aDeviceAddress); - DispatchBluetoothReply(aRunnable, v, errorStr); - return result; + return true; } +class SetPasskeyTask : public Task +{ +public: + SetPasskeyTask(const nsAString& aDeviceAddress, + uint32_t aPasskey, + BluetoothReplyRunnable* aRunnable) + : mDeviceAddress(aDeviceAddress) + , mPasskey(aPasskey) + , mRunnable(aRunnable) + { + MOZ_ASSERT(!mDeviceAddress.IsEmpty()); + MOZ_ASSERT(mRunnable); + } + + void Run() MOZ_OVERRIDE + { + MOZ_ASSERT(!NS_IsMainThread()); // I/O thread + + nsAutoString errorStr; + BluetoothValue v = true; + DBusMessage *msg; + if (!sPairingReqTable->Get(mDeviceAddress, &msg)) { + BT_WARNING("%s: Couldn't get original request message.", __FUNCTION__); + errorStr.AssignLiteral("Couldn't get original request message."); + DispatchBluetoothReply(mRunnable, v, errorStr); + return; + } + + DBusMessage *reply = dbus_message_new_method_return(msg); + + if (!reply) { + BT_WARNING("%s: Memory can't be allocated for the message.", __FUNCTION__); + dbus_message_unref(msg); + errorStr.AssignLiteral("Memory can't be allocated for the message."); + DispatchBluetoothReply(mRunnable, v, errorStr); + return; + } + + uint32_t passkey = mPasskey; + + if (!dbus_message_append_args(reply, + DBUS_TYPE_UINT32, &passkey, + DBUS_TYPE_INVALID)) { + BT_WARNING("%s: Couldn't append arguments to dbus message.", __FUNCTION__); + errorStr.AssignLiteral("Couldn't append arguments to dbus message."); + } else { + RawDBusConnection* connection = GetDBusConnection(); + MOZ_ASSERT(connection); + connection->Send(reply); + } + + dbus_message_unref(msg); + dbus_message_unref(reply); + + sPairingReqTable->Remove(mDeviceAddress); + DispatchBluetoothReply(mRunnable, v, errorStr); + } + +private: + nsString mDeviceAddress; + uint32_t mPasskey; + nsRefPtr mRunnable; +}; + bool BluetoothDBusService::SetPasskeyInternal(const nsAString& aDeviceAddress, uint32_t aPasskey, BluetoothReplyRunnable* aRunnable) { - nsAutoString errorStr; - BluetoothValue v = true; - DBusMessage *msg; - if (!sPairingReqTable->Get(aDeviceAddress, &msg)) { - BT_WARNING("%s: Couldn't get original request message.", __FUNCTION__); - errorStr.AssignLiteral("Couldn't get original request message."); - DispatchBluetoothReply(aRunnable, v, errorStr); - return false; + Task* task = new SetPasskeyTask(aDeviceAddress, + aPasskey, + aRunnable); + DispatchToDBusThread(task); + + return true; +} + +class SetPairingConfirmationTask : public Task +{ +public: + SetPairingConfirmationTask(const nsAString& aDeviceAddress, + bool aConfirm, + BluetoothReplyRunnable* aRunnable) + : mDeviceAddress(aDeviceAddress) + , mConfirm(aConfirm) + , mRunnable(aRunnable) + { + MOZ_ASSERT(!mDeviceAddress.IsEmpty()); + MOZ_ASSERT(mRunnable); } - DBusMessage *reply = dbus_message_new_method_return(msg); + void Run() MOZ_OVERRIDE + { + MOZ_ASSERT(!NS_IsMainThread()); // I/O thread - if (!reply) { - BT_WARNING("%s: Memory can't be allocated for the message.", __FUNCTION__); - dbus_message_unref(msg); - errorStr.AssignLiteral("Memory can't be allocated for the message."); - DispatchBluetoothReply(aRunnable, v, errorStr); - return false; - } + nsAutoString errorStr; + BluetoothValue v = true; + DBusMessage *msg; + if (!sPairingReqTable->Get(mDeviceAddress, &msg)) { + BT_WARNING("%s: Couldn't get original request message.", __FUNCTION__); + errorStr.AssignLiteral("Couldn't get original request message."); + DispatchBluetoothReply(mRunnable, v, errorStr); + return; + } - uint32_t passkey = aPasskey; - bool result; + DBusMessage *reply; + + if (mConfirm) { + reply = dbus_message_new_method_return(msg); + } else { + reply = dbus_message_new_error(msg, "org.bluez.Error.Rejected", + "User rejected confirmation"); + } + + if (!reply) { + BT_WARNING("%s: Memory can't be allocated for the message.", __FUNCTION__); + dbus_message_unref(msg); + errorStr.AssignLiteral("Memory can't be allocated for the message."); + DispatchBluetoothReply(mRunnable, v, errorStr); + return; + } - if (!dbus_message_append_args(reply, - DBUS_TYPE_UINT32, &passkey, - DBUS_TYPE_INVALID)) { - BT_WARNING("%s: Couldn't append arguments to dbus message.", __FUNCTION__); - errorStr.AssignLiteral("Couldn't append arguments to dbus message."); - result = false; - } else { RawDBusConnection* connection = GetDBusConnection(); MOZ_ASSERT(connection); - result = connection->Send(reply); + + bool result = connection->Send(reply); + if (!result) { + errorStr.AssignLiteral("Can't send message!"); + } + dbus_message_unref(msg); + dbus_message_unref(reply); + + sPairingReqTable->Remove(mDeviceAddress); + DispatchBluetoothReply(mRunnable, v, errorStr); } - dbus_message_unref(msg); - dbus_message_unref(reply); - - sPairingReqTable->Remove(aDeviceAddress); - DispatchBluetoothReply(aRunnable, v, errorStr); - return result; -} +private: + nsString mDeviceAddress; + bool mConfirm; + nsRefPtr mRunnable; +}; bool BluetoothDBusService::SetPairingConfirmationInternal( @@ -2628,46 +3021,14 @@ BluetoothDBusService::SetPairingConfirmationInternal( bool aConfirm, BluetoothReplyRunnable* aRunnable) { - nsAutoString errorStr; - BluetoothValue v = true; - DBusMessage *msg; - if (!sPairingReqTable->Get(aDeviceAddress, &msg)) { - BT_WARNING("%s: Couldn't get original request message.", __FUNCTION__); - errorStr.AssignLiteral("Couldn't get original request message."); - DispatchBluetoothReply(aRunnable, v, errorStr); - return false; - } + MOZ_ASSERT(NS_IsMainThread()); - DBusMessage *reply; + Task* task = new SetPairingConfirmationTask(aDeviceAddress, + aConfirm, + aRunnable); + DispatchToDBusThread(task); - if (aConfirm) { - reply = dbus_message_new_method_return(msg); - } else { - reply = dbus_message_new_error(msg, "org.bluez.Error.Rejected", - "User rejected confirmation"); - } - - if (!reply) { - BT_WARNING("%s: Memory can't be allocated for the message.", __FUNCTION__); - dbus_message_unref(msg); - errorStr.AssignLiteral("Memory can't be allocated for the message."); - DispatchBluetoothReply(aRunnable, v, errorStr); - return false; - } - - RawDBusConnection* connection = GetDBusConnection(); - MOZ_ASSERT(connection); - - bool result = connection->Send(reply); - if (!result) { - errorStr.AssignLiteral("Can't send message!"); - } - dbus_message_unref(msg); - dbus_message_unref(reply); - - sPairingReqTable->Remove(aDeviceAddress); - DispatchBluetoothReply(aRunnable, v, errorStr); - return result; + return true; } static void @@ -2880,6 +3241,61 @@ private: BluetoothProfileManagerBase* mBluetoothProfileManager; }; +class GetServiceChannelTask : public Task +{ +public: + GetServiceChannelTask(const nsString& aAdapterPath, + const nsAString& aDeviceAddress, + const nsAString& aServiceUUID, + BluetoothProfileManagerBase* aBluetoothProfileManager) + : mAdapterPath(aAdapterPath) + , mDeviceAddress(aDeviceAddress) + , mServiceUUID(aServiceUUID) + , mBluetoothProfileManager(aBluetoothProfileManager) + { + MOZ_ASSERT(!mAdapterPath.IsEmpty()); + MOZ_ASSERT(!mDeviceAddress.IsEmpty()); + MOZ_ASSERT(mBluetoothProfileManager); + } + + void Run() MOZ_OVERRIDE + { + static const int sProtocolDescriptorList = 0x0004; + + MOZ_ASSERT(!NS_IsMainThread()); // I/O thread + + nsString objectPath = + GetObjectPathFromAddress(mAdapterPath, mDeviceAddress); + + nsRefPtr handler = + new OnGetServiceChannelReplyHandler(objectPath, mServiceUUID, + mBluetoothProfileManager); + + nsCString serviceUUID = NS_ConvertUTF16toUTF8(mServiceUUID); + const char* cstrServiceUUID = serviceUUID.get(); + + RawDBusConnection* connection = GetDBusConnection(); + MOZ_ASSERT(connection); + + bool success = connection->SendWithReply( + OnGetServiceChannelReplyHandler::Callback, handler, -1, + NS_ConvertUTF16toUTF8(objectPath).get(), + DBUS_DEVICE_IFACE, "GetServiceAttributeValue", + DBUS_TYPE_STRING, &cstrServiceUUID, + DBUS_TYPE_UINT16, &sProtocolDescriptorList, + DBUS_TYPE_INVALID); + NS_ENSURE_TRUE_VOID(success); + + handler.forget(); + } + +private: + nsString mAdapterPath; + nsString mDeviceAddress; + nsString mServiceUUID; + BluetoothProfileManagerBase* mBluetoothProfileManager; +}; + nsresult BluetoothDBusService::GetServiceChannel(const nsAString& aDeviceAddress, const nsAString& aServiceUUID, @@ -2892,34 +3308,19 @@ BluetoothDBusService::GetServiceChannel(const nsAString& aDeviceAddress, return NS_OK; } +#ifdef MOZ_WIDGET_GONK + // GetServiceAttributeValue only exists in android's bluez dbus binding + // implementation + + Task* task = new GetServiceChannelTask(sAdapterPath, + aDeviceAddress, + aServiceUUID, + aManager); + DispatchToDBusThread(task); +#else MOZ_ASSERT(!sAdapterPath.IsEmpty()); nsString objectPath(GetObjectPathFromAddress(sAdapterPath, aDeviceAddress)); -#ifdef MOZ_WIDGET_GONK - static const int sProtocolDescriptorList = 0x0004; - - // GetServiceAttributeValue only exists in android's bluez dbus binding - // implementation - nsCString serviceUUID = NS_ConvertUTF16toUTF8(aServiceUUID); - const char* cstrServiceUUID = serviceUUID.get(); - - nsRefPtr handler = - new OnGetServiceChannelReplyHandler(objectPath, aServiceUUID, aManager); - - RawDBusConnection* connection = GetDBusConnection(); - MOZ_ASSERT(connection); - - bool success = connection->SendWithReply( - OnGetServiceChannelReplyHandler::Callback, handler, -1, - NS_ConvertUTF16toUTF8(objectPath).get(), - DBUS_DEVICE_IFACE, "GetServiceAttributeValue", - DBUS_TYPE_STRING, &cstrServiceUUID, - DBUS_TYPE_UINT16, &sProtocolDescriptorList, - DBUS_TYPE_INVALID); - NS_ENSURE_TRUE(success, NS_ERROR_FAILURE); - - handler.forget(); -#else // FIXME/Bug 793977 qdot: Just set something for desktop, until we have a // parser for the GetServiceAttributes xml block // @@ -2936,42 +3337,65 @@ BluetoothDBusService::GetServiceChannel(const nsAString& aDeviceAddress, return NS_OK; } -static void -DiscoverServicesCallback(DBusMessage* aMsg, void* aData) +class UpdateSdpRecordsTask : public Task { - MOZ_ASSERT(!NS_IsMainThread()); +public: + UpdateSdpRecordsTask(const nsString& aObjectPath, + BluetoothProfileManagerBase* aBluetoothProfileManager) + : mObjectPath(aObjectPath) + , mBluetoothProfileManager(aBluetoothProfileManager) + { + MOZ_ASSERT(!mObjectPath.IsEmpty()); + MOZ_ASSERT(mBluetoothProfileManager); + } - nsRefPtr r( - static_cast(aData)); - NS_DispatchToMainThread(r); -} + void Run() MOZ_OVERRIDE + { + MOZ_ASSERT(!NS_IsMainThread()); // I/O thread + + // I choose to use raw pointer here because this is going to be passed as an + // argument into SendWithReply() at once. + OnUpdateSdpRecordsRunnable* callbackRunnable = + new OnUpdateSdpRecordsRunnable(mObjectPath, mBluetoothProfileManager); + + RawDBusConnection* connection = GetDBusConnection(); + MOZ_ASSERT(connection); + + connection->SendWithReply(DiscoverServicesCallback, + (void*)callbackRunnable, -1, + NS_ConvertUTF16toUTF8(mObjectPath).get(), + DBUS_DEVICE_IFACE, + "DiscoverServices", + DBUS_TYPE_STRING, &EmptyCString(), + DBUS_TYPE_INVALID); + } + +protected: + static void DiscoverServicesCallback(DBusMessage* aMsg, void* aData) + { + MOZ_ASSERT(!NS_IsMainThread()); // I/O thread + + nsRefPtr r( + static_cast(aData)); + NS_DispatchToMainThread(r); + } + +private: + const nsString mObjectPath; + BluetoothProfileManagerBase* mBluetoothProfileManager; +}; bool BluetoothDBusService::UpdateSdpRecords(const nsAString& aDeviceAddress, BluetoothProfileManagerBase* aManager) { MOZ_ASSERT(NS_IsMainThread()); - MOZ_ASSERT(!aDeviceAddress.IsEmpty()); - MOZ_ASSERT(!sAdapterPath.IsEmpty()); - MOZ_ASSERT(aManager); - nsString objectPath(GetObjectPathFromAddress(sAdapterPath, aDeviceAddress)); + Task* task = new UpdateSdpRecordsTask( + GetObjectPathFromAddress(sAdapterPath, aDeviceAddress), aManager); + DispatchToDBusThread(task); - // I choose to use raw pointer here because this is going to be passed as an - // argument into SendWithReply() at once. - OnUpdateSdpRecordsRunnable* callbackRunnable = - new OnUpdateSdpRecordsRunnable(objectPath, aManager); - - RawDBusConnection* connection = GetDBusConnection(); - MOZ_ASSERT(connection); - - return connection->SendWithReply(DiscoverServicesCallback, - (void*)callbackRunnable, -1, - NS_ConvertUTF16toUTF8(objectPath).get(), - DBUS_DEVICE_IFACE, - "DiscoverServices", - DBUS_TYPE_STRING, &EmptyCString(), - DBUS_TYPE_INVALID); + return true; } void @@ -3076,6 +3500,92 @@ BluetoothDBusService::IsScoConnected(BluetoothReplyRunnable* aRunnable) DispatchBluetoothReply(aRunnable, hfp->IsScoConnected(), EmptyString()); } +class SendMetadataTask : public Task +{ +public: + SendMetadataTask(const nsACString& aObjectPath, + const nsACString& aTitle, + const nsACString& aArtist, + const nsACString& aAlbum, + int64_t aMediaNumber, + int64_t aTotalMediaCount, + int64_t aDuration, + BluetoothReplyRunnable* aRunnable) + : mObjectPath(aObjectPath) + , mTitle(aTitle) + , mArtist(aArtist) + , mAlbum(aAlbum) + , mMediaNumber(aMediaNumber) + , mTotalMediaCount(aTotalMediaCount) + , mDuration(aDuration) + , mRunnable(aRunnable) + { + MOZ_ASSERT(!mObjectPath.IsEmpty()); + MOZ_ASSERT(mRunnable); + } + + void Run() MOZ_OVERRIDE + { + MOZ_ASSERT(!NS_IsMainThread()); // I/O thread + + // We currently don't support genre field in music player. + // In order to send media metadata through AVRCP, we set genre to an empty + // string to match the BlueZ method "UpdateMetaData" with signature "sssssss", + // which takes genre field as the last parameter. + nsCString tempGenre = EmptyCString(); + nsCString tempMediaNumber = EmptyCString(); + nsCString tempTotalMediaCount = EmptyCString(); + nsCString tempDuration = EmptyCString(); + + if (mMediaNumber >= 0) { + tempMediaNumber.AppendInt(mMediaNumber); + } + if (mTotalMediaCount >= 0) { + tempTotalMediaCount.AppendInt(mTotalMediaCount); + } + if (mDuration >= 0) { + tempDuration.AppendInt(mDuration); + } + + const char* title = mTitle.get(); + const char* album = mAlbum.get(); + const char* artist = mArtist.get(); + const char* mediaNumber = tempMediaNumber.get(); + const char* totalMediaCount = tempTotalMediaCount.get(); + const char* duration = tempDuration.get(); + const char* genre = tempGenre.get(); + + RawDBusConnection* connection = GetDBusConnection(); + MOZ_ASSERT(connection); + + bool success = connection->SendWithReply( + GetVoidCallback, static_cast(mRunnable.get()), -1, + mObjectPath.get(), + DBUS_CTL_IFACE, "UpdateMetaData", + DBUS_TYPE_STRING, &title, + DBUS_TYPE_STRING, &artist, + DBUS_TYPE_STRING, &album, + DBUS_TYPE_STRING, &mediaNumber, + DBUS_TYPE_STRING, &totalMediaCount, + DBUS_TYPE_STRING, &duration, + DBUS_TYPE_STRING, &genre, + DBUS_TYPE_INVALID); + NS_ENSURE_TRUE_VOID(success); + + mRunnable.forget(); + } + +private: + const nsCString mObjectPath; + const nsCString mTitle; + const nsCString mArtist; + const nsCString mAlbum; + int64_t mMediaNumber; + int64_t mTotalMediaCount; + int64_t mDuration; + nsRefPtr mRunnable; +}; + void BluetoothDBusService::SendMetaData(const nsAString& aTitle, const nsAString& aArtist, @@ -3106,44 +3616,6 @@ BluetoothDBusService::SendMetaData(const nsAString& aTitle, return; } - MOZ_ASSERT(!sAdapterPath.IsEmpty()); - nsAutoString address; - a2dp->GetAddress(address); - nsString objectPath = - GetObjectPathFromAddress(sAdapterPath, address); - - nsCString tempTitle = NS_ConvertUTF16toUTF8(aTitle); - nsCString tempArtist = NS_ConvertUTF16toUTF8(aArtist); - nsCString tempAlbum = NS_ConvertUTF16toUTF8(aAlbum); - - nsCString tempMediaNumber = EmptyCString(); - nsCString tempTotalMediaCount = EmptyCString(); - nsCString tempDuration = EmptyCString(); - - // We currently don't support genre field in music player. - // In order to send media metadata through AVRCP, we set genre to an empty - // string to match the BlueZ method "UpdateMetaData" with signature "sssssss", - // which takes genre field as the last parameter. - nsCString tempGenre = EmptyCString(); - - if (aMediaNumber >= 0) { - tempMediaNumber.AppendInt(aMediaNumber); - } - if (aTotalMediaCount >= 0) { - tempTotalMediaCount.AppendInt(aTotalMediaCount); - } - if (aDuration >= 0) { - tempDuration.AppendInt(aDuration); - } - - const char* title = tempTitle.get(); - const char* album = tempAlbum.get(); - const char* artist = tempArtist.get(); - const char* mediaNumber = tempMediaNumber.get(); - const char* totalMediaCount = tempTotalMediaCount.get(); - const char* duration = tempDuration.get(); - const char* genre = tempGenre.get(); - nsAutoString prevTitle, prevAlbum; a2dp->GetTitle(prevTitle); a2dp->GetAlbum(prevAlbum); @@ -3154,26 +3626,19 @@ BluetoothDBusService::SendMetaData(const nsAString& aTitle, UpdateNotification(ControlEventId::EVENT_TRACK_CHANGED, aMediaNumber); } - nsRefPtr runnable(aRunnable); + nsAutoString address; + a2dp->GetAddress(address); - RawDBusConnection* connection = GetDBusConnection(); - MOZ_ASSERT(connection); - - bool ret = connection->SendWithReply( - GetVoidCallback, (void*)runnable.get(), -1, - NS_ConvertUTF16toUTF8(objectPath).get(), - DBUS_CTL_IFACE, "UpdateMetaData", - DBUS_TYPE_STRING, &title, - DBUS_TYPE_STRING, &artist, - DBUS_TYPE_STRING, &album, - DBUS_TYPE_STRING, &mediaNumber, - DBUS_TYPE_STRING, &totalMediaCount, - DBUS_TYPE_STRING, &duration, - DBUS_TYPE_STRING, &genre, - DBUS_TYPE_INVALID); - NS_ENSURE_TRUE_VOID(ret); - - runnable.forget(); + Task* task = new SendMetadataTask( + NS_ConvertUTF16toUTF8(GetObjectPathFromAddress(sAdapterPath, address)), + NS_ConvertUTF16toUTF8(aTitle), + NS_ConvertUTF16toUTF8(aArtist), + NS_ConvertUTF16toUTF8(aAlbum), + aMediaNumber, + aTotalMediaCount, + aDuration, + aRunnable); + DispatchToDBusThread(task); a2dp->UpdateMetaData(aTitle, aArtist, aAlbum, aMediaNumber, aTotalMediaCount, aDuration); @@ -3200,6 +3665,54 @@ PlayStatusStringToControlPlayStatus(const nsAString& aPlayStatus) return playStatus; } +class SendPlayStatusTask : public Task +{ +public: + SendPlayStatusTask(const nsACString& aObjectPath, + int64_t aDuration, + int64_t aPosition, + ControlPlayStatus aPlayStatus, + BluetoothReplyRunnable* aRunnable) + : mObjectPath(aObjectPath) + , mDuration(aDuration) + , mPosition(aPosition) + , mPlayStatus(aPlayStatus) + , mRunnable(aRunnable) + { + MOZ_ASSERT(!mObjectPath.IsEmpty()); + MOZ_ASSERT(mRunnable); + } + + void Run() MOZ_OVERRIDE + { + MOZ_ASSERT(!NS_IsMainThread()); // I/O thread + + uint32_t tempPlayStatus = mPlayStatus; + + RawDBusConnection* connection = GetDBusConnection(); + MOZ_ASSERT(connection); + + bool success = connection->SendWithReply( + GetVoidCallback, static_cast(mRunnable.get()), -1, + mObjectPath.get(), + DBUS_CTL_IFACE, "UpdatePlayStatus", + DBUS_TYPE_UINT32, &mDuration, + DBUS_TYPE_UINT32, &mPosition, + DBUS_TYPE_UINT32, &tempPlayStatus, + DBUS_TYPE_INVALID); + NS_ENSURE_TRUE_VOID(success); + + mRunnable.forget(); + } + +private: + const nsCString mObjectPath; + int64_t mDuration; + int64_t mPosition; + ControlPlayStatus mPlayStatus; + nsRefPtr mRunnable; +}; + void BluetoothDBusService::SendPlayStatus(int64_t aDuration, int64_t aPosition, @@ -3243,36 +3756,23 @@ BluetoothDBusService::SendPlayStatus(int64_t aDuration, return; } - uint32_t tempPlayStatus = playStatus; if (playStatus != a2dp->GetPlayStatus()) { UpdateNotification(ControlEventId::EVENT_PLAYBACK_STATUS_CHANGED, - tempPlayStatus); + playStatus); } else if (aPosition != a2dp->GetPosition()) { UpdateNotification(ControlEventId::EVENT_PLAYBACK_POS_CHANGED, aPosition); } - MOZ_ASSERT(!sAdapterPath.IsEmpty()); nsAutoString address; a2dp->GetAddress(address); - nsString objectPath = - GetObjectPathFromAddress(sAdapterPath, address); - nsRefPtr runnable(aRunnable); - - RawDBusConnection* connection = GetDBusConnection(); - MOZ_ASSERT(connection); - - bool ret = connection->SendWithReply( - GetVoidCallback, (void*)runnable.get(), -1, - NS_ConvertUTF16toUTF8(objectPath).get(), - DBUS_CTL_IFACE, "UpdatePlayStatus", - DBUS_TYPE_UINT32, &aDuration, - DBUS_TYPE_UINT32, &aPosition, - DBUS_TYPE_UINT32, &tempPlayStatus, - DBUS_TYPE_INVALID); - NS_ENSURE_TRUE_VOID(ret); - - runnable.forget(); + Task* task = new SendPlayStatusTask( + NS_ConvertUTF16toUTF8(GetObjectPathFromAddress(sAdapterPath, address)), + aDuration, + aPosition, + playStatus, + aRunnable); + DispatchToDBusThread(task); a2dp->UpdatePlayStatus(aDuration, aPosition, playStatus); } @@ -3290,6 +3790,48 @@ ControlCallback(DBusMessage* aMsg, void* aParam) } } +class UpdatePlayStatusTask : public Task +{ +public: + UpdatePlayStatusTask(const nsACString& aObjectPath, + int32_t aDuration, + int32_t aPosition, + ControlPlayStatus aPlayStatus) + : mObjectPath(aObjectPath) + , mDuration(aDuration) + , mPosition(aPosition) + , mPlayStatus(aPlayStatus) + { + MOZ_ASSERT(!mObjectPath.IsEmpty()); + } + + void Run() MOZ_OVERRIDE + { + MOZ_ASSERT(!NS_IsMainThread()); // I/O thread + + uint32_t tempPlayStatus = mPlayStatus; + + RawDBusConnection* connection = GetDBusConnection(); + MOZ_ASSERT(connection); + + bool success = connection->SendWithReply( + ControlCallback, nullptr, -1, + mObjectPath.get(), + DBUS_CTL_IFACE, "UpdatePlayStatus", + DBUS_TYPE_UINT32, &mDuration, + DBUS_TYPE_UINT32, &mPosition, + DBUS_TYPE_UINT32, &tempPlayStatus, + DBUS_TYPE_INVALID); + NS_ENSURE_TRUE_VOID(success); + } + +private: + const nsCString mObjectPath; + int32_t mDuration; + int32_t mPosition; + ControlPlayStatus mPlayStatus; +}; + void BluetoothDBusService::UpdatePlayStatus(uint32_t aDuration, uint32_t aPosition, @@ -3306,25 +3848,53 @@ BluetoothDBusService::UpdatePlayStatus(uint32_t aDuration, nsAutoString address; a2dp->GetAddress(address); - nsString objectPath = - GetObjectPathFromAddress(sAdapterPath, address); - uint32_t tempPlayStatus = aPlayStatus; - - RawDBusConnection* connection = GetDBusConnection(); - MOZ_ASSERT(connection); - - bool ret = connection->SendWithReply( - ControlCallback, nullptr, -1, - NS_ConvertUTF16toUTF8(objectPath).get(), - DBUS_CTL_IFACE, "UpdatePlayStatus", - DBUS_TYPE_UINT32, &aDuration, - DBUS_TYPE_UINT32, &aPosition, - DBUS_TYPE_UINT32, &tempPlayStatus, - DBUS_TYPE_INVALID); - NS_ENSURE_TRUE_VOID(ret); + Task* task = new UpdatePlayStatusTask( + NS_ConvertUTF16toUTF8(GetObjectPathFromAddress(sAdapterPath, address)), + aDuration, + aPosition, + aPlayStatus); + DispatchToDBusThread(task); } +class UpdateNotificationTask : public Task +{ +public: + UpdateNotificationTask(const nsACString& aObjectPath, + BluetoothDBusService::ControlEventId aEventId, + uint64_t aData) + : mObjectPath(aObjectPath) + , mEventId(aEventId) + , mData(aData) + { + MOZ_ASSERT(!mObjectPath.IsEmpty()); + } + + void Run() MOZ_OVERRIDE + { + MOZ_ASSERT(!NS_IsMainThread()); // I/O thread + + uint16_t eventId = mEventId; + + RawDBusConnection* connection = GetDBusConnection(); + MOZ_ASSERT(connection); + + bool success = connection->SendWithReply( + ControlCallback, nullptr, -1, + mObjectPath.get(), + DBUS_CTL_IFACE, "UpdateNotification", + DBUS_TYPE_UINT16, &eventId, + DBUS_TYPE_UINT64, &mData, + DBUS_TYPE_INVALID); + NS_ENSURE_TRUE_VOID(success); + } + +private: + const nsCString mObjectPath; + int16_t mEventId; + int32_t mData; +}; + void BluetoothDBusService::UpdateNotification(ControlEventId aEventId, uint64_t aData) @@ -3340,19 +3910,10 @@ BluetoothDBusService::UpdateNotification(ControlEventId aEventId, nsAutoString address; a2dp->GetAddress(address); - nsString objectPath = - GetObjectPathFromAddress(sAdapterPath, address); - uint16_t eventId = aEventId; - RawDBusConnection* connection = GetDBusConnection(); - MOZ_ASSERT(connection); - - bool ret = connection->SendWithReply( - ControlCallback, nullptr, -1, - NS_ConvertUTF16toUTF8(objectPath).get(), - DBUS_CTL_IFACE, "UpdateNotification", - DBUS_TYPE_UINT16, &eventId, - DBUS_TYPE_UINT64, &aData, - DBUS_TYPE_INVALID); - NS_ENSURE_TRUE_VOID(ret); + Task* task = new UpdateNotificationTask( + NS_ConvertUTF16toUTF8(GetObjectPathFromAddress(sAdapterPath, address)), + aEventId, + aData); + DispatchToDBusThread(task); } diff --git a/dom/bluetooth/bluez/linux/BluetoothDBusService.h b/dom/bluetooth/bluez/linux/BluetoothDBusService.h index 0d939da9da3d..59426ea5f726 100644 --- a/dom/bluetooth/bluez/linux/BluetoothDBusService.h +++ b/dom/bluetooth/bluez/linux/BluetoothDBusService.h @@ -24,6 +24,23 @@ BEGIN_BLUETOOTH_NAMESPACE class BluetoothDBusService : public BluetoothService { public: + /** + * For DBus Control method of "UpdateNotification", event id should be + * specified as following: + * (Please see specification of AVRCP 1.3, Table 5.28 for more details.) + */ + enum ControlEventId { + EVENT_PLAYBACK_STATUS_CHANGED = 0x01, + EVENT_TRACK_CHANGED = 0x02, + EVENT_TRACK_REACHED_END = 0x03, + EVENT_TRACK_REACHED_START = 0x04, + EVENT_PLAYBACK_POS_CHANGED = 0x05, + EVENT_BATT_STATUS_CHANGED = 0x06, + EVENT_SYSTEM_STATUS_CHANGED = 0x07, + EVENT_PLAYER_APPLICATION_SETTING_CHANGED = 0x08, + EVENT_UNKNOWN + }; + BluetoothDBusService(); ~BluetoothDBusService(); @@ -159,23 +176,6 @@ public: SendInputMessage(const nsAString& aDeviceAddresses, const nsAString& aMessage) MOZ_OVERRIDE; private: - /** - * For DBus Control method of "UpdateNotification", event id should be - * specified as following: - * (Please see specification of AVRCP 1.3, Table 5.28 for more details.) - */ - enum ControlEventId { - EVENT_PLAYBACK_STATUS_CHANGED = 0x01, - EVENT_TRACK_CHANGED = 0x02, - EVENT_TRACK_REACHED_END = 0x03, - EVENT_TRACK_REACHED_START = 0x04, - EVENT_PLAYBACK_POS_CHANGED = 0x05, - EVENT_BATT_STATUS_CHANGED = 0x06, - EVENT_SYSTEM_STATUS_CHANGED = 0x07, - EVENT_PLAYER_APPLICATION_SETTING_CHANGED = 0x08, - EVENT_UNKNOWN - }; - nsresult SendGetPropertyMessage(const nsAString& aPath, const char* aInterface, void (*aCB)(DBusMessage *, void *), From abc83c0bc3d64cdaf1e2620397fedf5d02dbe975 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 04:52:46 -0800 Subject: [PATCH 22/58] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f4d91b78c737 Author: George Desc: Merge pull request #16026 from cctuan/968667 Bug 968667 - Add run-app-js-command ======== https://hg.mozilla.org/integration/gaia-central/rev/8f01711ff0e4 Author: cctuan Desc: Bug 968667 - Add run-app-js-command --- 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 25a4e36a9545..73e2933d5033 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "0466de7e605c2b55deb932690521ffc43e791d4f", + "revision": "f4d91b78c737e1f5001cf8f3f2db52db50ba6332", "repo_path": "/integration/gaia-central" } From b42bf7afa941700c859bc4c9ddfda91e861a4c60 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 04:52:55 -0800 Subject: [PATCH 23/58] 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 05e9d2dcbd6a..7f9c5bad8a8b 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 3a2268d1e03b..a6c2187860eb 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 05e9d2dcbd6a..7f9c5bad8a8b 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 4129ae32d8fd..8487a543bb6d 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 6455fbc11fd4..978b2c6065b7 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 09fc4dc2a6f8..ee944f0e0eac 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 eb553ca49416..2aaf1ba72df3 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 e42c322a2d11..d959e2634240 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 ccb48997f2ea..c3f64b6eb94e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 2682e3ed36efb6cf95537f97bbfbdd5797c17ff2 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 05:10:11 -0800 Subject: [PATCH 24/58] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/affab69d24a0 Author: AndreiH Desc: Merge pull request #16015 from gentlefolk/951159 Bug 951159 - Convert Gaia UI Tests to new notification API ======== https://hg.mozilla.org/integration/gaia-central/rev/5f3f3bfb4a38 Author: gentlefolk Desc: Bug 951159 - Convert Gaia UI Tests to new notification API ======== https://hg.mozilla.org/integration/gaia-central/rev/033834b159cf Author: Sam Joch Desc: Merge pull request #15994 from samjoch/bug-924624-UserStoryAddEdgeGesturesToFTETutorial Bug 924624 - [User story] Add edge gestures to FTE tutorial r=arcturus ======== https://hg.mozilla.org/integration/gaia-central/rev/b8fa1ae0bf18 Author: Sam Joch Desc: Bug 924624 - [User story] Add edge gestures to FTE tutorial r=arcturus --- 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 73e2933d5033..76474224f4ce 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "f4d91b78c737e1f5001cf8f3f2db52db50ba6332", + "revision": "affab69d24a07ac1604124de7867164b83667db8", "repo_path": "/integration/gaia-central" } From 91e56bf1404ed8f551a034b234d70585dddd4c17 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 05:11:01 -0800 Subject: [PATCH 25/58] 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 7f9c5bad8a8b..6b5b903ea541 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 a6c2187860eb..3ab3ca2966f1 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 7f9c5bad8a8b..6b5b903ea541 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 8487a543bb6d..9130576657de 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 978b2c6065b7..b9641fa10047 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 ee944f0e0eac..3cb339fb46b7 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 2aaf1ba72df3..8eeeb77997d3 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 d959e2634240..0923eee1c70a 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 c3f64b6eb94e..0a9a1d4e43de 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From f16c614265d456f5ff2346d3de23dc7f01c18638 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 05:50:10 -0800 Subject: [PATCH 26/58] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c563e12f6af9 Author: Dominic Kuo Desc: Merge pull request #16020 from dominickuo/revert-bug-946556 Revert "Bug 946556 - [Music] Disable the play controls when using a bluetooth headset in a call ======== https://hg.mozilla.org/integration/gaia-central/rev/f6881029aca5 Author: Dominic Kuo Desc: Revert "Bug 946556 - [Music] Disable the play controls when using a bluetooth headset in a call" This reverts commit a69025bfe657a07cca372369e0d4b83a442fba73. --- 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 76474224f4ce..db8d92096297 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "affab69d24a07ac1604124de7867164b83667db8", + "revision": "c563e12f6af948e050bae885846974db084a187e", "repo_path": "/integration/gaia-central" } From 4c6d8b981e70b06a05f47f42e94ca2878eb2e852 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 05:51:01 -0800 Subject: [PATCH 27/58] 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 6b5b903ea541..a505367311c9 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 3ab3ca2966f1..02015a5af9ac 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 6b5b903ea541..a505367311c9 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 9130576657de..b5ecee098a5a 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 b9641fa10047..d09193696a56 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 3cb339fb46b7..f5cba479d639 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 8eeeb77997d3..2400ed1e11be 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 0923eee1c70a..26a58dc32247 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 0a9a1d4e43de..2be68c4152d7 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From a4d0080f7a04de6d8ffdc7cee8b44d1dad7603b6 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 06:15:12 -0800 Subject: [PATCH 28/58] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8acca712933d Author: Anthony Ricaud Desc: Merge pull request #15955 from Rik/inactive-group-after-finishing-call-966951 Bug 966951 - "Group Call" is inactive when received call is hung up r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/57c4fd44c1dc Author: Anthony Ricaud Desc: Bug 966951 - "Group Call" is inactive when received call is hung up --- 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 db8d92096297..fc45bcb68eeb 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "c563e12f6af948e050bae885846974db084a187e", + "revision": "8acca712933d58f92f89006afac250ca2ba0797b", "repo_path": "/integration/gaia-central" } From 3f81e4be8e6d6786bc113a6e868188205e1f73fd Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 06:16:12 -0800 Subject: [PATCH 29/58] 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 a505367311c9..f081cc046b6b 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 02015a5af9ac..5fa3ef24563e 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 a505367311c9..f081cc046b6b 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 b5ecee098a5a..89c72c7743b9 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 d09193696a56..0d4f015c714e 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 f5cba479d639..9b2eed271d46 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 2400ed1e11be..afad69017af5 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 26a58dc32247..1311e2658f75 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 2be68c4152d7..97c7d870cb5a 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 108a717e57cbc10fdf241b7887b01916c0f048e4 Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Thu, 6 Feb 2014 09:27:53 -0500 Subject: [PATCH 30/58] Bug 968495 - Increase frequency for repainting while panning. r=vingtetun --- b2g/app/b2g.js | 1 + 1 file changed, 1 insertion(+) diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js index c0934b8264f7..dceafbea9947 100644 --- a/b2g/app/b2g.js +++ b/b2g/app/b2g.js @@ -874,6 +874,7 @@ pref("identity.fxaccounts.auth.uri", "https://api-accounts.dev.lcip.org/v1"); // Gaia relies heavily on scroll events for now, so lets fire them // more often than the default value (100). pref("apz.asyncscroll.throttle", 40); +pref("apz.pan_repaint_interval", 40); // This preference allows FirefoxOS apps (and content, I think) to force // the use of software (instead of hardware accelerated) 2D canvases by From ec8e91fe3e20298dacb2272f034c7f11c22f8e1d Mon Sep 17 00:00:00 2001 From: JW Wang Date: Tue, 28 Jan 2014 12:03:59 +0800 Subject: [PATCH 31/58] Bug 962883 - Use SpecialPowers.pushPrefEnv to ensure "media.ogg.enabled" is turned off before testing media recorder. r=jsmith --- .../test_mediarecorder_creation_fail.html | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/content/media/test/test_mediarecorder_creation_fail.html b/content/media/test/test_mediarecorder_creation_fail.html index 3b532b2b3cdd..a98a9990e9fa 100644 --- a/content/media/test/test_mediarecorder_creation_fail.html +++ b/content/media/test/test_mediarecorder_creation_fail.html @@ -11,16 +11,13 @@ From 3b46536f58e69e127842a2e570d34c785cfc7950 Mon Sep 17 00:00:00 2001 From: JW Wang Date: Wed, 29 Jan 2014 22:48:39 +0800 Subject: [PATCH 32/58] Bug 962883 - Enable test. r=ryanvm --- testing/mochitest/b2g.json | 1 - 1 file changed, 1 deletion(-) diff --git a/testing/mochitest/b2g.json b/testing/mochitest/b2g.json index 79cef0f3bbba..44998d810502 100644 --- a/testing/mochitest/b2g.json +++ b/testing/mochitest/b2g.json @@ -30,7 +30,6 @@ "content/media/test/test_info_leak.html": "2 failures", "content/media/test/test_media_selection.html": "timed out", "content/media/test/test_mediarecorder_record_4ch_audiocontext.html": "", - "content/media/test/test_mediarecorder_creation_fail.html": "", "content/media/test/test_playback.html": "Test timed out, bug 668973?", "content/media/test/test_playback_rate.html": "", "content/media/test/test_playback_rate_playpause.html": "", From 625122c983a222e4b8bf36aebc167eef70f08b4c Mon Sep 17 00:00:00 2001 From: Garner Lee Date: Tue, 28 Jan 2014 16:20:17 -0800 Subject: [PATCH 33/58] Bug 964186 - Rename MozNdefRecord to MozNDEFRecord. r=smaug, sr=sicking --HG-- rename : dom/nfc/MozNdefRecord.cpp => dom/nfc/MozNDEFRecord.cpp rename : dom/nfc/MozNdefRecord.h => dom/nfc/MozNDEFRecord.h rename : dom/webidl/MozNdefRecord.webidl => dom/webidl/MozNDEFRecord.webidl --- .../{MozNdefRecord.cpp => MozNDEFRecord.cpp} | 36 +++++++++---------- dom/nfc/{MozNdefRecord.h => MozNDEFRecord.h} | 18 +++++----- dom/nfc/moz.build | 4 +-- dom/system/gonk/NfcContentHelper.js | 6 ++-- .../mochitest/general/test_interfaces.html | 2 +- ...NdefRecord.webidl => MozNDEFRecord.webidl} | 2 +- dom/webidl/MozNFCPeer.webidl | 2 +- dom/webidl/MozNFCTag.webidl | 2 +- dom/webidl/moz.build | 2 +- 9 files changed, 37 insertions(+), 37 deletions(-) rename dom/nfc/{MozNdefRecord.cpp => MozNDEFRecord.cpp} (74%) rename dom/nfc/{MozNdefRecord.h => MozNDEFRecord.h} (84%) rename dom/webidl/{MozNdefRecord.webidl => MozNDEFRecord.webidl} (97%) diff --git a/dom/nfc/MozNdefRecord.cpp b/dom/nfc/MozNDEFRecord.cpp similarity index 74% rename from dom/nfc/MozNdefRecord.cpp rename to dom/nfc/MozNDEFRecord.cpp index a4f287fab85f..74454d9c98a9 100644 --- a/dom/nfc/MozNdefRecord.cpp +++ b/dom/nfc/MozNDEFRecord.cpp @@ -6,8 +6,8 @@ /* Copyright © 2013 Deutsche Telekom, Inc. */ -#include "MozNdefRecord.h" -#include "mozilla/dom/MozNdefRecordBinding.h" +#include "MozNDEFRecord.h" +#include "mozilla/dom/MozNDEFRecordBinding.h" #include "mozilla/HoldDropJSObjects.h" #include "nsContentUtils.h" @@ -16,40 +16,40 @@ namespace mozilla { namespace dom { -NS_IMPL_CYCLE_COLLECTION_CLASS(MozNdefRecord) +NS_IMPL_CYCLE_COLLECTION_CLASS(MozNDEFRecord) -NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(MozNdefRecord) +NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(MozNDEFRecord) NS_IMPL_CYCLE_COLLECTION_UNLINK(mWindow) NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER NS_IMPL_CYCLE_COLLECTION_UNLINK_END -NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(MozNdefRecord) +NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(MozNDEFRecord) NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mWindow) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(MozNdefRecord) +NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(MozNDEFRecord) NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mType) NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mId) NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mPayload) NS_IMPL_CYCLE_COLLECTION_TRACE_PRESERVED_WRAPPER NS_IMPL_CYCLE_COLLECTION_TRACE_END -NS_IMPL_CYCLE_COLLECTING_ADDREF(MozNdefRecord) -NS_IMPL_CYCLE_COLLECTING_RELEASE(MozNdefRecord) -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MozNdefRecord) +NS_IMPL_CYCLE_COLLECTING_ADDREF(MozNDEFRecord) +NS_IMPL_CYCLE_COLLECTING_RELEASE(MozNDEFRecord) +NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MozNDEFRecord) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY NS_INTERFACE_MAP_ENTRY(nsISupports) NS_INTERFACE_MAP_END void -MozNdefRecord::HoldData() +MozNDEFRecord::HoldData() { mozilla::HoldJSObjects(this); } void -MozNdefRecord::DropData() +MozNDEFRecord::DropData() { if (mType) { mType = nullptr; @@ -64,8 +64,8 @@ MozNdefRecord::DropData() } /* static */ -already_AddRefed -MozNdefRecord::Constructor(const GlobalObject& aGlobal, +already_AddRefed +MozNDEFRecord::Constructor(const GlobalObject& aGlobal, uint8_t aTnf, const Uint8Array& aType, const Uint8Array& aId, const Uint8Array& aPayload, ErrorResult& aRv) @@ -76,7 +76,7 @@ MozNdefRecord::Constructor(const GlobalObject& aGlobal, return nullptr; } - nsRefPtr ndefrecord = new MozNdefRecord(aGlobal.GetContext(), + nsRefPtr ndefrecord = new MozNDEFRecord(aGlobal.GetContext(), win, aTnf, aType, aId, aPayload); if (!ndefrecord) { @@ -86,7 +86,7 @@ MozNdefRecord::Constructor(const GlobalObject& aGlobal, return ndefrecord.forget(); } -MozNdefRecord::MozNdefRecord(JSContext* aCx, nsPIDOMWindow* aWindow, +MozNDEFRecord::MozNDEFRecord(JSContext* aCx, nsPIDOMWindow* aWindow, uint8_t aTnf, const Uint8Array& aType, const Uint8Array& aId, const Uint8Array& aPayload) : mTnf(aTnf) @@ -101,15 +101,15 @@ MozNdefRecord::MozNdefRecord(JSContext* aCx, nsPIDOMWindow* aWindow, HoldData(); } -MozNdefRecord::~MozNdefRecord() +MozNDEFRecord::~MozNDEFRecord() { DropData(); } JSObject* -MozNdefRecord::WrapObject(JSContext* aCx, JS::Handle aScope) +MozNDEFRecord::WrapObject(JSContext* aCx, JS::Handle aScope) { - return MozNdefRecordBinding::Wrap(aCx, aScope, this); + return MozNDEFRecordBinding::Wrap(aCx, aScope, this); } } // namespace dom diff --git a/dom/nfc/MozNdefRecord.h b/dom/nfc/MozNDEFRecord.h similarity index 84% rename from dom/nfc/MozNdefRecord.h rename to dom/nfc/MozNDEFRecord.h index da0b3df13ee2..4d4eb4d07a7e 100644 --- a/dom/nfc/MozNdefRecord.h +++ b/dom/nfc/MozNDEFRecord.h @@ -6,8 +6,8 @@ /* Copyright © 2013 Deutsche Telekom, Inc. */ -#ifndef mozilla_dom_MozNdefRecord_h__ -#define mozilla_dom_MozNdefRecord_h__ +#ifndef mozilla_dom_MozNDEFRecord_h__ +#define mozilla_dom_MozNDEFRecord_h__ #include "mozilla/Attributes.h" #include "mozilla/ErrorResult.h" @@ -26,20 +26,20 @@ struct JSContext; namespace mozilla { namespace dom { -class MozNdefRecord MOZ_FINAL : public nsISupports, +class MozNDEFRecord MOZ_FINAL : public nsISupports, public nsWrapperCache { public: NS_DECL_CYCLE_COLLECTING_ISUPPORTS - NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(MozNdefRecord) + NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(MozNDEFRecord) public: - MozNdefRecord(JSContext* aCx, nsPIDOMWindow* aWindow, uint8_t aTnf, + MozNDEFRecord(JSContext* aCx, nsPIDOMWindow* aWindow, uint8_t aTnf, const Uint8Array& aType, const Uint8Array& aId, const Uint8Array& aPlayload); - ~MozNdefRecord(); + ~MozNDEFRecord(); nsIDOMWindow* GetParentObject() const { @@ -49,7 +49,7 @@ public: virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aScope) MOZ_OVERRIDE; - static already_AddRefed + static already_AddRefed Constructor(const GlobalObject& aGlobal, uint8_t aTnf, const Uint8Array& aType, const Uint8Array& aId, const Uint8Array& aPayload, ErrorResult& aRv); @@ -90,7 +90,7 @@ public: } private: - MozNdefRecord() MOZ_DELETE; + MozNDEFRecord() MOZ_DELETE; nsRefPtr mWindow; void HoldData(); void DropData(); @@ -104,4 +104,4 @@ private: } // namespace dom } // namespace mozilla -#endif // mozilla_dom_MozNdefRecord_h__ +#endif // mozilla_dom_MozNDEFRecord_h__ diff --git a/dom/nfc/moz.build b/dom/nfc/moz.build index 7d96d61d0709..84733b85ac33 100644 --- a/dom/nfc/moz.build +++ b/dom/nfc/moz.build @@ -7,10 +7,10 @@ if CONFIG['MOZ_NFC']: EXPORTS.mozilla.dom += [ - 'MozNdefRecord.h', + 'MozNDEFRecord.h', ] SOURCES += [ - 'MozNdefRecord.cpp', + 'MozNDEFRecord.cpp', ] EXTRA_COMPONENTS += [ 'nsNfc.js', diff --git a/dom/system/gonk/NfcContentHelper.js b/dom/system/gonk/NfcContentHelper.js index d542728cd47d..7104ec2596e6 100644 --- a/dom/system/gonk/NfcContentHelper.js +++ b/dom/system/gonk/NfcContentHelper.js @@ -92,7 +92,7 @@ NfcContentHelper.prototype = { * Strings such as 'type', 'id' 'payload' will not be acccessible to NfcWorker. * Therefore this function exists till the bug is addressed. */ - encodeNdefRecords: function encodeNdefRecords(records) { + encodeNDEFRecords: function encodeNDEFRecords(records) { let encodedRecords = []; for (let i = 0; i < records.length; i++) { let record = records[i]; @@ -161,7 +161,7 @@ NfcContentHelper.prototype = { let requestId = btoa(this.getRequestId(request)); this._requestMap[requestId] = window; - let encodedRecords = this.encodeNdefRecords(records); + let encodedRecords = this.encodeNDEFRecords(records); cpmm.sendAsyncMessage("NFC:WriteNDEF", { requestId: requestId, sessionToken: sessionToken, @@ -390,7 +390,7 @@ NfcContentHelper.prototype = { let ndefMsg = []; for (let i = 0; i < records.length; i++) { let record = records[i]; - ndefMsg.push(new requester.MozNdefRecord(record.tnf, + ndefMsg.push(new requester.MozNDEFRecord(record.tnf, record.type, record.id, record.payload)); diff --git a/dom/tests/mochitest/general/test_interfaces.html b/dom/tests/mochitest/general/test_interfaces.html index 22cd68358147..5cbac6cd6609 100644 --- a/dom/tests/mochitest/general/test_interfaces.html +++ b/dom/tests/mochitest/general/test_interfaces.html @@ -643,7 +643,7 @@ var interfaceNamesInGlobalScope = // IMPORTANT: Do not change this list without review from a DOM peer! "MozNamedAttrMap", // IMPORTANT: Do not change this list without review from a DOM peer! - {name: "MozNdefRecord", b2g: true}, + {name: "MozNDEFRecord", b2g: true}, // IMPORTANT: Do not change this list without review from a DOM peer! {name: "MozNFCPeer", b2g: true}, // IMPORTANT: Do not change this list without review from a DOM peer! diff --git a/dom/webidl/MozNdefRecord.webidl b/dom/webidl/MozNDEFRecord.webidl similarity index 97% rename from dom/webidl/MozNdefRecord.webidl rename to dom/webidl/MozNDEFRecord.webidl index 9152589ed690..b8bf5a8c3bd2 100644 --- a/dom/webidl/MozNdefRecord.webidl +++ b/dom/webidl/MozNDEFRecord.webidl @@ -6,7 +6,7 @@ /* Copyright © 2013 Deutsche Telekom, Inc. */ [Constructor(octet tnf, Uint8Array type, Uint8Array id, Uint8Array payload)] -interface MozNdefRecord +interface MozNDEFRecord { /** * Type Name Field (3-bits) - Specifies the NDEF record type in general. diff --git a/dom/webidl/MozNFCPeer.webidl b/dom/webidl/MozNFCPeer.webidl index 0a3a80eacb24..10e93a704883 100644 --- a/dom/webidl/MozNFCPeer.webidl +++ b/dom/webidl/MozNFCPeer.webidl @@ -10,7 +10,7 @@ [JSImplementation="@mozilla.org/nfc/NFCPeer;1"] interface MozNFCPeer { - DOMRequest sendNDEF(sequence records); + DOMRequest sendNDEF(sequence records); DOMRequest sendFile(Blob blob); }; diff --git a/dom/webidl/MozNFCTag.webidl b/dom/webidl/MozNFCTag.webidl index 02239658fbb3..70b111963f78 100644 --- a/dom/webidl/MozNFCTag.webidl +++ b/dom/webidl/MozNFCTag.webidl @@ -27,7 +27,7 @@ enum NFCTechType { interface MozNFCTag { DOMRequest getDetailsNDEF(); DOMRequest readNDEF(); - DOMRequest writeNDEF(sequence records); + DOMRequest writeNDEF(sequence records); DOMRequest makeReadOnlyNDEF(); DOMRequest connect(NFCTechType techType); diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build index 9ea6a2bfc95b..edf2f489cc3f 100644 --- a/dom/webidl/moz.build +++ b/dom/webidl/moz.build @@ -529,7 +529,7 @@ if CONFIG['MOZ_B2G_RIL']: if CONFIG['MOZ_NFC']: WEBIDL_FILES += [ - 'MozNdefRecord.webidl', + 'MozNDEFRecord.webidl', 'MozNfc.webidl', 'MozNFCPeer.webidl', 'MozNFCTag.webidl', From b46aeead830d4bc0892735143fc849847577c029 Mon Sep 17 00:00:00 2001 From: Sushil Chauhan Date: Wed, 5 Feb 2014 14:55:00 -0800 Subject: [PATCH 34/58] Bug 965086 - Add support for sourceCropf in HwcComposer2D. r=dwilson --- widget/gonk/HwcComposer2D.cpp | 25 +++++++++++++++++++++--- widget/gonk/HwcComposer2D.h | 1 + widget/gonk/libdisplay/GonkDisplayJB.cpp | 13 +++++++++++- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/widget/gonk/HwcComposer2D.cpp b/widget/gonk/HwcComposer2D.cpp index 0c742826bf8a..b141e24fa741 100644 --- a/widget/gonk/HwcComposer2D.cpp +++ b/widget/gonk/HwcComposer2D.cpp @@ -146,6 +146,23 @@ HwcComposer2D::ReallocLayerList() return true; } +void +HwcComposer2D::setCrop(HwcLayer* layer, hwc_rect_t srcCrop) +{ +#if ANDROID_VERSION >= 19 + if (mHwc->common.version >= HWC_DEVICE_API_VERSION_1_3) { + layer->sourceCropf.left = srcCrop.left; + layer->sourceCropf.top = srcCrop.top; + layer->sourceCropf.right = srcCrop.right; + layer->sourceCropf.bottom = srcCrop.bottom; + } else { + layer->sourceCrop = srcCrop; + } +#else + layer->sourceCrop = srcCrop; +#endif +} + bool HwcComposer2D::PrepareLayerList(Layer* aLayer, const nsIntRect& aClip, @@ -264,17 +281,19 @@ HwcComposer2D::PrepareLayerList(Layer* aLayer, } HwcLayer& hwcLayer = mList->hwLayers[current]; + hwc_rect_t sourceCrop; if(!HwcUtils::PrepareLayerRects(visibleRect, transform * aGLWorldTransform, clip, bufferRect, - &(hwcLayer.sourceCrop), + &(sourceCrop), &(hwcLayer.displayFrame))) { return true; } + setCrop(&hwcLayer, sourceCrop); buffer_handle_t handle = fillColor ? nullptr : state.mSurface->getNativeBuffer()->handle; hwcLayer.handle = handle; @@ -603,10 +622,10 @@ HwcComposer2D::Prepare(buffer_handle_t fbHandle, int fence) mList->hwLayers[idx].handle = fbHandle; mList->hwLayers[idx].blending = HWC_BLENDING_PREMULT; mList->hwLayers[idx].compositionType = HWC_FRAMEBUFFER_TARGET; - mList->hwLayers[idx].sourceCrop = r; + setCrop(&mList->hwLayers[idx], r); mList->hwLayers[idx].displayFrame = r; mList->hwLayers[idx].visibleRegionScreen.numRects = 1; - mList->hwLayers[idx].visibleRegionScreen.rects = &mList->hwLayers[idx].sourceCrop; + mList->hwLayers[idx].visibleRegionScreen.rects = &mList->hwLayers[idx].displayFrame; mList->hwLayers[idx].acquireFenceFd = fence; mList->hwLayers[idx].releaseFenceFd = -1; mList->hwLayers[idx].planeAlpha = 0xFF; diff --git a/widget/gonk/HwcComposer2D.h b/widget/gonk/HwcComposer2D.h index c301b7a4793b..8e72eb28da9a 100644 --- a/widget/gonk/HwcComposer2D.h +++ b/widget/gonk/HwcComposer2D.h @@ -70,6 +70,7 @@ private: bool ReallocLayerList(); bool PrepareLayerList(layers::Layer* aContainer, const nsIntRect& aClip, const gfxMatrix& aParentTransform, const gfxMatrix& aGLWorldTransform); + void setCrop(HwcLayer* layer, hwc_rect_t srcCrop); HwcDevice* mHwc; HwcList* mList; diff --git a/widget/gonk/libdisplay/GonkDisplayJB.cpp b/widget/gonk/libdisplay/GonkDisplayJB.cpp index 74c471261783..7dc55bbcc4dc 100644 --- a/widget/gonk/libdisplay/GonkDisplayJB.cpp +++ b/widget/gonk/libdisplay/GonkDisplayJB.cpp @@ -249,10 +249,21 @@ GonkDisplayJB::Post(buffer_handle_t buf, int fence) mList->hwLayers[1].handle = buf; mList->hwLayers[1].transform = 0; mList->hwLayers[1].blending = HWC_BLENDING_PREMULT; +#if ANDROID_VERSION >= 19 + if (mHwc->common.version >= HWC_DEVICE_API_VERSION_1_3) { + mList->hwLayers[1].sourceCropf.left = 0; + mList->hwLayers[1].sourceCropf.top = 0; + mList->hwLayers[1].sourceCropf.right = mWidth; + mList->hwLayers[1].sourceCropf.bottom = mHeight; + } else { + mList->hwLayers[1].sourceCrop = r; + } +#else mList->hwLayers[1].sourceCrop = r; +#endif mList->hwLayers[1].displayFrame = r; mList->hwLayers[1].visibleRegionScreen.numRects = 1; - mList->hwLayers[1].visibleRegionScreen.rects = &mList->hwLayers[1].sourceCrop; + mList->hwLayers[1].visibleRegionScreen.rects = &mList->hwLayers[1].displayFrame; mList->hwLayers[1].acquireFenceFd = fence; mList->hwLayers[1].releaseFenceFd = -1; #if ANDROID_VERSION == 18 From b5e5adfdfbe197745664294b6bdff66c1e374c86 Mon Sep 17 00:00:00 2001 From: Alfredo Yang Date: Thu, 6 Feb 2014 10:12:07 -0500 Subject: [PATCH 35/58] Bug 968144 - Stop sending frame when camera stopping. r=jesup --- content/media/webrtc/MediaEngineWebRTCVideo.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/content/media/webrtc/MediaEngineWebRTCVideo.cpp b/content/media/webrtc/MediaEngineWebRTCVideo.cpp index 1564b6bea7bf..92812f72ebbb 100644 --- a/content/media/webrtc/MediaEngineWebRTCVideo.cpp +++ b/content/media/webrtc/MediaEngineWebRTCVideo.cpp @@ -602,6 +602,9 @@ MediaEngineWebRTCVideoSource::HandleEvent(const nsAString& error) { void MediaEngineWebRTCVideoSource::OnNewFrame(const gfxIntSize& aIntrinsicSize, layers::Image* aImage) { MonitorAutoLock enter(mMonitor); + if (mState == kStopped) { + return; + } mImage = aImage; if (mWidth != aIntrinsicSize.width || mHeight != aIntrinsicSize.height) { mWidth = aIntrinsicSize.width; From a87fd82ae26ccfd667d3b9fd1ef8b70e653fc281 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 07:15:16 -0800 Subject: [PATCH 36/58] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/eb9483ecb522 Author: Ryan VanderMeulen Desc: Merge pull request #15789 from svic/Bug_964186 Bug 964186: Rename MozNdefRecord to MozNDEFRecord ======== https://hg.mozilla.org/integration/gaia-central/rev/8e60e234c202 Author: Garner Lee Desc: Bug 964186: Rename MozNdefRecord to MozNDEFRecord r=alive --- 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 fc45bcb68eeb..792bfe20d67e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "8acca712933d58f92f89006afac250ca2ba0797b", + "revision": "eb9483ecb522fc75ed0c399a5544e318f2f59514", "repo_path": "/integration/gaia-central" } From de74e85124736e04b94bf6c65d92a9d56b18b44c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 07:16:06 -0800 Subject: [PATCH 37/58] 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 f081cc046b6b..2386b5c66c72 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 5fa3ef24563e..95f314e9611c 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 f081cc046b6b..2386b5c66c72 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 89c72c7743b9..806d619bb815 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 0d4f015c714e..fd4216a60012 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 9b2eed271d46..8bda398264c3 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 afad69017af5..dfdea6087baf 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 1311e2658f75..2edce6545bed 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 97c7d870cb5a..68cf671753e3 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From e57b03630e80e6f3e53044a501232cc0adbb63f7 Mon Sep 17 00:00:00 2001 From: JW Wang Date: Thu, 6 Feb 2014 16:27:35 +0800 Subject: [PATCH 38/58] Bug 964674 - Use SpecialPowers.pushPrefEnv to ensure "media.video_stats.enabled" is turned on/off before proceeding test. r=padenot --- content/media/test/test_bug654550.html | 39 +++++++++++++++----------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/content/media/test/test_bug654550.html b/content/media/test/test_bug654550.html index 2469eb99ec3a..02d0f779ead4 100644 --- a/content/media/test/test_bug654550.html +++ b/content/media/test/test_bug654550.html @@ -40,33 +40,40 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=654550 } - function ontimeupdate(event) { + function ontimeupdate_statsEnabled(event) { var v = event.target; - if (SpecialPowers.getBoolPref("media.video_stats.enabled")) { - checkStats(v, true); - SpecialPowers.setBoolPref("media.video_stats.enabled", false); - } else { - checkStats(v, false); - SpecialPowers.setBoolPref("media.video_stats.enabled", true); - v.removeEventListener("timeupdate", ontimeupdate); - SpecialPowers.clearUserPref("media.video_stats.enabled"); - removeNodeAndSource(v); - manager.finished(v.token); - } + v.removeEventListener('timeupdate', ontimeupdate_statsEnabled, false); + checkStats(v, true); + SpecialPowers.popPrefEnv( + function() { + v.addEventListener("timeupdate", ontimeupdate_statsDisabled); + }); } + function ontimeupdate_statsDisabled(event) { + var v = event.target; + v.removeEventListener('timeupdate', ontimeupdate_statsDisabled, false); + checkStats(v, false); + removeNodeAndSource(v); + manager.finished(v.token); + } function startTest(test, token) { var v = document.createElement('video'); v.token = token; v.src = test.name; manager.started(token); - v.play(); - SpecialPowers.setBoolPref("media.video_stats.enabled", true); - v.addEventListener("timeupdate", ontimeupdate); + SpecialPowers.pushPrefEnv({"set": [["media.video_stats.enabled", true]]}, + function() { + v.play(); + v.addEventListener("timeupdate", ontimeupdate_statsEnabled); + }); } - manager.runTests(gVideoTests, startTest); + SpecialPowers.pushPrefEnv({"set": [["media.video_stats.enabled", false]]}, + function() { + manager.runTests(gVideoTests, startTest); + }); From 9709fa1867cc75e8869289672bcfe9a1752b202e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 07:30:55 -0800 Subject: [PATCH 39/58] Bumping manifests a=b2g-bump --- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 95f314e9611c..b38a6b3d68e9 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -124,7 +124,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 2edce6545bed..e2d8efbc16a1 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -121,7 +121,7 @@ - + From 47824a59eb9b147dc6157c009ffa0d05eb27decd Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Thu, 6 Feb 2014 17:28:44 +0100 Subject: [PATCH 40/58] Bug 968275: Remove task classes from RawDBusConnection, r=qdot This patch removes the internal tasks from the implementation of RawDBusConnection. All calls to RawDBusConnection are invoked on the I/O thread, so the sender tasks only impose an overhead. --- ipc/dbus/RawDBusConnection.cpp | 191 +++++++++------------------------ ipc/dbus/RawDBusConnection.h | 7 -- 2 files changed, 48 insertions(+), 150 deletions(-) diff --git a/ipc/dbus/RawDBusConnection.cpp b/ipc/dbus/RawDBusConnection.cpp index 8f75e5d8923b..4eb106c6c235 100644 --- a/ipc/dbus/RawDBusConnection.cpp +++ b/ipc/dbus/RawDBusConnection.cpp @@ -6,10 +6,7 @@ #include #include "base/message_loop.h" -#include "mozilla/Monitor.h" #include "nsThreadUtils.h" -#include "DBusThread.h" -#include "DBusUtils.h" #include "RawDBusConnection.h" #ifdef CHROMIUM_LOG @@ -26,8 +23,6 @@ /* TODO: Remove BlueZ constant */ #define BLUEZ_DBUS_BASE_IFC "org.bluez" -using namespace mozilla::ipc; - // // Runnables // @@ -35,93 +30,28 @@ using namespace mozilla::ipc; namespace mozilla { namespace ipc { -class DBusConnectionSendTaskBase : public Task +class Notification { public: - virtual ~DBusConnectionSendTaskBase() + Notification(DBusReplyCallback aCallback, void* aData) + : mCallback(aCallback), + mData(aData) { } -protected: - DBusConnectionSendTaskBase(DBusConnection* aConnection, - DBusMessage* aMessage) - : mConnection(aConnection), - mMessage(aMessage) - { - MOZ_ASSERT(mConnection); - MOZ_ASSERT(mMessage); - } - - DBusConnection* mConnection; - DBusMessageRefPtr mMessage; -}; - -// -// Sends a message and returns the message's serial number to the -// disaptching thread. Only run it in DBus thread. -// -class DBusConnectionSendTask : public DBusConnectionSendTaskBase -{ -public: - DBusConnectionSendTask(DBusConnection* aConnection, - DBusMessage* aMessage) - : DBusConnectionSendTaskBase(aConnection, aMessage) - { } - - virtual ~DBusConnectionSendTask() - { } - - void Run() MOZ_OVERRIDE - { - MOZ_ASSERT(MessageLoop::current()); - - dbus_bool_t success = dbus_connection_send(mConnection, - mMessage, - nullptr); - NS_ENSURE_TRUE_VOID(success == TRUE); - } -}; - -// -// Sends a message and executes a callback function for the reply. Only -// run it in DBus thread. -// -class DBusConnectionSendWithReplyTask : public DBusConnectionSendTaskBase -{ -private: - class NotifyData - { - public: - NotifyData(DBusReplyCallback aCallback, void* aData) - : mCallback(aCallback), - mData(aData) - { } - - void RunNotifyCallback(DBusMessage* aMessage) - { - if (mCallback) { - mCallback(aMessage, mData); - } - } - - private: - DBusReplyCallback mCallback; - void* mData; - }; - - // Callback function for DBus replies. Only run it in DBus thread. + // Callback function for DBus replies. Only run it on I/O thread. // - static void Notify(DBusPendingCall* aCall, void* aData) + static void Handle(DBusPendingCall* aCall, void* aData) { MOZ_ASSERT(!NS_IsMainThread()); + MOZ_ASSERT(MessageLoop::current()); - nsAutoPtr data(static_cast(aData)); + nsAutoPtr ntfn(static_cast(aData)); - // The reply can be non-null if the timeout - // has been reached. + // The reply can be non-null if the timeout has been reached. DBusMessage* reply = dbus_pending_call_steal_reply(aCall); if (reply) { - data->RunNotifyCallback(reply); + ntfn->RunCallback(reply); dbus_message_unref(reply); } @@ -129,53 +59,18 @@ private: dbus_pending_call_unref(aCall); } -public: - DBusConnectionSendWithReplyTask(DBusConnection* aConnection, - DBusMessage* aMessage, - int aTimeout, - DBusReplyCallback aCallback, - void* aData) - : DBusConnectionSendTaskBase(aConnection, aMessage), - mCallback(aCallback), - mData(aData), - mTimeout(aTimeout) - { } - - virtual ~DBusConnectionSendWithReplyTask() - { } - - void Run() MOZ_OVERRIDE - { - MOZ_ASSERT(MessageLoop::current()); - - // Freed at end of Notify - nsAutoPtr data(new NotifyData(mCallback, mData)); - NS_ENSURE_TRUE_VOID(data); - - DBusPendingCall* call; - - dbus_bool_t success = dbus_connection_send_with_reply(mConnection, - mMessage, - &call, - mTimeout); - NS_ENSURE_TRUE_VOID(success == TRUE); - - success = dbus_pending_call_set_notify(call, Notify, data, nullptr); - NS_ENSURE_TRUE_VOID(success == TRUE); - - data.forget(); - dbus_message_unref(mMessage); - }; - private: + void RunCallback(DBusMessage* aMessage) + { + if (mCallback) { + mCallback(aMessage, mData); + } + } + DBusReplyCallback mCallback; void* mData; - int mTimeout; }; -} -} - // // RawDBusConnection // @@ -218,19 +113,17 @@ void RawDBusConnection::ScopedDBusConnectionPtrTraits::release(DBusConnection* p bool RawDBusConnection::Send(DBusMessage* aMessage) { - DBusConnectionSendTask* t = - new DBusConnectionSendTask(mConnection, aMessage); - MOZ_ASSERT(t); + MOZ_ASSERT(aMessage); + MOZ_ASSERT(!NS_IsMainThread()); + MOZ_ASSERT(MessageLoop::current()); - nsresult rv = DispatchToDBusThread(t); - - if (NS_FAILED(rv)) { - if (aMessage) { - dbus_message_unref(aMessage); - } + dbus_bool_t success = dbus_connection_send(mConnection, + aMessage, + nullptr); + if (success != TRUE) { + dbus_message_unref(aMessage); return false; } - return true; } @@ -239,19 +132,27 @@ bool RawDBusConnection::SendWithReply(DBusReplyCallback aCallback, int aTimeout, DBusMessage* aMessage) { - DBusConnectionSendWithReplyTask* t = - new DBusConnectionSendWithReplyTask(mConnection, aMessage, aTimeout, - aCallback, aData); - MOZ_ASSERT(t); + MOZ_ASSERT(aMessage); + MOZ_ASSERT(!NS_IsMainThread()); + MOZ_ASSERT(MessageLoop::current()); - nsresult rv = DispatchToDBusThread(t); + nsAutoPtr ntfn(new Notification(aCallback, aData)); + NS_ENSURE_TRUE(ntfn, false); - if (NS_FAILED(rv)) { - if (aMessage) { - dbus_message_unref(aMessage); - } - return false; - } + DBusPendingCall* call; + + dbus_bool_t success = dbus_connection_send_with_reply(mConnection, + aMessage, + &call, + aTimeout); + NS_ENSURE_TRUE(success == TRUE, false); + + success = dbus_pending_call_set_notify(call, Notification::Handle, + ntfn, nullptr); + NS_ENSURE_TRUE(success == TRUE, false); + + ntfn.forget(); + dbus_message_unref(aMessage); return true; } @@ -265,6 +166,7 @@ bool RawDBusConnection::SendWithReply(DBusReplyCallback aCallback, int aFirstArgType, ...) { + MOZ_ASSERT(!NS_IsMainThread()); va_list args; va_start(args, aFirstArgType); @@ -301,3 +203,6 @@ DBusMessage* RawDBusConnection::BuildDBusMessage(const char* aPath, return msg; } + +} +} diff --git a/ipc/dbus/RawDBusConnection.h b/ipc/dbus/RawDBusConnection.h index 06329b7a1006..aff6397e97ec 100644 --- a/ipc/dbus/RawDBusConnection.h +++ b/ipc/dbus/RawDBusConnection.h @@ -7,14 +7,7 @@ #ifndef mozilla_ipc_dbus_gonk_rawdbusconnection_h__ #define mozilla_ipc_dbus_gonk_rawdbusconnection_h__ -#include -#include -#include -#include -#include -#include "nscore.h" #include "mozilla/Scoped.h" -#include struct DBusConnection; struct DBusError; From 21021592148132bbbaeba7b8733b17f12a1ed3ad Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Thu, 6 Feb 2014 17:57:38 +0100 Subject: [PATCH 41/58] Bug 968849: Fix GCC warnings about uninitialized variables, r=froydnj --- xpcom/base/SystemMemoryReporter.cpp | 2 +- xpcom/base/nsMemoryReporterManager.cpp | 2 +- xpcom/tests/TestDeadlockDetector.cpp | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/xpcom/base/SystemMemoryReporter.cpp b/xpcom/base/SystemMemoryReporter.cpp index f5a5353005b2..3070252745a0 100644 --- a/xpcom/base/SystemMemoryReporter.cpp +++ b/xpcom/base/SystemMemoryReporter.cpp @@ -345,7 +345,7 @@ private: GetReporterNameAndDescription(path, perms, name, description, &kind); while (true) { - size_t pss; + size_t pss = 0; nsresult rv = ParseMapBody(aFile, aProcessName, name, description, aHandleReport, aData, &pss); if (NS_FAILED(rv)) diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp index 59d333f9cafe..779b68541cf4 100644 --- a/xpcom/base/nsMemoryReporterManager.cpp +++ b/xpcom/base/nsMemoryReporterManager.cpp @@ -638,7 +638,7 @@ public: NS_METHOD CollectReports(nsIHandleReportCallback* aHandleReport, nsISupports* aData) { - int64_t amount; + int64_t amount = 0; nsresult rv = PageFaultsHardDistinguishedAmount(&amount); NS_ENSURE_SUCCESS(rv, rv); diff --git a/xpcom/tests/TestDeadlockDetector.cpp b/xpcom/tests/TestDeadlockDetector.cpp index 4a5e0b193307..a55caff4605e 100644 --- a/xpcom/tests/TestDeadlockDetector.cpp +++ b/xpcom/tests/TestDeadlockDetector.cpp @@ -124,7 +124,6 @@ public: int32_t nfds; bool stdoutOpen = true, stderrOpen = true; char buf[4096]; - int32_t len; PRIntervalTime now = PR_IntervalNow(); PRIntervalTime deadline = now + PR_MillisecondsToInterval(aWaitMs); @@ -158,15 +157,13 @@ public: continue; bool isStdout = mStdoutfd == pollfds[i].fd; - + int32_t len = 0; + if (PR_POLL_READ & pollfds[i].out_flags) { len = PR_Read(pollfds[i].fd, buf, sizeof(buf) - 1); NS_ASSERTION(0 <= len, PR_ErrorToName(PR_GetError())); } - else if (PR_POLL_HUP & pollfds[i].out_flags) { - len = 0; - } - else { + else if (!(PR_POLL_HUP & pollfds[i].out_flags)) { NS_ERROR(PR_ErrorToName(PR_GetError())); } From df1965773d7d22cb28ab3719f0883d040c3723a2 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 09:10:13 -0800 Subject: [PATCH 42/58] 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/8facea080537 Author: Germán Toro del Valle Desc: Merge pull request #15982 from gtorodelvalle/contacts-bug-966622-importing-from-vcf-file Bug 966622 - [contacts] import hangs at N-1 of N contacts imported from vcf file on memory card/sd card ======== https://hg.mozilla.org/integration/gaia-central/rev/12af5d0cf6f2 Author: Germán Toro del Valle Desc: Bug 966622 - [contacts] import hangs at N-1 of N contacts imported from.vcf file on memory card/sd 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 792bfe20d67e..b6fcf52ed846 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "eb9483ecb522fc75ed0c399a5544e318f2f59514", + "revision": "8facea0805371b8211ac47aab2a085b154d9f557", "repo_path": "/integration/gaia-central" } From e32e6d82e3987d0b7d10a3ff8e7126ac55439d3a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 09:10:57 -0800 Subject: [PATCH 43/58] 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 2386b5c66c72..79161e7622dc 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 b38a6b3d68e9..019da01489d6 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 2386b5c66c72..79161e7622dc 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 806d619bb815..0d7898de5065 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 fd4216a60012..ef61d3ba9c02 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 8bda398264c3..b7d2428823c1 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 dfdea6087baf..317d624cb2d2 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 e2d8efbc16a1..b0187f10cfd5 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 68cf671753e3..ecd95f7f18fc 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 2f6998052b2b7d8da1861ab0456ab11983cf1826 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 09:20:10 -0800 Subject: [PATCH 44/58] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/830f6fa9313c Author: Ben Francis Desc: Merge pull request #16047 from flodolo/bug968778 Bug 968778 - [browser] "Cancel" is hard-coded in the dialog appearing when long tapping on a link r=benfrancis ======== https://hg.mozilla.org/integration/gaia-central/rev/399daa196b4f Author: Francesco Lodolo (:flod) Desc: Bug 968778 - [browser] "Cancel" is hard-coded in the dialog appearing when long tapping on a link --- 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 b6fcf52ed846..7e63c4cfdf28 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "8facea0805371b8211ac47aab2a085b154d9f557", + "revision": "830f6fa9313c6f2f3e641b0ca397e570231af001", "repo_path": "/integration/gaia-central" } From e8e1ef965462792a854546aebcc20b9b764f9f27 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 09:25:59 -0800 Subject: [PATCH 45/58] 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 79161e7622dc..a43e7a3eb8f1 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 019da01489d6..32f9d1829c59 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 79161e7622dc..a43e7a3eb8f1 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 0d7898de5065..b57e95d42875 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 ef61d3ba9c02..44c5d0805629 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 b7d2428823c1..8f44bef35b5d 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 317d624cb2d2..175ffa19ce07 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 b0187f10cfd5..21a942e740bf 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 ecd95f7f18fc..0f62a14cf60d 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 9382989534a4424991c3e50078aeec9228237760 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 10:00:13 -0800 Subject: [PATCH 46/58] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/da052e190cb5 Author: Marcus Cavanaugh Desc: Merge pull request #15923 from mcav/timer-button-sizes Bug 951092 - [Clock] Adjust Pause/Cancel buttons size and style in Timer... ======== https://hg.mozilla.org/integration/gaia-central/rev/52a46c9246b9 Author: Marcus Cavanaugh Desc: Bug 951092 - [Clock] Adjust Pause/Cancel buttons size and style in Timer. r=jburke ======== https://hg.mozilla.org/integration/gaia-central/rev/4c25b1959b1c Author: Dominic Kuo Desc: Merge pull request #16039 from dominickuo/bug-946556-new Bug 946556 - [Music] Disable the play controls when using a bluetooth headset in a call, r=jimporter ======== https://hg.mozilla.org/integration/gaia-central/rev/86228d986b47 Author: Dominic Kuo Desc: Bug 946556 - [Music] Disable the play controls when using a bluetooth headset in a call --- 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 7e63c4cfdf28..ff63f3eac1ae 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "830f6fa9313c6f2f3e641b0ca397e570231af001", + "revision": "da052e190cb57c8857f2634e458988da69613cb9", "repo_path": "/integration/gaia-central" } From 02fccea4b0157faf2369fb137aa90072037ac737 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 10:01:02 -0800 Subject: [PATCH 47/58] 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 a43e7a3eb8f1..1cf78605ee7d 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 32f9d1829c59..eb40dbcadc78 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 a43e7a3eb8f1..1cf78605ee7d 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 b57e95d42875..86bd6a036d2c 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 44c5d0805629..bb128bfa9f60 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 8f44bef35b5d..d7bc46c7f56c 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 175ffa19ce07..0e44b1629b7b 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 21a942e740bf..2f7b91fd78bf 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 0f62a14cf60d..3a42ef984343 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 21e122f75a037b93202e43da6ff20fc0ee24ed1e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 10:10:10 -0800 Subject: [PATCH 48/58] Bumping gaia.json for 5 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/12ede7add487 Author: Marcus Cavanaugh Desc: Merge pull request #15920 from mcav/preview-lock Bug 966023 - [B2G][Clock][Timer] Sounds previews continue to play from t... ======== https://hg.mozilla.org/integration/gaia-central/rev/7f57215527d1 Author: Marcus Cavanaugh Desc: Use TimerPanel.prototype.onvisibilitychange. r=jugglinmike ======== https://hg.mozilla.org/integration/gaia-central/rev/2d16db06d3cd Author: Marcus Cavanaugh Desc: Bug 966023 - [B2G][Clock][Timer] Sounds previews continue to play from the timer "Sound list" when locking the device. ======== https://hg.mozilla.org/integration/gaia-central/rev/95d29ed3e19f Author: Michael Henretty Desc: Merge pull request #15977 from mikehenrty/bug-966571-retrycount Bug 966571 - Retry count not shown up in System SIM Dialog, r=arcturus,alive,ferjm ======== https://hg.mozilla.org/integration/gaia-central/rev/a0848ecd7a37 Author: Michael Henretty Desc: Bug 966571 - Retry count not shown up in System SIM Dialog --- 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 ff63f3eac1ae..d0792e5f0b06 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "da052e190cb57c8857f2634e458988da69613cb9", + "revision": "12ede7add487f85f53e84b482c8390f36f2af73f", "repo_path": "/integration/gaia-central" } From 66eccf57eaf7ad5576759d4ce5b46ed54b5de357 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 10:20:59 -0800 Subject: [PATCH 49/58] 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 1cf78605ee7d..52aedd781841 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 eb40dbcadc78..d99defced30b 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 1cf78605ee7d..52aedd781841 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 86bd6a036d2c..43b63b574324 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 bb128bfa9f60..f156e84bda4b 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 d7bc46c7f56c..64dc95fab806 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 0e44b1629b7b..b85bbe0700fb 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 2f7b91fd78bf..80d97220b8a8 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 3a42ef984343..6ea3293eddea 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From c46ca2338880ba12cc9da659c903cc1d4b20f28f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 10:25:10 -0800 Subject: [PATCH 50/58] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/24249852bce3 Author: Marcus Cavanaugh Desc: Merge pull request #15922 from mcav/stopwatch-button-sizes Bug 951096 - [Clock] Adjust Stop/Lap buttons size and style in Stopwatch. r=jburke ======== https://hg.mozilla.org/integration/gaia-central/rev/0f0cbbedf53d Author: Marcus Cavanaugh Desc: Bug 951096 - [Clock] Adjust Stop/Lap buttons size and style in Stopwatch. r=jburke ======== https://hg.mozilla.org/integration/gaia-central/rev/1616852bd36c Author: Marcus Cavanaugh Desc: Merge pull request #15921 from mcav/alarm-sizes Bug 951080 - [Clock] Adjustment for setting a new or editing an alarm. r=hhuang ======== https://hg.mozilla.org/integration/gaia-central/rev/c5110e29e49d Author: Marcus Cavanaugh Desc: Bug 951080 - [Clock] Adjustment for setting a new or editing an alarm. r=hhuang --- 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 d0792e5f0b06..ba765ba9bc99 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "12ede7add487f85f53e84b482c8390f36f2af73f", + "revision": "24249852bce3ad2d377cf1a7e0c10f31b3b4e399", "repo_path": "/integration/gaia-central" } From 72af8e6eaebd94e22e35a479caac7dc6b8f29783 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 10:30:57 -0800 Subject: [PATCH 51/58] 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 52aedd781841..2e155b10d3a4 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 d99defced30b..9ebdc7522031 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 52aedd781841..2e155b10d3a4 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 43b63b574324..5fa6012e4cb4 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 f156e84bda4b..00aba2ee3cd3 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 64dc95fab806..0fc1e8a3335c 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 b85bbe0700fb..63f838093ac9 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 80d97220b8a8..02d4298052df 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 6ea3293eddea..11382b945699 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 9802fb9a190c6c46a270fbaabea1d015ddf6ab71 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 10:50:12 -0800 Subject: [PATCH 52/58] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/5231b63ec62a Author: Fabrice Desre Desc: Bug 968957 - Disable 3rd party keyboards until we make them work with Nuwa processes r=me --- 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 ba765ba9bc99..65b2a01159e5 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "24249852bce3ad2d377cf1a7e0c10f31b3b4e399", + "revision": "5231b63ec62acefd3ddf57f35d5b17ac2d3028c9", "repo_path": "/integration/gaia-central" } From da5a25f77d045afa3c88ddb4b33c0f809d213f92 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 10:56:01 -0800 Subject: [PATCH 53/58] 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 2e155b10d3a4..67a27476f672 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 9ebdc7522031..1472a84bc8ed 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 2e155b10d3a4..67a27476f672 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 5fa6012e4cb4..6b02cc86ba33 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 00aba2ee3cd3..7b23f9d1d281 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 0fc1e8a3335c..fd1706e86f39 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 63f838093ac9..809dc0702006 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 02d4298052df..d27bd2a55129 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 11382b945699..ceca1444f0a3 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 7713f5a57f40c5d5f369a2c94a861772b02e9417 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 11:30:10 -0800 Subject: [PATCH 54/58] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/db9384dbb7d6 Author: Jonathan Griffin Desc: Merge pull request #16054 from rwood-moz/updatechecker Bug 965426 - FakeUpdateChecker fails on Tarako devices, r=jgriffin ======== https://hg.mozilla.org/integration/gaia-central/rev/4769480d99fd Author: rwood-moz Desc: Bug 965426 - FakeUpdateChecker fails on Tarako devices, r=jgriffin --- 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 65b2a01159e5..c14db80c9cad 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "5231b63ec62acefd3ddf57f35d5b17ac2d3028c9", + "revision": "db9384dbb7d651c6ab745ce6549769604898f152", "repo_path": "/integration/gaia-central" } From 76b6b83e79329faf4fc8f5adc6144bb67d89e65d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 11:36:02 -0800 Subject: [PATCH 55/58] 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 67a27476f672..e37edcbb5038 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 1472a84bc8ed..9caf0099f246 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 67a27476f672..e37edcbb5038 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 6b02cc86ba33..fc855e6b901b 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 7b23f9d1d281..17fd9df281f7 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 fd1706e86f39..4a8535d6da4b 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 809dc0702006..aef3ca8dc99f 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 d27bd2a55129..3228fdf1a343 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 ceca1444f0a3..14d097aa0a9a 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 74652b5b503e604487c62b7f9c1418d6d863a1b7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 11:40:11 -0800 Subject: [PATCH 56/58] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b82f9138def9 Author: punamdahiya Desc: Merge pull request #16057 from punamdahiya/NodeVersion Update Gaia Read Me Integration Tests requirement with correct node version r=gaye ======== https://hg.mozilla.org/integration/gaia-central/rev/a7a73d4d3cd2 Author: Punam Dahiya Desc: Update Gaia Read Me Integration Tests requirement with correct node version r=gaye --- 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 c14db80c9cad..b3519e0585d3 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "db9384dbb7d651c6ab745ce6549769604898f152", + "revision": "b82f9138def9e1b0ce69667ca29069cd8b785d5e", "repo_path": "/integration/gaia-central" } From f4a4e414ae7c7b540497eb9eaa6e2d642ced4062 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 6 Feb 2014 11:40:57 -0800 Subject: [PATCH 57/58] 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 e37edcbb5038..7adfde8eaf5e 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 9caf0099f246..d4b146d9e455 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 e37edcbb5038..7adfde8eaf5e 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 fc855e6b901b..c739cf775af0 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 17fd9df281f7..44639ef93c3d 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 4a8535d6da4b..9b6fc34c58c1 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 aef3ca8dc99f..4727df25c42b 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 3228fdf1a343..8d5b609351f5 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 14d097aa0a9a..e25a53cbf198 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From bf01afc5cc92da891db3daf929ec4d8f679b7ec1 Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Thu, 6 Feb 2014 14:50:16 -0500 Subject: [PATCH 58/58] Bug 965351 - Re-enable tests now that the underlying issue is fixed. r=fabrice --- testing/mochitest/b2g.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/testing/mochitest/b2g.json b/testing/mochitest/b2g.json index 44998d810502..95f3496e2613 100644 --- a/testing/mochitest/b2g.json +++ b/testing/mochitest/b2g.json @@ -175,7 +175,6 @@ "content/html/document/test/test_bug741266.html":"needs control of popup window size", "docshell/test/navigation/test_popup-navigates-children.html":"Needs multiple window.open support, also uses docshelltreenode", "docshell/test/test_bug590573.html":"queryinterfaces into webnavigation, might suffer from something similar as bug 823022", - "docshell/test/navigation/test_bug430723.html":"apz race condition, see bug 965351", "dom/devicestorage/ipc/test_ipc.html":"nested ipc not working", "dom/indexedDB/ipc/test_ipc.html":"nested ipc not working", @@ -270,7 +269,6 @@ "dom/events/test/test_bug574663.html":"", "dom/events/test/test_bug607464.html":"", "dom/events/test/test_wheel_default_action.html":"", - "dom/events/test/test_bug946632.html":"apz race condition, see bug 965351", "dom/file/test/test_progress_events.html":"All of these fail fairly regularly with: UnknownError: The operation failed for reasons unrelated to the database itself and not covered by any other error code. at http://mochi.test:8888/tests/dom/file/test/helpers.js:126", "dom/file/test/test_request_readyState.html":"", @@ -382,7 +380,6 @@ "layout/forms/test/test_bug571352.html":"shift-click multi-select not working?", "layout/forms/test/test_textarea_resize.html":"resizing textarea not available in b2g", "layout/forms/test/test_bug903715.html":"select elements don't use an in-page popup in B2G", - "layout/forms/test/test_bug564115.html":"apz race condition, see bug 965351", "layout/generic/test/test_bug392746.html":"ctrl mouse select not working in b2g", "layout/generic/test/test_bug791616.html":"Target should not have scrolled - got 114.10000610351562, expected 115.39999389648438", "layout/generic/test/test_invalidate_during_plugin_paint.html":"plugins not supported",