From 3dfc60abb8c6e1dec3e1473a3bbede14fad87847 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 11:35:41 -0700 Subject: [PATCH 01/24] Bumping gaia.json for 5 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/a226e635b72d Author: Kevin Grandon Desc: Merge pull request #17232 from KevinGrandon/bug_984111_shared_unit_test_jshint Bug 984111 - JSHint fixes for shared unit test mocks r=julienw ======== https://hg.mozilla.org/integration/gaia-central/rev/d1c04518b57d Author: Kevin Grandon Desc: Bug 984111 - JSHint fixes for shared unit test mocks ======== https://hg.mozilla.org/integration/gaia-central/rev/6af41f7665be Author: Carmen Jiménez Desc: Merge pull request #17164 from mcjimenez/bug978785 Bug 978785 - SV: Enable customization during first time to insert a SIM card ======== https://hg.mozilla.org/integration/gaia-central/rev/faea6340232a Author: Carmen Jimenez Cabezas Desc: Bug 978785 - SV: Enable customization during first time to insert a SIM card ======== https://hg.mozilla.org/integration/gaia-central/rev/b2d7aa3df02c Author: Kevin Grandon Desc: Bug 987271 - Disable intermittent failing test --- 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 fea6462282c..3af32f3497e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "e7950c4d17aa917001d257fc9b0288c0c0ea3c21", + "revision": "a226e635b72d7831c2d8d2589421fccf3979d424", "repo_path": "/integration/gaia-central" } From 2df4b51cbebf620a89c0367cbaf99858877ad280 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 11:37:31 -0700 Subject: [PATCH 02/24] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 09b69b9ce22..8838db1a897 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index af894e0053b..7a41cb05e60 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 2f8f08c274a..2b5ea6dcffb 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 09b69b9ce22..8838db1a897 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 80b59b36486..c61e6ff601d 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 41149e84537..8e590825269 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 8c4ebe58c9b..840c55e9cf4 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 525e8ac93d3..bf10c19dcd6 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 2a1f3665809..f20b51794b3 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 217705747bb..30d5858bd2a 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From c2baf332fbc030ed6c5d6ef46772b9a13b1dd9af Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 12:10:57 -0700 Subject: [PATCH 03/24] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/16a091f39a57 Author: Kevin Grandon Desc: Merge pull request #17072 from KevinGrandon/bug_971497_system2_home_gesture_2 Bug 971497 - [System2] Instantiable HomeGesture r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/804b8273754a Author: Kevin Grandon Desc: Bug 971497 - [System2] Instantiable HomeGesture 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 3af32f3497e..372a660abf5 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "a226e635b72d7831c2d8d2589421fccf3979d424", + "revision": "16a091f39a57cabdfccc6382a1f72255b159a4ac", "repo_path": "/integration/gaia-central" } From 247d0cd41a89839f9f15bc3844210f06500713bb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 12:16:15 -0700 Subject: [PATCH 04/24] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 8838db1a897..1f1544eb272 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 7a41cb05e60..3192d520193 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 2b5ea6dcffb..705ad80c1e8 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 8838db1a897..1f1544eb272 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index c61e6ff601d..8f35215a5fb 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 8e590825269..bb27548edde 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 840c55e9cf4..701e8fb0e1d 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index bf10c19dcd6..9b06e1d6463 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index f20b51794b3..41484e41547 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 30d5858bd2a..0e65b369fe0 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 8dbf21027a44fe7c2dbef5ccbd71795a3d6df490 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 13:30:36 -0700 Subject: [PATCH 05/24] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e86094bf04fc Author: Ryan VanderMeulen Desc: Revert "Merge pull request #17164 from mcjimenez/bug978785" This reverts commit 73c3a1305da4a949c1634a009c400bc2431848d2, reversing changes made to 9f4de77d34987e5e10fdc1abe374937b953af70d. --- 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 372a660abf5..68e66e0151c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "16a091f39a57cabdfccc6382a1f72255b159a4ac", + "revision": "e86094bf04fc192a7aa1bad773b6b82e8e355c05", "repo_path": "/integration/gaia-central" } From 52cf9131f94d29b89f13e811e378cd2a9ed0a4a1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 13:36:10 -0700 Subject: [PATCH 06/24] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 1f1544eb272..e4863aacd66 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 3192d520193..a618f8ba5a0 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 705ad80c1e8..b2dd0149e79 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 1f1544eb272..e4863aacd66 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 8f35215a5fb..dbdbec5f981 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index bb27548edde..9bbb018f38a 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 701e8fb0e1d..3dbce28aa41 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 9b06e1d6463..d11c3dfc647 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 41484e41547..caa6db52b87 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 0e65b369fe0..d79cd1ed29a 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 46119a0b26bb4e126d8df51e477cc78f0c012c47 Mon Sep 17 00:00:00 2001 From: Mike Habicher Date: Mon, 24 Mar 2014 17:32:31 -0400 Subject: [PATCH 07/24] Bug 985125 - remove unnecessary indirection from DOM error handler, r=dhylands --- dom/camera/DOMCameraControl.cpp | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dom/camera/DOMCameraControl.cpp b/dom/camera/DOMCameraControl.cpp index 1685db5b51c..059723025a8 100644 --- a/dom/camera/DOMCameraControl.cpp +++ b/dom/camera/DOMCameraControl.cpp @@ -1164,36 +1164,37 @@ nsDOMCameraControl::OnError(CameraControlListener::CameraErrorContext aContext, NS_LossyConvertUTF16toASCII(aError).get()); MOZ_ASSERT(NS_IsMainThread()); - nsRefPtr* errorCb; + nsRefPtr errorCb; + switch (aContext) { case CameraControlListener::kInStartCamera: mGetCameraOnSuccessCb = nullptr; - errorCb = &mGetCameraOnErrorCb; + errorCb = mGetCameraOnErrorCb.forget(); break; case CameraControlListener::kInStopCamera: mReleaseOnSuccessCb = nullptr; - errorCb = &mReleaseOnErrorCb; + errorCb = mReleaseOnErrorCb.forget(); break; case CameraControlListener::kInSetConfiguration: mSetConfigurationOnSuccessCb = nullptr; - errorCb = &mSetConfigurationOnErrorCb; + errorCb = mSetConfigurationOnErrorCb.forget(); break; case CameraControlListener::kInAutoFocus: mAutoFocusOnSuccessCb = nullptr; - errorCb = &mAutoFocusOnErrorCb; + errorCb = mAutoFocusOnErrorCb.forget(); break; case CameraControlListener::kInTakePicture: mTakePictureOnSuccessCb = nullptr; - errorCb = &mTakePictureOnErrorCb; + errorCb = mTakePictureOnErrorCb.forget(); break; case CameraControlListener::kInStartRecording: mStartRecordingOnSuccessCb = nullptr; - errorCb = &mStartRecordingOnErrorCb; + errorCb = mStartRecordingOnErrorCb.forget(); break; case CameraControlListener::kInStopRecording: @@ -1231,17 +1232,13 @@ nsDOMCameraControl::OnError(CameraControlListener::CameraErrorContext aContext, return; } - MOZ_ASSERT(errorCb); - - if (!*errorCb) { + if (!errorCb) { DOM_CAMERA_LOGW("DOM No error handler for error '%s' in context=%d\n", NS_LossyConvertUTF16toASCII(aError).get(), aContext); return; } - // kung-fu death grip - nsRefPtr cb = (*errorCb).forget(); ErrorResult ignored; - cb->Call(aError, ignored); + errorCb->Call(aError, ignored); } From 40d937ba3f2970712feb5c147eb9e8d2b1af7dfc Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 15:15:37 -0700 Subject: [PATCH 08/24] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/0848cbe74b41 Author: Ryan VanderMeulen Desc: Revert "Merge pull request #17072 from KevinGrandon/bug_971497_system2_home_gesture_2" This reverts commit 632f28b224582b77dac0c70aa78ed171347b62af, reversing changes made to 09c69607071109a9fa9a5831acde7f66df0ba8d0. --- 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 68e66e0151c..08703a61ea9 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "e86094bf04fc192a7aa1bad773b6b82e8e355c05", + "revision": "0848cbe74b417cf87686ae0a94a941fc48bbd0c7", "repo_path": "/integration/gaia-central" } From a7a8814b3df06087e64f1e0d03ed5c65f207b3db Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 15:21:18 -0700 Subject: [PATCH 09/24] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index e4863aacd66..686bff32cbf 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index a618f8ba5a0..26136890a04 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index b2dd0149e79..c14ba5cd74e 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index e4863aacd66..686bff32cbf 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index dbdbec5f981..04dc13f7fed 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 9bbb018f38a..a968217fb68 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 3dbce28aa41..509a8a3475a 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index d11c3dfc647..8214b662639 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index caa6db52b87..2491ad266f5 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index d79cd1ed29a..b9785ab8393 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From f2b10d7eb771c075a65083a43dbd22a3511fc625 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 15:40:56 -0700 Subject: [PATCH 10/24] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1bb9d5ab6f4f Author: DouglasSherk Desc: Revert "Bug 980982 - [DSDS] Cache ril.xxx.defaultServiceId in MSAB to avoid IO thrashing. r=rik" This reverts commit 2709783b5a4d2f338c583ee66081d00033e4fd50. ======== https://hg.mozilla.org/integration/gaia-central/rev/31ebb69556da Author: DouglasSherk Desc: Revert "Bug 985888 - [DSDS] Display currently in-use SIM cards on call buttons. r=rik" This reverts commit 6ac53288eeaeb34013f39a98762948a481481cf1. --- 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 08703a61ea9..8e178464bd6 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "0848cbe74b417cf87686ae0a94a941fc48bbd0c7", + "revision": "1bb9d5ab6f4fcf2ba49500e46effc0d7118bdb12", "repo_path": "/integration/gaia-central" } From 860635dc687a6894421be5940ff86d2d5d67e110 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 15:46:14 -0700 Subject: [PATCH 11/24] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 686bff32cbf..39bbaed0b12 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 26136890a04..28cb4f2e54a 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index c14ba5cd74e..1bbcf8918ad 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 686bff32cbf..39bbaed0b12 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 04dc13f7fed..106c655adf6 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index a968217fb68..7ea04a81ddf 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 509a8a3475a..a46baa3399f 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 8214b662639..d5d1d734ce7 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 2491ad266f5..0e3dc53f400 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index b9785ab8393..41ff2ab388f 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 2f5db7cc0c1808f6d3602e263213e3cd6e831242 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 16:46:07 -0700 Subject: [PATCH 12/24] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/91e27e3c94f7 Author: Eitan Isaacson Desc: Merge pull request #17548 from eeejay/bug-987384 Bug 987384 - [Clock] Add accessibility to analog clock. r=mcav ======== https://hg.mozilla.org/integration/gaia-central/rev/796c546613d5 Author: Eitan Isaacson Desc: Bug 987384 - [Clock] Add accessibility to analog clock. ======== https://hg.mozilla.org/integration/gaia-central/rev/a23d36ab5993 Author: Eitan Isaacson Desc: Merge pull request #17546 from eeejay/bug-987382 Bug 987382 - [Clock] label icon buttons. r=mcav ======== https://hg.mozilla.org/integration/gaia-central/rev/efeb80515c0c Author: Eitan Isaacson Desc: Bug 987382 - [Clock] label icon buttons. --- 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 8e178464bd6..7fafff37a54 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "1bb9d5ab6f4fcf2ba49500e46effc0d7118bdb12", + "revision": "91e27e3c94f7bf6946820a67c1ca3979e48a3622", "repo_path": "/integration/gaia-central" } From daff58952c4045313b7577047ed171fb2e157263 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 16:51:16 -0700 Subject: [PATCH 13/24] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 39bbaed0b12..c41f91da18b 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 28cb4f2e54a..54bda29ac55 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 1bbcf8918ad..73cac5d8754 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 39bbaed0b12..c41f91da18b 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 106c655adf6..4322e3ab4bb 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 7ea04a81ddf..5ef0b728fe1 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index a46baa3399f..eb31cfc9a35 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index d5d1d734ce7..30be2cc8543 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 0e3dc53f400..e88f230cfbd 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 41ff2ab388f..5f6c1766cfe 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 9b017b2040bb1fc16414bb839cebc7f609a40e97 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 17:36:08 -0700 Subject: [PATCH 14/24] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/671132cc327c Author: Kevin Grandon Desc: Merge pull request #17547 from KevinGrandon/bug_971497_system2_home_gesture_2 Bug 971497 - [System2] Instantiable HomeGesture r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/aac6a3be42a1 Author: Kevin Grandon Desc: Bug 971497 - [System2] Instantiable HomeGesture 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 7fafff37a54..7fcee688612 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "91e27e3c94f7bf6946820a67c1ca3979e48a3622", + "revision": "671132cc327cf1cb798b5711c75fde4a957a25bf", "repo_path": "/integration/gaia-central" } From 0b1ead2299db22fc00eb498363005b9d16fa7ec0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 17:46:14 -0700 Subject: [PATCH 15/24] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c41f91da18b..dfe67ffedbb 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 54bda29ac55..140810a39a4 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 73cac5d8754..04966b8a132 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index c41f91da18b..dfe67ffedbb 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 4322e3ab4bb..377d6c54e12 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 5ef0b728fe1..35430a1743e 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index eb31cfc9a35..ad0436ef6b0 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 30be2cc8543..83358a42372 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index e88f230cfbd..eed6b649b97 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 5f6c1766cfe..fc23eb6dbe3 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 6bc508fdc57e2349668aff6d466938319e7e5ac5 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Mon, 24 Mar 2014 21:59:33 -0400 Subject: [PATCH 16/24] Bug 986993 - Remove the classinfo on the inputmethod API classes because they are already ported to WebIDL; r=bzbarsky This patch also removes the mention to some non-existent interfaces. --- dom/inputmethod/MozKeyboard.js | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/dom/inputmethod/MozKeyboard.js b/dom/inputmethod/MozKeyboard.js index 7fac88f6c1c..568f92513a4 100644 --- a/dom/inputmethod/MozKeyboard.js +++ b/dom/inputmethod/MozKeyboard.js @@ -245,17 +245,7 @@ MozInputMethodManager.prototype = { classID: Components.ID("{7e9d7280-ef86-11e2-b778-0800200c9a66}"), - QueryInterface: XPCOMUtils.generateQI([ - Ci.nsIInputMethodManager - ]), - - classInfo: XPCOMUtils.generateCI({ - "classID": Components.ID("{7e9d7280-ef86-11e2-b778-0800200c9a66}"), - "contractID": "@mozilla.org/b2g-imm;1", - "interfaces": [Ci.nsIInputMethodManager], - "flags": Ci.nsIClassInfo.DOM_OBJECT, - "classDescription": "B2G Input Method Manager" - }), + QueryInterface: XPCOMUtils.generateQI([]), showAll: function() { if (!WindowMap.isActive(this._window)) { @@ -301,19 +291,10 @@ MozInputMethod.prototype = { classID: Components.ID("{4607330d-e7d2-40a4-9eb8-43967eae0142}"), QueryInterface: XPCOMUtils.generateQI([ - Ci.nsIInputMethod, Ci.nsIDOMGlobalPropertyInitializer, Ci.nsIObserver ]), - classInfo: XPCOMUtils.generateCI({ - "classID": Components.ID("{4607330d-e7d2-40a4-9eb8-43967eae0142}"), - "contractID": "@mozilla.org/b2g-inputmethod;1", - "interfaces": [Ci.nsIInputMethod], - "flags": Ci.nsIClassInfo.DOM_OBJECT, - "classDescription": "B2G Input Method" - }), - init: function mozInputMethodInit(win) { this._window = win; this._mgmt = new MozInputMethodManager(win); @@ -473,19 +454,10 @@ MozInputContext.prototype = { classID: Components.ID("{1e38633d-d08b-4867-9944-afa5c648adb6}"), QueryInterface: XPCOMUtils.generateQI([ - Ci.nsIB2GInputContext, Ci.nsIObserver, Ci.nsISupportsWeakReference ]), - classInfo: XPCOMUtils.generateCI({ - "classID": Components.ID("{1e38633d-d08b-4867-9944-afa5c648adb6}"), - "contractID": "@mozilla.org/b2g-inputcontext;1", - "interfaces": [Ci.nsIB2GInputContext], - "flags": Ci.nsIClassInfo.DOM_OBJECT, - "classDescription": "B2G Input Context" - }), - init: function ic_init(win) { this._window = win; this._utils = win.QueryInterface(Ci.nsIInterfaceRequestor) From de9bf7290b9f984bf81dcb740454a94c57bba5b0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 20:01:11 -0700 Subject: [PATCH 17/24] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e441d03d2aec Author: steveck-chung Desc: Merge pull request #17424 from ankit93040/BUG_959018_Enhanced_Suggestion_LisT Bug 959018 Message_Enhanced_Suggestion_List. r=schung ======== https://hg.mozilla.org/integration/gaia-central/rev/fea179eca2c9 Author: ankit.agrawal Desc: SMS_959018_Enhanced_Suggestion_List SMS_959018_Enhanced_Suggestion_LIst --- 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 7fcee688612..dafc25fc0e3 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "671132cc327cf1cb798b5711c75fde4a957a25bf", + "revision": "e441d03d2aec5624715ee79ad2fcd25c3445dc80", "repo_path": "/integration/gaia-central" } From cdf75258845ea36b255abd56d0fdf2dddd83662a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 20:06:18 -0700 Subject: [PATCH 18/24] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index dfe67ffedbb..29072e2185a 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 140810a39a4..db8e514d52b 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 04966b8a132..c3b576888ff 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index dfe67ffedbb..29072e2185a 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 377d6c54e12..36012d51e6f 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 35430a1743e..4c8273c91ae 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index ad0436ef6b0..07411ba315a 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 83358a42372..e86dcd6b004 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index eed6b649b97..25b037f7d7d 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index fc23eb6dbe3..ac7010a0ae5 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 52bba31a38ee6cb8fc36a28484c7d6e182392086 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 20:57:19 -0700 Subject: [PATCH 19/24] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/57ac935d11ae Author: Arthur Chen Desc: Merge pull request #16477 from crh0716/974253 Bug 974253 - Set preferred network type on startup based on the user preference r=jaoo ======== https://hg.mozilla.org/integration/gaia-central/rev/9929c37e9bc5 Author: Arthur Chen Desc: Bug 974253 - Set preferred network type on startup based on the user preference --- 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 dafc25fc0e3..88d56a59f06 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "e441d03d2aec5624715ee79ad2fcd25c3445dc80", + "revision": "57ac935d11ae239b4a4123f2773bd9859ff5ae63", "repo_path": "/integration/gaia-central" } From 5c1e0fb332bb65a785d024dccd217dc16aeff87f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 20:58:23 -0700 Subject: [PATCH 20/24] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 29072e2185a..2603bbf4249 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index db8e514d52b..23df78d642c 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index c3b576888ff..e75204cb89c 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 29072e2185a..2603bbf4249 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 36012d51e6f..6f0e8f207b0 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 4c8273c91ae..52582ceb058 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 07411ba315a..b83afbb4b43 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index e86dcd6b004..e197aa053e6 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 25b037f7d7d..30326391a99 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index ac7010a0ae5..1c68c07afaa 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 7f6c1556707476d1b41003fa4518f45996f5c8e0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 21:45:57 -0700 Subject: [PATCH 21/24] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/20661b944c2e Author: Alive.Kuo Desc: Merge pull request #17514 from alivedise/bugzilla/961800_master_merging/child-window-factory Bug 961800 - Implement Child Window Factory. r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/be865a491ba3 Author: Alive Kuo Desc: Bug 961800 - Implement Child Window Factory. Conflicts: apps/system/js/app_transition_controller.js apps/system/js/app_window.js apps/system/js/app_window_manager.js apps/system/js/cards_view.js apps/system/style/window.css --- 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 88d56a59f06..8356b0e8adc 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "57ac935d11ae239b4a4123f2773bd9859ff5ae63", + "revision": "20661b944c2eb68dea1cc37400ae158b286ab5c2", "repo_path": "/integration/gaia-central" } From d80ec8154a4d5f7c297fcd6263dc19980829050e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 21:51:08 -0700 Subject: [PATCH 22/24] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 2603bbf4249..d43ac5d5682 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 23df78d642c..14003df9f98 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index e75204cb89c..ebc83b0524d 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 2603bbf4249..d43ac5d5682 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 6f0e8f207b0..593e5f9f5f0 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 52582ceb058..f1d83781071 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index b83afbb4b43..4cd4076e339 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index e197aa053e6..250dc4417f4 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 30326391a99..1b7b9b75c1c 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 1c68c07afaa..8d29e062a8f 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 7fec3e56fef20f734f07c6b62d7dcbd3ec4242b5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 25 Mar 2014 00:05:52 -0700 Subject: [PATCH 23/24] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/215bb3fd100d Author: Arthur Chen Desc: Revert "Bug 974253 - Set preferred network type on startup based on the user preference" This reverts commit c6931e59efef682aa42ad09cab3d843669d5f8f7. --- 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 8356b0e8adc..f2664c617c5 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "20661b944c2eb68dea1cc37400ae158b286ab5c2", + "revision": "215bb3fd100d59db61cb9a710d814380e5f054b1", "repo_path": "/integration/gaia-central" } From b73ff6e3c2dcc06f30302ce7e32e0f677e2297e8 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 25 Mar 2014 00:11:03 -0700 Subject: [PATCH 24/24] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index d43ac5d5682..3d6d3d381ba 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 14003df9f98..f51f9c88862 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index ebc83b0524d..fda8f5671ce 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index d43ac5d5682..3d6d3d381ba 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 593e5f9f5f0..98e1c65dce6 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index f1d83781071..8ae2eac5581 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 4cd4076e339..620669c8d32 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 250dc4417f4..455d495c754 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 1b7b9b75c1c..a03fcb29b43 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 8d29e062a8f..3429bd36033 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - +