From 1a25c8123a1898c05d8964c442a8bc6622dc1571 Mon Sep 17 00:00:00 2001 From: Ben Turner Date: Wed, 7 May 2014 12:03:48 -0700 Subject: [PATCH 01/22] Bug 918595 - Close all cached file descriptors on TabChild shutdown, r=jduell. --- dom/ipc/TabChild.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index 6de57090dfdd..84429f56eafb 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -1331,6 +1331,22 @@ TabChild::DestroyWindow() } mLayersId = 0; } + + for (uint32_t index = 0, count = mCachedFileDescriptorInfos.Length(); + index < count; + index++) { + nsAutoPtr& info = + mCachedFileDescriptorInfos[index]; + + MOZ_ASSERT(!info->mCallback); + MOZ_ASSERT(!info->mCanceled); + + if (info->mFileDescriptor.IsValid()) { + nsRefPtr runnable = + new CloseFileRunnable(info->mFileDescriptor); + runnable->Dispatch(); + } + } } bool From 99a30c775346d549f92d5a427df3815453ee4aa1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 7 May 2014 12:07:59 -0700 Subject: [PATCH 02/22] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/7e375ae2d3b9 Author: Douglas Sherk Desc: Merge pull request #19037 from DouglasSherk/1007212-sms-only Bug 1007212 - [Messages] Remove .only tag left in thread_list_ui_test.js r=julienw ======== https://hg.mozilla.org/integration/gaia-central/rev/df098996d3b6 Author: DouglasSherk Desc: Bug 1007212 - [Messages] Remove .only tag left in thread_list_ui_test.js. r=julienw --- 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 c9de899ef0e7..6e32867e408e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "e2fad48ac3a632fbd405ff958c9dbf0d821f7b47", + "revision": "7e375ae2d3b99f20e27c9383f9f68a93054c4738", "repo_path": "/integration/gaia-central" } From 92b980bb6a3d664d94383a7fb464e31b6bfa8433 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 7 May 2014 12:08:11 -0700 Subject: [PATCH 03/22] 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/flame/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 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 97132957b002..f5d5929414aa 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 6f9f20bb2f2d..adfae3faab83 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 21bc8aa5726d..e3edfb1d8dd5 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 97132957b002..f5d5929414aa 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 461c8c652dfa..0e3dfd252142 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index def033e5d40a..fc51efd813f0 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 c34b244382e5..a923c88aec59 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 eee4a0fd6165..f2604bdbf614 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 ad52550809d2..3d1a560bcea8 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 013ea298fd53..08ea664b70e6 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 4b5f4f08a1dd..ee9b54589c19 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 470f40e24aa8ba5e418fd85c7b8428fc922c3889 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 7 May 2014 13:10:57 -0700 Subject: [PATCH 04/22] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/179a63a8b422 Author: Eitan Isaacson Desc: Merge pull request #18960 from eeejay/bug-995025 Bug 995025 - Make keyboard word suggestions accessible. r=rlu ======== https://hg.mozilla.org/integration/gaia-central/rev/113824d126ef Author: Eitan Isaacson Desc: Bug 995025 - Make keyboard word suggestions accessible. --- 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 6e32867e408e..18aed2c074ec 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "7e375ae2d3b99f20e27c9383f9f68a93054c4738", + "revision": "179a63a8b42240dbd1b59330b03f6927b89d427a", "repo_path": "/integration/gaia-central" } From ea1bc126cdf203108886e15f90af634543c6be71 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 7 May 2014 13:16:28 -0700 Subject: [PATCH 05/22] 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/flame/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 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index f5d5929414aa..e9121bd23931 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 adfae3faab83..83af68fdabac 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 e3edfb1d8dd5..b39fa6a848a9 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 f5d5929414aa..e9121bd23931 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 0e3dfd252142..27c054d597e8 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index fc51efd813f0..ba527fa25936 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 a923c88aec59..d5f97aa10cb3 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 f2604bdbf614..b6c7425912bc 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 3d1a560bcea8..c6600a867032 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 08ea664b70e6..9921ac0aa23b 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 ee9b54589c19..51c0202e9f97 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 3a66fd34011e9597b5a535ebc4fb06084d6ababc Mon Sep 17 00:00:00 2001 From: Jim Chen Date: Wed, 7 May 2014 17:14:45 -0400 Subject: [PATCH 06/22] Bug 864395 - Associate the send perf data setting with telemetry; r=fabrice --- b2g/chrome/content/settings.js | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/b2g/chrome/content/settings.js b/b2g/chrome/content/settings.js index 57bdb9f1c035..ee4d091035da 100644 --- a/b2g/chrome/content/settings.js +++ b/b2g/chrome/content/settings.js @@ -600,6 +600,33 @@ SettingsListener.observe("accessibility.screenreader", false, function(value) { }); })(); +// =================== Telemetry ====================== +(function setupTelemetrySettings() { + let gaiaSettingName = 'debug.performance_data.shared'; + let geckoPrefName = 'toolkit.telemetry.enabled'; + SettingsListener.observe(gaiaSettingName, null, function(value) { + if (value !== null) { + // Gaia setting has been set; update Gecko pref to that. + Services.prefs.setBoolPref(geckoPrefName, value); + return; + } + // Gaia setting has not been set; set the gaia setting to default. +#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT + let prefValue = true; +#else + let prefValue = false; +#endif + try { + prefValue = Services.prefs.getBoolPref(geckoPrefName); + } catch (e) { + // Pref not set; use default value. + } + let setting = {}; + setting[gaiaSettingName] = prefValue; + window.navigator.mozSettings.createLock().set(setting); + }); +})(); + // =================== Various simple mapping ====================== let settingsToObserve = { 'ril.mms.retrieval_mode': { From 562cef779fd246564b99551298ccd605284eb822 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 7 May 2014 14:37:55 -0700 Subject: [PATCH 07/22] Bumping manifests a=b2g-bump --- b2g/config/emulator-jb/sources.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 83af68fdabac..9b6de9f51131 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -128,7 +128,7 @@ - + From 70cba4eb7e508a02262afb42b2b34c580a5f9ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= Date: Wed, 7 May 2014 15:53:16 -0700 Subject: [PATCH 08/22] Bug 993282 - Lazy load more js modules - part 1: NFC r=psiddh --- dom/apps/src/AppsUtils.jsm | 1 - dom/system/gonk/Nfc.js | 7 +++++-- dom/system/gonk/NfcContentHelper.js | 7 +++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dom/apps/src/AppsUtils.jsm b/dom/apps/src/AppsUtils.jsm index 0d80f0820303..2795c110ba94 100644 --- a/dom/apps/src/AppsUtils.jsm +++ b/dom/apps/src/AppsUtils.jsm @@ -11,7 +11,6 @@ const Cr = Components.results; Cu.import("resource://gre/modules/osfile.jsm"); Cu.import("resource://gre/modules/Services.jsm"); -Cu.import("resource://gre/modules/Task.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Promise.jsm"); diff --git a/dom/system/gonk/Nfc.js b/dom/system/gonk/Nfc.js index a1af5e48d9c8..aa607d23aefc 100644 --- a/dom/system/gonk/Nfc.js +++ b/dom/system/gonk/Nfc.js @@ -22,8 +22,11 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); -let NFC = {}; -Cu.import("resource://gre/modules/nfc_consts.js", NFC); +XPCOMUtils.defineLazyGetter(this, "NFC", function () { + let obj = {}; + Cu.import("resource://gre/modules/nfc_consts.js", obj); + return obj; +}); Cu.import("resource://gre/modules/systemlibs.js"); const NFC_ENABLED = libcutils.property_get("ro.moz.nfc.enabled", "false") === "true"; diff --git a/dom/system/gonk/NfcContentHelper.js b/dom/system/gonk/NfcContentHelper.js index ac4724d91c31..2d4903b2c647 100644 --- a/dom/system/gonk/NfcContentHelper.js +++ b/dom/system/gonk/NfcContentHelper.js @@ -23,8 +23,11 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/DOMRequestHelper.jsm"); -let NFC = {}; -Cu.import("resource://gre/modules/nfc_consts.js", NFC); +XPCOMUtils.defineLazyGetter(this, "NFC", function () { + let obj = {}; + Cu.import("resource://gre/modules/nfc_consts.js", obj); + return obj; +}); Cu.import("resource://gre/modules/systemlibs.js"); const NFC_ENABLED = libcutils.property_get("ro.moz.nfc.enabled", "false") === "true"; From 54347ca4c379a7886d3a101ae1571934d2d5d9c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= Date: Wed, 7 May 2014 15:53:16 -0700 Subject: [PATCH 09/22] Bug 993282 - Lazy load more js modules - Part 2: contacts r=gwagner --- dom/contacts/fallback/ContactDB.jsm | 4 +++- dom/contacts/fallback/ContactService.jsm | 7 +++++-- dom/phonenumberutils/PhoneNumber.jsm | 8 ++++++-- dom/phonenumberutils/PhoneNumberUtils.jsm | 9 ++++++--- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dom/contacts/fallback/ContactDB.jsm b/dom/contacts/fallback/ContactDB.jsm index 8cc9737a9ea7..0caad00b4967 100644 --- a/dom/contacts/fallback/ContactDB.jsm +++ b/dom/contacts/fallback/ContactDB.jsm @@ -15,9 +15,11 @@ const Cu = Components.utils; const Cc = Components.classes; const Ci = Components.interfaces; +Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/IndexedDBHelper.jsm"); -Cu.import("resource://gre/modules/PhoneNumberUtils.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "PhoneNumberUtils", + "resource://gre/modules/PhoneNumberUtils.jsm"); Cu.importGlobalProperties(["indexedDB"]); /* all exported symbols need to be bound to this on B2G - Bug 961777 */ diff --git a/dom/contacts/fallback/ContactService.jsm b/dom/contacts/fallback/ContactService.jsm index 68f0dad9afe9..8040e7d8ddeb 100644 --- a/dom/contacts/fallback/ContactService.jsm +++ b/dom/contacts/fallback/ContactService.jsm @@ -15,8 +15,11 @@ this.EXPORTED_SYMBOLS = ["ContactService"]; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); -Cu.import("resource://gre/modules/ContactDB.jsm"); -Cu.import("resource://gre/modules/PhoneNumberUtils.jsm"); + +XPCOMUtils.defineLazyModuleGetter(this, "ContactDB", + "resource://gre/modules/ContactDB.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "PhoneNumberUtils", + "resource://gre/modules/PhoneNumberUtils.jsm"); XPCOMUtils.defineLazyServiceGetter(this, "ppmm", "@mozilla.org/parentprocessmessagemanager;1", diff --git a/dom/phonenumberutils/PhoneNumber.jsm b/dom/phonenumberutils/PhoneNumber.jsm index 76f6957e537d..204f6112f4eb 100644 --- a/dom/phonenumberutils/PhoneNumber.jsm +++ b/dom/phonenumberutils/PhoneNumber.jsm @@ -8,9 +8,13 @@ this.EXPORTED_SYMBOLS = ["PhoneNumber"]; -Components.utils.import("resource://gre/modules/PhoneNumberMetaData.jsm"); -Components.utils.import("resource://gre/modules/PhoneNumberNormalizer.jsm"); +const Cu = Components.utils; +Cu.import('resource://gre/modules/XPCOMUtils.jsm'); +XPCOMUtils.defineLazyModuleGetter(this, "PHONE_NUMBER_META_DATA", + "resource://gre/modules/PhoneNumberMetaData.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "PhoneNumberNormalizer", + "resource://gre/modules/PhoneNumberNormalizer.jsm"); this.PhoneNumber = (function (dataBase) { // Use strict in our context only - users might not want it 'use strict'; diff --git a/dom/phonenumberutils/PhoneNumberUtils.jsm b/dom/phonenumberutils/PhoneNumberUtils.jsm index 7bccca3c0d16..2b40eaa11c6e 100644 --- a/dom/phonenumberutils/PhoneNumberUtils.jsm +++ b/dom/phonenumberutils/PhoneNumberUtils.jsm @@ -14,8 +14,10 @@ const Ci = Components.interfaces; Cu.import("resource://gre/modules/Services.jsm"); Cu.import('resource://gre/modules/XPCOMUtils.jsm'); -Cu.import("resource://gre/modules/PhoneNumberNormalizer.jsm"); -Cu.import("resource://gre/modules/mcc_iso3166_table.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "PhoneNumberNormalizer", + "resource://gre/modules/PhoneNumberNormalizer.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "MCC_ISO3166_TABLE", + "resource://gre/modules/mcc_iso3166_table.jsm"); #ifdef MOZ_B2G_RIL XPCOMUtils.defineLazyServiceGetter(this, "mobileConnection", @@ -196,7 +198,8 @@ this.PhoneNumberUtils = { let inParent = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime) .processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT; if (inParent) { - Cu.import("resource://gre/modules/PhoneNumber.jsm"); + XPCOMUtils.defineLazyModuleGetter(this, "PhoneNumber", + "resource://gre/modules/PhoneNumber.jsm"); XPCOMUtils.defineLazyServiceGetter(this, "ppmm", "@mozilla.org/parentprocessmessagemanager;1", "nsIMessageListenerManager"); From 77817a3d433a6f6dec22c89a320727198ce1551a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= Date: Wed, 7 May 2014 15:53:17 -0700 Subject: [PATCH 10/22] Bug 993282 - Lazy load more js modules - Part 3: RIL r=gene --- dom/mobilemessage/src/gonk/MobileMessageDB.jsm | 7 +++++-- dom/system/gonk/RILContentHelper.js | 7 +++++-- dom/system/gonk/RadioInterfaceLayer.js | 7 +++++-- dom/telephony/gonk/TelephonyProvider.js | 7 +++++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dom/mobilemessage/src/gonk/MobileMessageDB.jsm b/dom/mobilemessage/src/gonk/MobileMessageDB.jsm index 5536b4ba4d2d..e4d4fc1a09ca 100644 --- a/dom/mobilemessage/src/gonk/MobileMessageDB.jsm +++ b/dom/mobilemessage/src/gonk/MobileMessageDB.jsm @@ -11,8 +11,11 @@ Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/PhoneNumberUtils.jsm"); Cu.importGlobalProperties(["indexedDB"]); -var RIL = {}; -Cu.import("resource://gre/modules/ril_consts.js", RIL); +XPCOMUtils.defineLazyGetter(this, "RIL", function () { + let obj = {}; + Cu.import("resource://gre/modules/ril_consts.js", obj); + return obj; +}); const RIL_GETMESSAGESCURSOR_CID = Components.ID("{484d1ad8-840e-4782-9dc4-9ebc4d914937}"); diff --git a/dom/system/gonk/RILContentHelper.js b/dom/system/gonk/RILContentHelper.js index 242b389d9122..176bf6074248 100644 --- a/dom/system/gonk/RILContentHelper.js +++ b/dom/system/gonk/RILContentHelper.js @@ -21,8 +21,11 @@ Cu.import("resource://gre/modules/DOMRequestHelper.jsm"); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -var RIL = {}; -Cu.import("resource://gre/modules/ril_consts.js", RIL); +XPCOMUtils.defineLazyGetter(this, "RIL", function () { + let obj = {}; + Cu.import("resource://gre/modules/ril_consts.js", obj); + return obj; +}); const NS_XPCOM_SHUTDOWN_OBSERVER_ID = "xpcom-shutdown"; diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js index a1f0cad9f235..53b1f784f808 100644 --- a/dom/system/gonk/RadioInterfaceLayer.js +++ b/dom/system/gonk/RadioInterfaceLayer.js @@ -24,8 +24,11 @@ Cu.import("resource://gre/modules/systemlibs.js"); Cu.import("resource://gre/modules/Promise.jsm"); Cu.import("resource://gre/modules/FileUtils.jsm"); -var RIL = {}; -Cu.import("resource://gre/modules/ril_consts.js", RIL); +XPCOMUtils.defineLazyGetter(this, "RIL", function () { + let obj = {}; + Cu.import("resource://gre/modules/ril_consts.js", obj); + return obj; +}); // set to true in ril_consts.js to see debug messages var DEBUG = RIL.DEBUG_RIL; diff --git a/dom/telephony/gonk/TelephonyProvider.js b/dom/telephony/gonk/TelephonyProvider.js index 2b4830ddb816..c6c0305ee83a 100644 --- a/dom/telephony/gonk/TelephonyProvider.js +++ b/dom/telephony/gonk/TelephonyProvider.js @@ -11,8 +11,11 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Promise.jsm"); -var RIL = {}; -Cu.import("resource://gre/modules/ril_consts.js", RIL); +XPCOMUtils.defineLazyGetter(this, "RIL", function () { + let obj = {}; + Cu.import("resource://gre/modules/ril_consts.js", obj); + return obj; +}); const GONK_TELEPHONYPROVIDER_CONTRACTID = "@mozilla.org/telephony/gonktelephonyprovider;1"; From 1212ca52eafeee4fc8f219cbd43e9645632d9e56 Mon Sep 17 00:00:00 2001 From: Ben Turner Date: Wed, 7 May 2014 16:09:37 -0700 Subject: [PATCH 11/22] Bug 1007320 - Release canceled fd callbacks earlier, r=jduell. --- dom/ipc/TabChild.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index 84429f56eafb..f3a0ed4b1a93 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -1339,9 +1339,10 @@ TabChild::DestroyWindow() mCachedFileDescriptorInfos[index]; MOZ_ASSERT(!info->mCallback); - MOZ_ASSERT(!info->mCanceled); if (info->mFileDescriptor.IsValid()) { + MOZ_ASSERT(!info->mCanceled); + nsRefPtr runnable = new CloseFileRunnable(info->mFileDescriptor); runnable->Dispatch(); @@ -1579,6 +1580,9 @@ TabChild::CancelCachedFileDescriptorCallback( MOZ_ASSERT(info->mCallback == aCallback); MOZ_ASSERT(!info->mCanceled); + // No need to hold the callback any longer. + info->mCallback = nullptr; + // Set this flag so that we will close the file descriptor when it arrives. info->mCanceled = true; } From f3d33b739c1c0dcdc97d860e5a59f7d87a8dc499 Mon Sep 17 00:00:00 2001 From: Wes Kocher Date: Wed, 7 May 2014 18:47:17 -0700 Subject: [PATCH 12/22] Backed out 3 changesets (bug 993282) for b2g emulator mochitest 3 failures Backed out changeset 30e0991d49e0 (bug 993282) Backed out changeset 6b9c8d6ab401 (bug 993282) Backed out changeset 96e1a542bb45 (bug 993282) --- dom/apps/src/AppsUtils.jsm | 1 + dom/contacts/fallback/ContactDB.jsm | 4 +--- dom/contacts/fallback/ContactService.jsm | 7 ++----- dom/mobilemessage/src/gonk/MobileMessageDB.jsm | 7 ++----- dom/phonenumberutils/PhoneNumber.jsm | 8 ++------ dom/phonenumberutils/PhoneNumberUtils.jsm | 9 +++------ dom/system/gonk/Nfc.js | 7 ++----- dom/system/gonk/NfcContentHelper.js | 7 ++----- dom/system/gonk/RILContentHelper.js | 7 ++----- dom/system/gonk/RadioInterfaceLayer.js | 7 ++----- dom/telephony/gonk/TelephonyProvider.js | 7 ++----- 11 files changed, 21 insertions(+), 50 deletions(-) diff --git a/dom/apps/src/AppsUtils.jsm b/dom/apps/src/AppsUtils.jsm index 2795c110ba94..0d80f0820303 100644 --- a/dom/apps/src/AppsUtils.jsm +++ b/dom/apps/src/AppsUtils.jsm @@ -11,6 +11,7 @@ const Cr = Components.results; Cu.import("resource://gre/modules/osfile.jsm"); Cu.import("resource://gre/modules/Services.jsm"); +Cu.import("resource://gre/modules/Task.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Promise.jsm"); diff --git a/dom/contacts/fallback/ContactDB.jsm b/dom/contacts/fallback/ContactDB.jsm index 0caad00b4967..8cc9737a9ea7 100644 --- a/dom/contacts/fallback/ContactDB.jsm +++ b/dom/contacts/fallback/ContactDB.jsm @@ -15,11 +15,9 @@ const Cu = Components.utils; const Cc = Components.classes; const Ci = Components.interfaces; -Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/IndexedDBHelper.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "PhoneNumberUtils", - "resource://gre/modules/PhoneNumberUtils.jsm"); +Cu.import("resource://gre/modules/PhoneNumberUtils.jsm"); Cu.importGlobalProperties(["indexedDB"]); /* all exported symbols need to be bound to this on B2G - Bug 961777 */ diff --git a/dom/contacts/fallback/ContactService.jsm b/dom/contacts/fallback/ContactService.jsm index 8040e7d8ddeb..68f0dad9afe9 100644 --- a/dom/contacts/fallback/ContactService.jsm +++ b/dom/contacts/fallback/ContactService.jsm @@ -15,11 +15,8 @@ this.EXPORTED_SYMBOLS = ["ContactService"]; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); - -XPCOMUtils.defineLazyModuleGetter(this, "ContactDB", - "resource://gre/modules/ContactDB.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "PhoneNumberUtils", - "resource://gre/modules/PhoneNumberUtils.jsm"); +Cu.import("resource://gre/modules/ContactDB.jsm"); +Cu.import("resource://gre/modules/PhoneNumberUtils.jsm"); XPCOMUtils.defineLazyServiceGetter(this, "ppmm", "@mozilla.org/parentprocessmessagemanager;1", diff --git a/dom/mobilemessage/src/gonk/MobileMessageDB.jsm b/dom/mobilemessage/src/gonk/MobileMessageDB.jsm index e4d4fc1a09ca..5536b4ba4d2d 100644 --- a/dom/mobilemessage/src/gonk/MobileMessageDB.jsm +++ b/dom/mobilemessage/src/gonk/MobileMessageDB.jsm @@ -11,11 +11,8 @@ Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/PhoneNumberUtils.jsm"); Cu.importGlobalProperties(["indexedDB"]); -XPCOMUtils.defineLazyGetter(this, "RIL", function () { - let obj = {}; - Cu.import("resource://gre/modules/ril_consts.js", obj); - return obj; -}); +var RIL = {}; +Cu.import("resource://gre/modules/ril_consts.js", RIL); const RIL_GETMESSAGESCURSOR_CID = Components.ID("{484d1ad8-840e-4782-9dc4-9ebc4d914937}"); diff --git a/dom/phonenumberutils/PhoneNumber.jsm b/dom/phonenumberutils/PhoneNumber.jsm index 204f6112f4eb..76f6957e537d 100644 --- a/dom/phonenumberutils/PhoneNumber.jsm +++ b/dom/phonenumberutils/PhoneNumber.jsm @@ -8,13 +8,9 @@ this.EXPORTED_SYMBOLS = ["PhoneNumber"]; -const Cu = Components.utils; +Components.utils.import("resource://gre/modules/PhoneNumberMetaData.jsm"); +Components.utils.import("resource://gre/modules/PhoneNumberNormalizer.jsm"); -Cu.import('resource://gre/modules/XPCOMUtils.jsm'); -XPCOMUtils.defineLazyModuleGetter(this, "PHONE_NUMBER_META_DATA", - "resource://gre/modules/PhoneNumberMetaData.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "PhoneNumberNormalizer", - "resource://gre/modules/PhoneNumberNormalizer.jsm"); this.PhoneNumber = (function (dataBase) { // Use strict in our context only - users might not want it 'use strict'; diff --git a/dom/phonenumberutils/PhoneNumberUtils.jsm b/dom/phonenumberutils/PhoneNumberUtils.jsm index 2b40eaa11c6e..7bccca3c0d16 100644 --- a/dom/phonenumberutils/PhoneNumberUtils.jsm +++ b/dom/phonenumberutils/PhoneNumberUtils.jsm @@ -14,10 +14,8 @@ const Ci = Components.interfaces; Cu.import("resource://gre/modules/Services.jsm"); Cu.import('resource://gre/modules/XPCOMUtils.jsm'); -XPCOMUtils.defineLazyModuleGetter(this, "PhoneNumberNormalizer", - "resource://gre/modules/PhoneNumberNormalizer.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "MCC_ISO3166_TABLE", - "resource://gre/modules/mcc_iso3166_table.jsm"); +Cu.import("resource://gre/modules/PhoneNumberNormalizer.jsm"); +Cu.import("resource://gre/modules/mcc_iso3166_table.jsm"); #ifdef MOZ_B2G_RIL XPCOMUtils.defineLazyServiceGetter(this, "mobileConnection", @@ -198,8 +196,7 @@ this.PhoneNumberUtils = { let inParent = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime) .processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT; if (inParent) { - XPCOMUtils.defineLazyModuleGetter(this, "PhoneNumber", - "resource://gre/modules/PhoneNumber.jsm"); + Cu.import("resource://gre/modules/PhoneNumber.jsm"); XPCOMUtils.defineLazyServiceGetter(this, "ppmm", "@mozilla.org/parentprocessmessagemanager;1", "nsIMessageListenerManager"); diff --git a/dom/system/gonk/Nfc.js b/dom/system/gonk/Nfc.js index aa607d23aefc..a1af5e48d9c8 100644 --- a/dom/system/gonk/Nfc.js +++ b/dom/system/gonk/Nfc.js @@ -22,11 +22,8 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); -XPCOMUtils.defineLazyGetter(this, "NFC", function () { - let obj = {}; - Cu.import("resource://gre/modules/nfc_consts.js", obj); - return obj; -}); +let NFC = {}; +Cu.import("resource://gre/modules/nfc_consts.js", NFC); Cu.import("resource://gre/modules/systemlibs.js"); const NFC_ENABLED = libcutils.property_get("ro.moz.nfc.enabled", "false") === "true"; diff --git a/dom/system/gonk/NfcContentHelper.js b/dom/system/gonk/NfcContentHelper.js index 2d4903b2c647..ac4724d91c31 100644 --- a/dom/system/gonk/NfcContentHelper.js +++ b/dom/system/gonk/NfcContentHelper.js @@ -23,11 +23,8 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/DOMRequestHelper.jsm"); -XPCOMUtils.defineLazyGetter(this, "NFC", function () { - let obj = {}; - Cu.import("resource://gre/modules/nfc_consts.js", obj); - return obj; -}); +let NFC = {}; +Cu.import("resource://gre/modules/nfc_consts.js", NFC); Cu.import("resource://gre/modules/systemlibs.js"); const NFC_ENABLED = libcutils.property_get("ro.moz.nfc.enabled", "false") === "true"; diff --git a/dom/system/gonk/RILContentHelper.js b/dom/system/gonk/RILContentHelper.js index 176bf6074248..242b389d9122 100644 --- a/dom/system/gonk/RILContentHelper.js +++ b/dom/system/gonk/RILContentHelper.js @@ -21,11 +21,8 @@ Cu.import("resource://gre/modules/DOMRequestHelper.jsm"); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -XPCOMUtils.defineLazyGetter(this, "RIL", function () { - let obj = {}; - Cu.import("resource://gre/modules/ril_consts.js", obj); - return obj; -}); +var RIL = {}; +Cu.import("resource://gre/modules/ril_consts.js", RIL); const NS_XPCOM_SHUTDOWN_OBSERVER_ID = "xpcom-shutdown"; diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js index 53b1f784f808..a1f0cad9f235 100644 --- a/dom/system/gonk/RadioInterfaceLayer.js +++ b/dom/system/gonk/RadioInterfaceLayer.js @@ -24,11 +24,8 @@ Cu.import("resource://gre/modules/systemlibs.js"); Cu.import("resource://gre/modules/Promise.jsm"); Cu.import("resource://gre/modules/FileUtils.jsm"); -XPCOMUtils.defineLazyGetter(this, "RIL", function () { - let obj = {}; - Cu.import("resource://gre/modules/ril_consts.js", obj); - return obj; -}); +var RIL = {}; +Cu.import("resource://gre/modules/ril_consts.js", RIL); // set to true in ril_consts.js to see debug messages var DEBUG = RIL.DEBUG_RIL; diff --git a/dom/telephony/gonk/TelephonyProvider.js b/dom/telephony/gonk/TelephonyProvider.js index c6c0305ee83a..2b4830ddb816 100644 --- a/dom/telephony/gonk/TelephonyProvider.js +++ b/dom/telephony/gonk/TelephonyProvider.js @@ -11,11 +11,8 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/Promise.jsm"); -XPCOMUtils.defineLazyGetter(this, "RIL", function () { - let obj = {}; - Cu.import("resource://gre/modules/ril_consts.js", obj); - return obj; -}); +var RIL = {}; +Cu.import("resource://gre/modules/ril_consts.js", RIL); const GONK_TELEPHONYPROVIDER_CONTRACTID = "@mozilla.org/telephony/gonktelephonyprovider;1"; From d9bf2574d08273c5d59a2c43c1f852995366e70f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 7 May 2014 19:00:34 -0700 Subject: [PATCH 13/22] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/373670f1fc7e Author: EragonJ Desc: Merge pull request #18928 from EragonJ/bug-994533-new Bug 994533 - [Sora][WIFI] The return button display error in wifi page ======== https://hg.mozilla.org/integration/gaia-central/rev/32c40be85d94 Author: EragonJ Desc: Bug 994533 - [Sora][WIFI] The return button display error in wifi page --- 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 18aed2c074ec..dc25302c5d68 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "179a63a8b42240dbd1b59330b03f6927b89d427a", + "revision": "373670f1fc7e3a6612b516e68133f75072b1a6ef", "repo_path": "/integration/gaia-central" } From 9587dc797c5c6c06da1254388ba03e0a8050e608 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 7 May 2014 19:07:08 -0700 Subject: [PATCH 14/22] 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/flame/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 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index e9121bd23931..3714b8c07138 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 9b6de9f51131..cdcf3d8d0288 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 b39fa6a848a9..e0d3f597f036 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 e9121bd23931..3714b8c07138 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 27c054d597e8..290dac4bcc90 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index ba527fa25936..f6a224c389b5 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 d5f97aa10cb3..1b21884856d2 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 b6c7425912bc..925ab885ab56 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 c6600a867032..feae8ff7f1cc 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 9921ac0aa23b..5059c6ff7461 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 51c0202e9f97..778bf23926df 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 54600a81bf8f1d0ae25950924c9b6ab90435a4c9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 7 May 2014 19:41:03 -0700 Subject: [PATCH 15/22] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/0b28cbe12ec7 Author: Yoshi Huang Desc: Merge pull request #19006 from svic/Bug_961687 Bug 961687: ShrinkingUI not sending URL. r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/f3e57e858835 Author: Garner Lee Desc: Bug 961687: ShrinkingUI not sending URL. Fix mismatched 'transitionend' animation listener callbacks. r=gweng --- 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 dc25302c5d68..d8b5da4f6a28 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "373670f1fc7e3a6612b516e68133f75072b1a6ef", + "revision": "0b28cbe12ec78786664f17f05bc71a5260c36098", "repo_path": "/integration/gaia-central" } From 663aac14a14760e9a2dc38a6160f6bb0294570ff Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 7 May 2014 19:46:28 -0700 Subject: [PATCH 16/22] 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/flame/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 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 3714b8c07138..1959aa8147be 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 cdcf3d8d0288..97aaa1e7f491 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 e0d3f597f036..bbc7b2b8f151 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 3714b8c07138..1959aa8147be 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 290dac4bcc90..0dcfc1e26bfa 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index f6a224c389b5..0d782ebddc94 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 1b21884856d2..b36d8b29e631 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 925ab885ab56..ff530f72dcd3 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 feae8ff7f1cc..7c1b616800cd 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 5059c6ff7461..c5cd02ff56b7 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 778bf23926df..1af27860caca 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 20181e40df5ba3961549dd29cbe8b5e772d8d9a4 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 7 May 2014 20:05:55 -0700 Subject: [PATCH 17/22] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/28c1686f93eb Author: Yoshi Huang Desc: Merge pull request #18844 from svic/Bug_1002304 Bug 1002304 - Restore state of BT for incoming file transfers. r=evelyn ======== https://hg.mozilla.org/integration/gaia-central/rev/6711541b21b3 Author: Arno Puder Desc: Bug 1002304 - Restore state of BT for incoming file transfers. r=ehung --- 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 d8b5da4f6a28..c3279a906588 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "0b28cbe12ec78786664f17f05bc71a5260c36098", + "revision": "28c1686f93eb870f7e683d9ada8426c2395ad53f", "repo_path": "/integration/gaia-central" } From 506870ce87e924592ea6036ccc2e24d325da93ec Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 7 May 2014 20:11:20 -0700 Subject: [PATCH 18/22] 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/flame/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 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 1959aa8147be..7d317e299ff5 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 97aaa1e7f491..418370e72d52 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 bbc7b2b8f151..3db6623a0c55 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 1959aa8147be..7d317e299ff5 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 0dcfc1e26bfa..82a957849076 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 0d782ebddc94..254eb2ab5f30 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 b36d8b29e631..d77fd5154a58 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 ff530f72dcd3..11145f4d686c 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 7c1b616800cd..a4b67bbcc636 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 c5cd02ff56b7..4f0acd133fab 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 1af27860caca..521421cef370 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From a9e1576f75be9834df14fc68786e72b687e43774 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 7 May 2014 21:16:03 -0700 Subject: [PATCH 19/22] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/773bc13adf6e Author: Yuren Ju Desc: Merge pull request #18556 from yurenju/l10n Bug 968666 - multilocale.js should be a standalone build script which ca... r=@ochameau f=@Pike ======== https://hg.mozilla.org/integration/gaia-central/rev/6d7b4c42d433 Author: Yuren Ju Desc: Bug 968666 - multilocale.js should be a standalone build script which can be executed by macro |run-js-command| ======== https://hg.mozilla.org/integration/gaia-central/rev/246958d3bbb2 Author: Kevin Grandon Desc: Bug 1005272 - Disable intermittent failing test, test_settings_change_keyboard_language.py --- 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 c3279a906588..3aebfa27f34f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "28c1686f93eb870f7e683d9ada8426c2395ad53f", + "revision": "773bc13adf6eecf5437e53cac894bef9fb39bc88", "repo_path": "/integration/gaia-central" } From 91933de46c3d91bc12daecfb00ec9ed662995670 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 7 May 2014 21:21:35 -0700 Subject: [PATCH 20/22] 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/flame/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 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 7d317e299ff5..f916ee105c19 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 418370e72d52..d096fa65253f 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 3db6623a0c55..db3c1f73345d 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 7d317e299ff5..f916ee105c19 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 82a957849076..0a95e5762c17 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 254eb2ab5f30..f528d28f8ca6 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 d77fd5154a58..224a50bf16db 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 11145f4d686c..1ff91e3a2f91 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 a4b67bbcc636..c4feeb740ee8 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 4f0acd133fab..3d340604d024 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 521421cef370..ea6c65492f9b 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 9b9a08e070650c40cfd500ffbfbadf81b19413c9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 7 May 2014 21:40:51 -0700 Subject: [PATCH 21/22] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/2c31857e3104 Author: EragonJ Desc: Merge pull request #19044 from EragonJ/bug-1007466 Bug 1007466 - [Setting] DSDS related panels can't work when testing on N... ======== https://hg.mozilla.org/integration/gaia-central/rev/49560b195964 Author: EragonJ Desc: Bug 1007466 - [Setting] DSDS related panels can't work when testing on Nightly --- 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 3aebfa27f34f..92247a401bb9 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "773bc13adf6eecf5437e53cac894bef9fb39bc88", + "revision": "2c31857e31048d05f9bb335d8ef2408c612195af", "repo_path": "/integration/gaia-central" } From 2cabcdb77c0262e2412f79b1c1e053d8b9e0fdc9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 7 May 2014 21:42:59 -0700 Subject: [PATCH 22/22] 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/flame/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 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index f916ee105c19..25a773f3a3a2 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 d096fa65253f..17dbb36d5d4d 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 db3c1f73345d..1735d41df719 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 f916ee105c19..25a773f3a3a2 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml index 0a95e5762c17..660a7ab7eb1e 100644 --- a/b2g/config/flame/sources.xml +++ b/b2g/config/flame/sources.xml @@ -18,7 +18,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index f528d28f8ca6..04fe89e8651e 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 224a50bf16db..f0d8bfbf99d8 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 1ff91e3a2f91..b782f034616c 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 c4feeb740ee8..4a3ceac26c01 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 3d340604d024..3eed4773a729 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 ea6c65492f9b..4441e46682c4 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - +