From 5a2368e53cf848f403fb473b3edb3d0a4b03aeda Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Jan 2014 15:00:19 -0800 Subject: [PATCH 01/20] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/afb2469db615 Author: James Burke Desc: Merge pull request #15430 from jrburke/bug960343-email-minify Bug 960343 - email: minify JS r=asuth ======== https://hg.mozilla.org/integration/gaia-central/rev/60b9d666d9cc Author: jrburke Desc: Bug 960343 - email: minify 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 79a95ae56b58..60ed9056541d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "98abf6bda1c12b45389ec6bc2acd3e3e901e3163", + "revision": "afb2469db6155c2fe28d9d0764581edde5c56673", "repo_path": "/integration/gaia-central" } From a277b0d1615156f4fe497a79addf96131f982518 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Jan 2014 15:04:12 -0800 Subject: [PATCH 02/20] 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 411064af22c0..9b6c2517399f 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 f4fd21a661a9..505666d153b8 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 411064af22c0..9b6c2517399f 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 fb4195e9949c..c113ccf198b6 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 68b142588e68..bcd3c954a47c 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 6d431eea1b74..cac1930be69d 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 eb9e9a7327af..0846aee485de 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 ee137a4b30a8..6355c7d759bf 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 a24af7046acd..a8773d74835e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From d1ba4ea8a3d2e14354bd8c8e5a7efb0caf2189e6 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Jan 2014 15:40:11 -0800 Subject: [PATCH 03/20] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/7b386168c3f8 Author: jrburke Desc: Revert "Merge pull request #15430 from jrburke/bug960343-email-minify" This reverts commit e58e11c376048692a2c6830756e135f7c52f48a4, reversing changes made to 8d18b1e2fd06c84a879f99f6e8ca1f104eeacb13. --- 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 60ed9056541d..63595381aa54 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "afb2469db6155c2fe28d9d0764581edde5c56673", + "revision": "7b386168c3f86bd4e48d60b381f3d67146b1e263", "repo_path": "/integration/gaia-central" } From 4469ac7620c26ed64531275a8da99eb55de268dd Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Jan 2014 15:41:01 -0800 Subject: [PATCH 04/20] 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 9b6c2517399f..f14de13f4451 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 505666d153b8..a8afc0b12e42 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 9b6c2517399f..f14de13f4451 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 c113ccf198b6..8c83ed042e5e 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 bcd3c954a47c..5b38c3046989 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 cac1930be69d..d07741915093 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 0846aee485de..179e2d1c3ac7 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 6355c7d759bf..dbb6fffd0501 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 a8773d74835e..e42778330b6c 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From b15629af070f169065de75dde212ccc46f83a1bb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Jan 2014 16:30:12 -0800 Subject: [PATCH 05/20] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/90c6c41b439b Author: Marcus Cavanaugh Desc: Merge pull request #15198 from gnaneswar/Issue_951072 Bug 951072 - [Clock] Text alignment issue in alarm list; r=hhuang r=mcav ======== https://hg.mozilla.org/integration/gaia-central/rev/b412d45bb524 Author: Gnaneswar Devuni Desc: Bug 951072 - [Clock] Text alignment issue in alarm list; r=reviews --- 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 63595381aa54..5743a2bf8fa0 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "7b386168c3f86bd4e48d60b381f3d67146b1e263", + "revision": "90c6c41b439b1d1935ed4870477471fd1359f79f", "repo_path": "/integration/gaia-central" } From e45bd50e1a8d2e58b3f8aa13012a6027636ac828 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Jan 2014 16:35:59 -0800 Subject: [PATCH 06/20] 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 f14de13f4451..be2d270e79ee 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 a8afc0b12e42..88f3ce1d807b 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 f14de13f4451..be2d270e79ee 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 8c83ed042e5e..c264d5e8bfd7 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 5b38c3046989..29bcd639af44 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 d07741915093..c3c4873c7cd2 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 179e2d1c3ac7..e1d860f87730 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 dbb6fffd0501..7b670e3987eb 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 e42778330b6c..172e9a862ca1 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 7c98bf5ee1a9ca0a9481d60f74291968ba1dc36a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Jan 2014 16:55:13 -0800 Subject: [PATCH 07/20] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8eabd20ad389 Author: James Burke Desc: Merge pull request #15569 from jrburke/bug960343-email-minify-2 Bug 960343 - email: minify JS r=asuth ======== https://hg.mozilla.org/integration/gaia-central/rev/0c6e48a2c4f2 Author: jrburke Desc: Bug 960343 - email: minify 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 5743a2bf8fa0..0f7f8282bf6b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "90c6c41b439b1d1935ed4870477471fd1359f79f", + "revision": "8eabd20ad389228efa0b41901b2c354c052f2c25", "repo_path": "/integration/gaia-central" } From 5401a8c9979e94c8cbf9bea143995ad6d5cb855a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Jan 2014 16:56:41 -0800 Subject: [PATCH 08/20] 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 be2d270e79ee..e5dd7c86189a 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 88f3ce1d807b..09617f85dd0b 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 be2d270e79ee..e5dd7c86189a 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 c264d5e8bfd7..fd5404b6cdfe 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 29bcd639af44..9cbf4fc93ee2 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 c3c4873c7cd2..7f8b0f9ce8de 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 e1d860f87730..d3c02406dff6 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 7b670e3987eb..e71a83109fa8 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 172e9a862ca1..df3a8fea713a 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 9c5c0421272ab772a6bad38d268a0ebf7ecf4342 Mon Sep 17 00:00:00 2001 From: Michael Henretty Date: Wed, 22 Jan 2014 09:23:30 +0800 Subject: [PATCH 09/20] Bug 960762 - Disable intermittent notification tests. r=gwagner --- testing/mochitest/b2g-debug.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testing/mochitest/b2g-debug.json b/testing/mochitest/b2g-debug.json index 5c36635f697f..9700fab7258f 100644 --- a/testing/mochitest/b2g-debug.json +++ b/testing/mochitest/b2g-debug.json @@ -490,6 +490,8 @@ "dom/tests/mochitest/ajax/prototype/test_Prototype.html": "debug-only timeout", "dom/tests/mochitest/geolocation/test_errorcheck.html": "debug-only timeout", "dom/tests/mochitest/localstorage/test_cookieSession.html": "debug-only failure", + "dom/tests/mochitest/notification/test_notification_storage.html": "debug-only timeout", + "dom/tests/mochitest/notification/test_bug931307.html": "debug-only timeout", "dom/tests/mochitest/orientation/test_bug507902.html": "debug-only failure", "dom/workers/test/test_onLine.html": "debug-only failure", "dom/workers/test/test_csp.html": "debug-only failure", From 90c1161c7b76027c945d15a7ba0df869350bb371 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Jan 2014 18:10:10 -0800 Subject: [PATCH 10/20] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/5c151b3b7d59 Author: John Hu Desc: Merge pull request #15247 from huchengtw-moz/gallery/Bug_958681-parse-broken-image-file Bug 958681 - [B2G][Gaia][Gallery] When a corrupt image is placed on the ..., r=djf ======== https://hg.mozilla.org/integration/gaia-central/rev/5a04161d876e Author: John Hu Desc: Bug 958681 - [B2G][Gaia][Gallery] When a corrupt image is placed on the device the gallery app can appear to continue loading indefinitely with no warning. --- 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 0f7f8282bf6b..4975217bba17 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "8eabd20ad389228efa0b41901b2c354c052f2c25", + "revision": "5c151b3b7d598bae7539e23d9db9ce7e530172db", "repo_path": "/integration/gaia-central" } From cc8368d33a17ccf4d0bd91d20c7ab98283ccfd2f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Jan 2014 18:16:57 -0800 Subject: [PATCH 11/20] 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 e5dd7c86189a..29935b0e96ca 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 09617f85dd0b..46f9c61b4ea9 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 e5dd7c86189a..29935b0e96ca 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 fd5404b6cdfe..c0b1814c60b9 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 9cbf4fc93ee2..5545fbbc3983 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 7f8b0f9ce8de..7e2aeece28f6 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 d3c02406dff6..bc63955f25c7 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 e71a83109fa8..dc79a1de7048 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 df3a8fea713a..b344debd6b15 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 8f3a218e18abe857ab8a3b7b68bf33166c959ecf Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Jan 2014 19:00:19 -0800 Subject: [PATCH 12/20] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a554876c79ae Author: Gareth Aye Desc: Merge pull request #15335 from millermedeiros/flaky-day-view-header-test Bug 959901 - [Calendar][Integration Test] "day_view_test.js" is permared r=gaye ======== https://hg.mozilla.org/integration/gaia-central/rev/414590d7eaf8 Author: millermedeiros Desc: bug 959901 - [calendar][integration test] "day_view_test.js" is permared --- 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 4975217bba17..fbf09fd6cc9a 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "5c151b3b7d598bae7539e23d9db9ce7e530172db", + "revision": "a554876c79aea5e2ef6abf7b2e691ef4ec6d388c", "repo_path": "/integration/gaia-central" } From 3a89bc59b8369c4cb9d1ce99543ff60d9351dfb5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Jan 2014 19:03:29 -0800 Subject: [PATCH 13/20] 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 29935b0e96ca..0bb0a18c5dd0 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 46f9c61b4ea9..30f396e63814 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 29935b0e96ca..0bb0a18c5dd0 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 c0b1814c60b9..d29b07cea0b5 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 5545fbbc3983..8543d2f81dfd 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 7e2aeece28f6..e91fea44598d 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 bc63955f25c7..d0d1769a5519 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 dc79a1de7048..38b300e7a3b5 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 b344debd6b15..5cac1a144224 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From d2044a6c5ea33e79330384a746cf4ed4ec2bc97d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Jan 2014 19:10:18 -0800 Subject: [PATCH 14/20] Bumping gaia.json for 7 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/3c886308136e Author: Eitan Isaacson Desc: Merge pull request #15568 from eeejay/bug-962318 Bug 962318 - Hide app iframe from accessibility when modal dialog is dis... r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/082fae43308d Author: Eitan Isaacson Desc: Bug 962318 - Hide app iframe from accessibility when modal dialog is displayed. ======== https://hg.mozilla.org/integration/gaia-central/rev/78e1c59f3b66 Author: Eitan Isaacson Desc: Merge pull request #15211 from eeejay/bug-958649 Bug 958649 - Introduce accessibility UI tests. r=zac ======== https://hg.mozilla.org/integration/gaia-central/rev/837a82502ffa Author: Eitan Isaacson Desc: Bug 958649 - Introduce lockscreen accessibility tests. ======== https://hg.mozilla.org/integration/gaia-central/rev/0af7a71aaf93 Author: Eitan Isaacson Desc: Bug 958649 - Introduce basic accessibility functionality for Gaia UI tests. ======== https://hg.mozilla.org/integration/gaia-central/rev/fa63e31b5a76 Author: Eitan Isaacson Desc: Merge pull request #15573 from eeejay/bug-962273 Bug 962273 - Update browser helper to use promise apps API. r=fabrice ======== https://hg.mozilla.org/integration/gaia-central/rev/7023cbaebe8c Author: Eitan Isaacson Desc: Bug 962273 - Update browser helper to use promise apps API. --- 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 fbf09fd6cc9a..a5e706752325 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "a554876c79aea5e2ef6abf7b2e691ef4ec6d388c", + "revision": "3c886308136ea2c519b29d206e5d7afde7cde6fb", "repo_path": "/integration/gaia-central" } From 81c8fec47a0773c40f1c67fe8d29c2dd534b17e5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Jan 2014 19:13:38 -0800 Subject: [PATCH 15/20] 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 0bb0a18c5dd0..225d3842d1e6 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 30f396e63814..3d2cc1a32408 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 0bb0a18c5dd0..225d3842d1e6 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 d29b07cea0b5..b678adaca08c 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 8543d2f81dfd..564e67ee1d16 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 e91fea44598d..9e498bd29e92 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 d0d1769a5519..d1eaa329c2b6 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 38b300e7a3b5..062e6a6d9c0f 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 5cac1a144224..acf767f99eda 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From f386355248e0927df6f9d7df0946cccbe4f689c3 Mon Sep 17 00:00:00 2001 From: Gina Yeh Date: Wed, 22 Jan 2014 14:26:29 +0800 Subject: [PATCH 16/20] Bug 952907 - Patch 1: Use WebIDL codegen to implement Bluetooth events, r=smaug --- dom/base/nsDOMClassInfo.cpp | 15 ---------- dom/base/nsDOMClassInfoClasses.h | 4 --- dom/bluetooth/BluetoothAdapter.cpp | 30 +++++++++---------- dom/bluetooth/BluetoothAdapter.h | 1 - dom/bluetooth/BluetoothDevice.cpp | 2 -- dom/bluetooth/BluetoothDevice.h | 7 ----- dom/bluetooth/interfaces/moz.build | 14 --------- .../interfaces/nsIDOMBluetoothDevice.idl | 14 --------- .../interfaces/nsIDOMBluetoothDeviceEvent.idl | 25 ---------------- .../nsIDOMBluetoothStatusChangedEvent.idl | 24 --------------- dom/bluetooth/moz.build | 2 -- dom/webidl/BluetoothDeviceEvent.webidl | 2 +- dom/webidl/BluetoothStatusChangedEvent.webidl | 2 +- dom/webidl/moz.build | 9 ++++-- js/xpconnect/src/event_impl_gen.conf.in | 5 ---- 15 files changed, 24 insertions(+), 132 deletions(-) delete mode 100644 dom/bluetooth/interfaces/moz.build delete mode 100644 dom/bluetooth/interfaces/nsIDOMBluetoothDevice.idl delete mode 100644 dom/bluetooth/interfaces/nsIDOMBluetoothDeviceEvent.idl delete mode 100644 dom/bluetooth/interfaces/nsIDOMBluetoothStatusChangedEvent.idl diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index 56a3624ce790..5b889126006c 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -164,10 +164,6 @@ #include "FMRadio.h" #endif -#ifdef MOZ_B2G_BT -#include "BluetoothDevice.h" -#endif - #include "nsIDOMCameraManager.h" #include "nsIDOMGlobalObjectConstructor.h" #include "nsIDOMLockedFile.h" @@ -488,11 +484,6 @@ static nsDOMClassInfoData sClassInfoData[] = { DOM_DEFAULT_SCRIPTABLE_FLAGS) #endif -#ifdef MOZ_B2G_BT - NS_DEFINE_CLASSINFO_DATA(BluetoothDevice, nsEventTargetSH, - EVENTTARGET_SCRIPTABLE_FLAGS) -#endif - NS_DEFINE_CLASSINFO_DATA(CameraCapabilities, nsDOMGenericSH, DOM_DEFAULT_SCRIPTABLE_FLAGS) @@ -1203,12 +1194,6 @@ nsDOMClassInfo::Init() #endif -#ifdef MOZ_B2G_BT - DOM_CLASSINFO_MAP_BEGIN(BluetoothDevice, nsIDOMBluetoothDevice) - DOM_CLASSINFO_MAP_ENTRY(nsIDOMBluetoothDevice) - DOM_CLASSINFO_MAP_END -#endif - DOM_CLASSINFO_MAP_BEGIN(CameraCapabilities, nsICameraCapabilities) DOM_CLASSINFO_MAP_ENTRY(nsICameraCapabilities) DOM_CLASSINFO_MAP_END diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h index de8039956875..0c477cd7d91a 100644 --- a/dom/base/nsDOMClassInfoClasses.h +++ b/dom/base/nsDOMClassInfoClasses.h @@ -108,10 +108,6 @@ DOMCI_CLASS(CSSPageRule) DOMCI_CLASS(MozIccManager) #endif -#ifdef MOZ_B2G_BT -DOMCI_CLASS(BluetoothDevice) -#endif - DOMCI_CLASS(CameraCapabilities) DOMCI_CLASS(LockedFile) diff --git a/dom/bluetooth/BluetoothAdapter.cpp b/dom/bluetooth/BluetoothAdapter.cpp index 7b144d715b28..ea1a8496157d 100644 --- a/dom/bluetooth/BluetoothAdapter.cpp +++ b/dom/bluetooth/BluetoothAdapter.cpp @@ -5,17 +5,16 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "base/basictypes.h" -#include "GeneratedEvents.h" #include "nsCxPusher.h" #include "nsDOMClassInfo.h" -#include "nsIDOMBluetoothDeviceEvent.h" -#include "nsIDOMBluetoothStatusChangedEvent.h" #include "nsTArrayHelpers.h" #include "DOMRequest.h" #include "nsThreadUtils.h" #include "mozilla/dom/bluetooth/BluetoothTypes.h" #include "mozilla/dom/BluetoothAdapterBinding.h" +#include "mozilla/dom/BluetoothDeviceEvent.h" +#include "mozilla/dom/BluetoothStatusChangedEvent.h" #include "mozilla/dom/ContentChild.h" #include "mozilla/LazyIdleThread.h" @@ -305,12 +304,13 @@ BluetoothAdapter::Notify(const BluetoothSignal& aData) BluetoothValue v = aData.value(); if (aData.name().EqualsLiteral("DeviceFound")) { nsRefPtr device = BluetoothDevice::Create(GetOwner(), mPath, aData.value()); - nsCOMPtr event; - NS_NewDOMBluetoothDeviceEvent(getter_AddRefs(event), this, nullptr, nullptr); - nsCOMPtr e = do_QueryInterface(event); - e->InitBluetoothDeviceEvent(NS_LITERAL_STRING("devicefound"), - false, false, device); + BluetoothDeviceEventInit init; + init.mBubbles = false; + init.mCancelable = false; + init.mDevice = device; + nsRefPtr event = + BluetoothDeviceEvent::Constructor(this, NS_LITERAL_STRING("devicefound"), init); DispatchTrustedEvent(event); } else if (aData.name().EqualsLiteral("PropertyChanged")) { MOZ_ASSERT(v.type() == BluetoothValue::TArrayOfBluetoothNamedValue); @@ -335,13 +335,13 @@ BluetoothAdapter::Notify(const BluetoothSignal& aData) nsString address = arr[0].value().get_nsString(); bool status = arr[1].value().get_bool(); - nsCOMPtr event; - NS_NewDOMBluetoothStatusChangedEvent( - getter_AddRefs(event), this, nullptr, nullptr); - - nsCOMPtr e = do_QueryInterface(event); - e->InitBluetoothStatusChangedEvent(aData.name(), false, false, - address, status); + BluetoothStatusChangedEventInit init; + init.mBubbles = false; + init.mCancelable = false; + init.mAddress = address; + init.mStatus = status; + nsRefPtr event = + BluetoothStatusChangedEvent::Constructor(this, aData.name(), init); DispatchTrustedEvent(event); } else if (aData.name().EqualsLiteral(REQUEST_MEDIA_PLAYSTATUS_ID)) { nsCOMPtr event; diff --git a/dom/bluetooth/BluetoothAdapter.h b/dom/bluetooth/BluetoothAdapter.h index e2838f30e4c5..9add67b1d302 100644 --- a/dom/bluetooth/BluetoothAdapter.h +++ b/dom/bluetooth/BluetoothAdapter.h @@ -12,7 +12,6 @@ #include "BluetoothPropertyContainer.h" #include "nsCOMPtr.h" #include "nsDOMEventTargetHelper.h" -#include "nsIDOMBluetoothDevice.h" namespace mozilla { namespace dom { diff --git a/dom/bluetooth/BluetoothDevice.cpp b/dom/bluetooth/BluetoothDevice.cpp index 7bdb9624bdac..a81895f3d86a 100644 --- a/dom/bluetooth/BluetoothDevice.cpp +++ b/dom/bluetooth/BluetoothDevice.cpp @@ -39,8 +39,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(BluetoothDevice, NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(BluetoothDevice) - NS_INTERFACE_MAP_ENTRY(nsIDOMBluetoothDevice) - NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(BluetoothDevice) NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper) NS_IMPL_ADDREF_INHERITED(BluetoothDevice, nsDOMEventTargetHelper) diff --git a/dom/bluetooth/BluetoothDevice.h b/dom/bluetooth/BluetoothDevice.h index 4e872671fdc7..7dad68ae6ae8 100644 --- a/dom/bluetooth/BluetoothDevice.h +++ b/dom/bluetooth/BluetoothDevice.h @@ -11,11 +11,8 @@ #include "BluetoothCommon.h" #include "BluetoothPropertyContainer.h" #include "nsDOMEventTargetHelper.h" -#include "nsIDOMBluetoothDevice.h" #include "nsString.h" -class nsIDOMDOMRequest; - BEGIN_BLUETOOTH_NAMESPACE class BluetoothNamedValue; @@ -24,15 +21,11 @@ class BluetoothSignal; class BluetoothSocket; class BluetoothDevice : public nsDOMEventTargetHelper - , public nsIDOMBluetoothDevice , public BluetoothSignalObserver , public BluetoothPropertyContainer { public: NS_DECL_ISUPPORTS_INHERITED - NS_DECL_NSIDOMBLUETOOTHDEVICE - - NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetHelper) NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(BluetoothDevice, nsDOMEventTargetHelper) diff --git a/dom/bluetooth/interfaces/moz.build b/dom/bluetooth/interfaces/moz.build deleted file mode 100644 index 7d301fd59af5..000000000000 --- a/dom/bluetooth/interfaces/moz.build +++ /dev/null @@ -1,14 +0,0 @@ -# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -if CONFIG['MOZ_B2G_BT']: - XPIDL_SOURCES += [ - 'nsIDOMBluetoothDevice.idl', - 'nsIDOMBluetoothDeviceEvent.idl', - 'nsIDOMBluetoothStatusChangedEvent.idl', - ] - XPIDL_MODULE = 'dom_bluetooth' - diff --git a/dom/bluetooth/interfaces/nsIDOMBluetoothDevice.idl b/dom/bluetooth/interfaces/nsIDOMBluetoothDevice.idl deleted file mode 100644 index 9e6fd48158e8..000000000000 --- a/dom/bluetooth/interfaces/nsIDOMBluetoothDevice.idl +++ /dev/null @@ -1,14 +0,0 @@ -/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */ -/* vim: set ts=2 et sw=2 tw=80: */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "nsIDOMEventTarget.idl" - -// XPIDL interfaces might need this definition; so we keep it in place -// until we completely switched to WebIDL. See bug 900904. -[scriptable, builtinclass, uuid(291fdda9-4f96-4f2f-857f-900f89fb0412)] -interface nsIDOMBluetoothDevice : nsIDOMEventTarget -{ -}; diff --git a/dom/bluetooth/interfaces/nsIDOMBluetoothDeviceEvent.idl b/dom/bluetooth/interfaces/nsIDOMBluetoothDeviceEvent.idl deleted file mode 100644 index 40ec3fb1d03d..000000000000 --- a/dom/bluetooth/interfaces/nsIDOMBluetoothDeviceEvent.idl +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */ -/* vim: set ts=2 et sw=2 tw=80: */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "nsIDOMEvent.idl" - -interface nsIDOMBluetoothDevice; - -[scriptable, builtinclass, uuid(e53dd06e-acd7-444a-914a-5fb60df0ad5b)] -interface nsIDOMBluetoothDeviceEvent : nsIDOMEvent -{ - readonly attribute nsIDOMBluetoothDevice device; - - [noscript] void initBluetoothDeviceEvent(in DOMString aType, - in boolean aCanBubble, - in boolean aCancelable, - in nsIDOMBluetoothDevice aDevice); -}; - -dictionary BluetoothDeviceEventInit : EventInit -{ - nsIDOMBluetoothDevice device; -}; diff --git a/dom/bluetooth/interfaces/nsIDOMBluetoothStatusChangedEvent.idl b/dom/bluetooth/interfaces/nsIDOMBluetoothStatusChangedEvent.idl deleted file mode 100644 index b2b3e3b17081..000000000000 --- a/dom/bluetooth/interfaces/nsIDOMBluetoothStatusChangedEvent.idl +++ /dev/null @@ -1,24 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "nsIDOMEvent.idl" - -[scriptable, builtinclass, uuid(07f6d8d0-d364-4033-92e2-d69de323d7b7)] -interface nsIDOMBluetoothStatusChangedEvent : nsIDOMEvent -{ - readonly attribute DOMString address; - readonly attribute boolean status; - - [noscript] void initBluetoothStatusChangedEvent(in DOMString aType, - in boolean aCanBubble, - in boolean aCancelable, - in DOMString aAddress, - in boolean aStatus); -}; - -dictionary BluetoothStatusChangedEventInit : EventInit -{ - DOMString address; - bool status; -}; diff --git a/dom/bluetooth/moz.build b/dom/bluetooth/moz.build index 08a01d377404..ccd4012b41f7 100644 --- a/dom/bluetooth/moz.build +++ b/dom/bluetooth/moz.build @@ -5,8 +5,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. if CONFIG['MOZ_B2G_BT']: - PARALLEL_DIRS += ['interfaces'] - SOURCES += [ 'BluetoothAdapter.cpp', 'BluetoothDevice.cpp', diff --git a/dom/webidl/BluetoothDeviceEvent.webidl b/dom/webidl/BluetoothDeviceEvent.webidl index 55b31a69261e..1d1895370621 100644 --- a/dom/webidl/BluetoothDeviceEvent.webidl +++ b/dom/webidl/BluetoothDeviceEvent.webidl @@ -4,7 +4,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ -[Constructor(DOMString type, optional BluetoothDeviceEventInit eventInitDict), HeaderFile="GeneratedEventClasses.h"] +[Constructor(DOMString type, optional BluetoothDeviceEventInit eventInitDict)] interface BluetoothDeviceEvent : Event { readonly attribute BluetoothDevice? device; diff --git a/dom/webidl/BluetoothStatusChangedEvent.webidl b/dom/webidl/BluetoothStatusChangedEvent.webidl index 1d034355e984..2969f12e7656 100644 --- a/dom/webidl/BluetoothStatusChangedEvent.webidl +++ b/dom/webidl/BluetoothStatusChangedEvent.webidl @@ -4,7 +4,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ -[Constructor(DOMString type, optional BluetoothStatusChangedEventInit eventInitDict), HeaderFile="GeneratedEventClasses.h"] +[Constructor(DOMString type, optional BluetoothStatusChangedEventInit eventInitDict)] interface BluetoothStatusChangedEvent : Event { readonly attribute DOMString address; diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build index 7b81415f669e..30cd8040dfef 100644 --- a/dom/webidl/moz.build +++ b/dom/webidl/moz.build @@ -511,9 +511,7 @@ if CONFIG['MOZ_B2G_BT']: WEBIDL_FILES += [ 'BluetoothAdapter.webidl', 'BluetoothDevice.webidl', - 'BluetoothDeviceEvent.webidl', 'BluetoothManager.webidl', - 'BluetoothStatusChangedEvent.webidl', ] if CONFIG['MOZ_B2G_RIL']: @@ -583,3 +581,10 @@ if CONFIG['MOZ_GAMEPAD']: 'GamepadButtonEvent.webidl', 'GamepadEvent.webidl', ] + +if CONFIG['MOZ_B2G_BT']: + GENERATED_EVENTS_WEBIDL_FILES += [ + 'BluetoothDeviceEvent.webidl', + 'BluetoothStatusChangedEvent.webidl', + ] + diff --git a/js/xpconnect/src/event_impl_gen.conf.in b/js/xpconnect/src/event_impl_gen.conf.in index cafb46e14458..0a29b7f51907 100644 --- a/js/xpconnect/src/event_impl_gen.conf.in +++ b/js/xpconnect/src/event_impl_gen.conf.in @@ -27,10 +27,6 @@ simple_events = [ 'MozWifiStatusChangeEvent', 'MozWifiConnectionInfoEvent', #endif -#ifdef MOZ_B2G_BT - 'BluetoothDeviceEvent', - 'BluetoothStatusChangedEvent', -#endif #ifdef MOZ_B2G_RIL 'MozCellBroadcastEvent', 'MozVoicemailEvent', @@ -65,7 +61,6 @@ exclude_automatic_type_include = [ """ Map xpidl interface names to implementation classes. The third column is the canonical interface. """ xpidl_to_native = [ - ['nsIDOMBluetoothDevice', 'bluetooth::BluetoothDevice', 'nsIDOMBluetoothDevice'], ['nsIDOMDocument', 'nsIDocument', 'nsIDocument'], ['nsIDOMElement', 'mozilla::dom::Element', 'mozilla::dom::Element'], ['nsIDOMCSSStyleSheet', 'nsCSSStyleSheet', 'nsIStyleSheet'], From 7d64d5b41ee18d8371ed73821ff7050948b499b1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Jan 2014 22:45:13 -0800 Subject: [PATCH 17/20] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/32783cf2ad68 Author: EragonJ Desc: Merge pull request #15439 from EragonJ/bug-948307-another-try Bug 948307 - [DSDS] SIM manager is loaded about half second later ======== https://hg.mozilla.org/integration/gaia-central/rev/22d16be4d743 Author: EragonJ Desc: Bug 948307 - [DSDS] SIM manager is loaded about half second later --- 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 a5e706752325..ab8447e1827e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "3c886308136ea2c519b29d206e5d7afde7cde6fb", + "revision": "32783cf2ad682fd89b8fb966826871924634d7f9", "repo_path": "/integration/gaia-central" } From 212f8a2462513065688e34323eed3e6f5025c16b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Jan 2014 22:51:06 -0800 Subject: [PATCH 18/20] 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 225d3842d1e6..d1a5e4458ae3 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 3d2cc1a32408..ed5079e8e1a2 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 225d3842d1e6..d1a5e4458ae3 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 b678adaca08c..0e03a32ade56 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 564e67ee1d16..86113b03a7c4 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 9e498bd29e92..9171d6bf114e 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 d1eaa329c2b6..ed5944540110 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 062e6a6d9c0f..bda07d0ee7bd 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 acf767f99eda..bcd3f7fc7ddd 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - + From 7512654339a10390302b9b202d5d0e0530575d0e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Jan 2014 23:25:11 -0800 Subject: [PATCH 19/20] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/0f4f24675eee Author: James Burke Desc: Merge pull request #15572 from jrburke/bug962149-email-nopersist-edit Bug 962149 - [E-Mail][UI] HTML cache saves/serializes edit mode state r=asuth ======== https://hg.mozilla.org/integration/gaia-central/rev/4229ba072ff2 Author: jrburke Desc: Bug 962149 - [E-Mail][UI] HTML cache saves/serializes edit mode state --- 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 ab8447e1827e..ce2bec04bc9a 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "32783cf2ad682fd89b8fb966826871924634d7f9", + "revision": "0f4f24675eee8a4211d2535a1cfa280365d581dc", "repo_path": "/integration/gaia-central" } From 59a5c83d0a85bc57dc022145059cce4091fe8a29 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 21 Jan 2014 23:31:02 -0800 Subject: [PATCH 20/20] 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 d1a5e4458ae3..0d36f99635b0 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 ed5079e8e1a2..2a87090790cc 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 d1a5e4458ae3..0d36f99635b0 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 0e03a32ade56..d8f98be80558 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 86113b03a7c4..1bea62ac8f5b 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 9171d6bf114e..2ca8d9c075a7 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 ed5944540110..a4817d1b068d 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 bda07d0ee7bd..32c23425e240 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 bcd3f7fc7ddd..f45d370aeae3 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -11,7 +11,7 @@ - +