From 44b41fb58de1630fbbdcba838a967388220d5fdf Mon Sep 17 00:00:00 2001 From: Mantaroh Yoshinaga Date: Thu, 17 Dec 2015 15:46:00 +0100 Subject: [PATCH 01/39] Bug 1201456 - Add button of opening to TV profile directory. r=janx --- devtools/client/locales/en-US/webide.dtd | 3 +++ devtools/client/webide/content/simulator.js | 26 +++++++++++++++++++ .../client/webide/content/simulator.xhtml | 17 ++++++++++++ .../client/webide/test/test_simulators.html | 6 +++++ 4 files changed, 52 insertions(+) diff --git a/devtools/client/locales/en-US/webide.dtd b/devtools/client/locales/en-US/webide.dtd index 67a23321ab4..89cc9a078d8 100644 --- a/devtools/client/locales/en-US/webide.dtd +++ b/devtools/client/locales/en-US/webide.dtd @@ -215,3 +215,6 @@ + + + diff --git a/devtools/client/webide/content/simulator.js b/devtools/client/webide/content/simulator.js index 30fd9b6dff0..ae447b1b3f3 100644 --- a/devtools/client/webide/content/simulator.js +++ b/devtools/client/webide/content/simulator.js @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ var Cu = Components.utils; +var Ci = Components.interfaces; const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {}); const { GetDevices, GetDeviceString } = require("devtools/client/shared/devices"); @@ -117,9 +118,29 @@ var SimulatorEditor = { this.updateProfileSelector(); this.updateDeviceSelector(); this.updateDeviceFields(); + + // Change visibility of 'TV Simulator Menu'. + let tvSimMenu = document.querySelector("#tv_simulator_menu"); + tvSimMenu.style.visibility = (this._simulator.type === "television")? + "visible" : "hidden"; }); }, + // Open the directory of TV Simulator config. + showTVConfigDirectory() { + let profD = Services.dirsvc.get("ProfD", Ci.nsIFile); + profD.append("extensions"); + profD.append(this._simulator.addon.id); + profD.append("profile"); + profD.append("dummy"); + let profileDir = profD.path; + + // Show the profile directory. + let nsLocalFile = Components.Constructor("@mozilla.org/file/local;1", + "nsILocalFile", "initWithPath"); + new nsLocalFile(profileDir).reveal(); + }, + // Close the configuration panel. close() { this._simulator = null; @@ -317,4 +338,9 @@ window.addEventListener("load", function onLoad() { // We just loaded, so we probably missed the first configure request. SimulatorEditor.edit(Simulators._lastConfiguredSimulator); + + document.querySelector("#open-tv-dummy-directory").onclick = e => { + SimulatorEditor.showTVConfigDirectory(); + e.preventDefault(); + }; }); diff --git a/devtools/client/webide/content/simulator.xhtml b/devtools/client/webide/content/simulator.xhtml index b69db7ef198..3ab91624847 100644 --- a/devtools/client/webide/content/simulator.xhtml +++ b/devtools/client/webide/content/simulator.xhtml @@ -76,6 +76,23 @@ + +

&simulator_tv_data;

+ + + +

+ diff --git a/devtools/client/webide/test/test_simulators.html b/devtools/client/webide/test/test_simulators.html index da91ea0593e..fda6e8716d9 100644 --- a/devtools/client/webide/test/test_simulators.html +++ b/devtools/client/webide/test/test_simulators.html @@ -296,6 +296,9 @@ sid = params.args.indexOf("-screen"); ok(params.args[sid + 1].includes(device.width + "x" + device.height), "Simulator screen resolution looks right"); + // Test Simulator Menu. + is(doc.querySelector("#tv_simulator_menu").style.visibility, "hidden", "OpenTVDummyDirectory Button is not hidden\n"); + // Restore default simulator options. doc.querySelector("#reset").click(); @@ -322,6 +325,9 @@ is(form[param].value, String(defaults.television[param]), "Default TV value for device " + param); } + // Test Simulator Menu + is(doc.querySelector("#tv_simulator_menu").style.visibility, "visible", "OpenTVDummyDirectory Button is not visible"); + // Force reload the list of simulators. Simulators._loadingPromise = null; From 8db1a24fcd21fd6c9224fd72dcbaa7c547a1c6bc Mon Sep 17 00:00:00 2001 From: Russ Nicoletti Date: Thu, 17 Dec 2015 13:45:21 -0800 Subject: [PATCH 02/39] Bug 1193588 - [Metrics] Add pref for HUD telemetry logging. r=janx --- b2g/chrome/content/devtools/hud.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/b2g/chrome/content/devtools/hud.js b/b2g/chrome/content/devtools/hud.js index 141d01436f3..54a612da4ae 100644 --- a/b2g/chrome/content/devtools/hud.js +++ b/b2g/chrome/content/devtools/hud.js @@ -108,6 +108,10 @@ var developerHUD = { this._logging = enabled; }); + SettingsListener.observe('hud.telemetry.logging', _telemetryDebug, enabled => { + _telemetryDebug = enabled; + }); + SettingsListener.observe('metrics.selectedMetrics.level', "", level => { this._telemetry = (level === 'Enhanced'); }); From 4883375ba0b146fd9813503e030e2186278d4226 Mon Sep 17 00:00:00 2001 From: Paul Rouget Date: Tue, 15 Dec 2015 00:57:00 +0100 Subject: [PATCH 03/39] Bug 1232600 - make showInstallScreen global. r=fabrice --- b2g/chrome/content/shell.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/b2g/chrome/content/shell.js b/b2g/chrome/content/shell.js index 90d70600be3..cd1c7b066f3 100644 --- a/b2g/chrome/content/shell.js +++ b/b2g/chrome/content/shell.js @@ -1391,6 +1391,8 @@ Services.obs.addObserver(function resetProfile(subject, topic, data) { appStartup.quit(Ci.nsIAppStartup.eForceQuit); }, 'b2g-reset-profile', false); +var showInstallScreen; + if (AppConstants.MOZ_GRAPHENE) { const restoreWindowGeometry = () => { let screenX = Services.prefs.getIntPref("b2g.nativeWindowGeometry.screenX"); @@ -1428,7 +1430,7 @@ if (AppConstants.MOZ_GRAPHENE) { const showNativeWindow = () => baseWindow.visibility = true; const hideNativeWindow = () => baseWindow.visibility = false; - const showInstallScreen = () => { + showInstallScreen = () => { const grapheneStrings = Services.strings.createBundle('chrome://b2g-l10n/locale/graphene.properties'); document.querySelector('#installing > .message').textContent = From b34f08dc3f9b17d216c7f5b1ce34542b6861fdb9 Mon Sep 17 00:00:00 2001 From: Paul Rouget Date: Tue, 15 Dec 2015 01:06:00 +0100 Subject: [PATCH 04/39] Bug 1232601 - fix settings.json path. r=fabrice --- b2g/graphene/app.mozbuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/graphene/app.mozbuild b/b2g/graphene/app.mozbuild index 0985b613c73..fc3037c0687 100644 --- a/b2g/graphene/app.mozbuild +++ b/b2g/graphene/app.mozbuild @@ -14,4 +14,4 @@ DIRS += [ ] # Add the defaults settings. -FINAL_TARGET_FILES.defaults += [ 'b2g/graphene/settings.json' ] +FINAL_TARGET_FILES.defaults += [ 'settings.json' ] From 31eadff5d987b46e2e34b644267546d898140773 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 06:05:16 -0800 Subject: [PATCH 05/39] Bumping gaia.json for 8 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1b08f72edbca Author: Carsten Book Desc: Merge pull request #33606 from gmarty/Bug-1232280-homescreen-home-button-gip-to-gij Bug 1232280 - Implement test_home_button.py and test_home_button_in_edit_mode.py as an Integration test in JavaScript. r=chrislord ======== https://hg.mozilla.org/integration/gaia-central/rev/770e51027ad5 Author: Guillaume Marty Desc: Bug 1232280 - Implement test_home_button.py and test_home_button_in_edit_mode.py as an Integration test in JavaScript ======== https://hg.mozilla.org/integration/gaia-central/rev/06f6830d431c Author: Zibi Braniecki Desc: Merge pull request #33609 from zbraniecki/1232947-fix-pin-change-body-l10nid Bug 1232947 - Fix pin change body l10nid. r=gasolin ======== https://hg.mozilla.org/integration/gaia-central/rev/e90b9011c079 Author: Zibi Braniecki Desc: Bug 1232947 - Fix pin change body l10nid ======== https://hg.mozilla.org/integration/gaia-central/rev/aa5064c6d7da Author: Zibi Braniecki Desc: Merge pull request #33607 from zbraniecki/1232448-fix-wifi-connection-string Bug 1232448 - Fix l10nId settings in wifi-status context. r=gasolin ======== https://hg.mozilla.org/integration/gaia-central/rev/eb1b3d853957 Author: Zibi Braniecki Desc: Bug 1232448 - Fix l10nId settings in wifi-status context ======== https://hg.mozilla.org/integration/gaia-central/rev/d325c2e7da0b Author: Zibi Braniecki Desc: Merge pull request #33608 from zbraniecki/1232788-fix-pin-error-msg Bug 1232788 - Fix pin error msg l10n id. r=gasolin ======== https://hg.mozilla.org/integration/gaia-central/rev/9076560f2086 Author: Zibi Braniecki Desc: Bug 1232788 - Fix pin error msg l10n id --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 66a63ec42c4..637c76a41b2 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "d069027f9af6f835ef869f1f01b52339e5a3f423", + "git_revision": "37210d8e5376b514bef74048cc49043fc88d7954", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "87642662c7721f18575be17ae42c81782e5f040a", + "revision": "1b08f72edbca208bf81a7a2d4726b9cae10bcaa4", "repo_path": "integration/gaia-central" } From 8184dfcbe80104547d93b5c70a59c97840d2ff82 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 06:06:40 -0800 Subject: [PATCH 06/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index ac3725a2c33..43c104053b5 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 7592415f568..6eba15f224c 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index b0408d7ad5f..5731b220e8e 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 4982117f218..7c2ab9c78a5 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 2aa4ba808e8..dedcc1c3474 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 4dc1ae9eddd..64fb63ca4be 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index b0408d7ad5f..5731b220e8e 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 343d1e6070e..ec928b1366a 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index c9358dbdda5..2be7a79a314 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 807a7a60446..027835f86da 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 91fd526f623..0b687133558 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -21,7 +21,7 @@ - + From 06c4d46a6d399b63204c0e56dbcc6413a51b9949 Mon Sep 17 00:00:00 2001 From: Tom Tung Date: Thu, 17 Dec 2015 09:36:43 +0800 Subject: [PATCH 07/39] Bug 1232941 - Register Observer and listen to NS_XPCOM_SHUTDOWN_OBSERVER_ID for GATT, r=shuang --- .../bluedroid/BluetoothGattManager.cpp | 17 +++++++++++++++++ dom/bluetooth/bluedroid/BluetoothGattManager.h | 1 + 2 files changed, 18 insertions(+) diff --git a/dom/bluetooth/bluedroid/BluetoothGattManager.cpp b/dom/bluetooth/bluedroid/BluetoothGattManager.cpp index 18c770f4459..1172e1ece0d 100644 --- a/dom/bluetooth/bluedroid/BluetoothGattManager.cpp +++ b/dom/bluetooth/bluedroid/BluetoothGattManager.cpp @@ -385,10 +385,27 @@ BluetoothGattManager::Get() // Create a new instance, register, and return BluetoothGattManager* manager = new BluetoothGattManager(); + NS_ENSURE_TRUE(manager->Init(), nullptr); sBluetoothGattManager = manager; return sBluetoothGattManager; } +bool +BluetoothGattManager::Init() +{ + MOZ_ASSERT(NS_IsMainThread()); + + nsCOMPtr obs = services::GetObserverService(); + NS_ENSURE_TRUE(obs, false); + + if (NS_FAILED(obs->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false))) { + BT_WARNING("Failed to add observers!"); + return false; + } + + return true; +} + class BluetoothGattManager::RegisterModuleResultHandler final : public BluetoothSetupResultHandler { diff --git a/dom/bluetooth/bluedroid/BluetoothGattManager.h b/dom/bluetooth/bluedroid/BluetoothGattManager.h index daede969df3..e79983fb40b 100644 --- a/dom/bluetooth/bluedroid/BluetoothGattManager.h +++ b/dom/bluetooth/bluedroid/BluetoothGattManager.h @@ -203,6 +203,7 @@ private: class ServerSendIndicationResultHandler; BluetoothGattManager(); + bool Init(); void HandleShutdown(); From 497a112e7730619d3696c94fc70365881eafcdbf Mon Sep 17 00:00:00 2001 From: Johan Lorenzo Date: Fri, 18 Dec 2015 15:30:25 +0100 Subject: [PATCH 08/39] Bug 1230134 - [tc-gip] Make the logs private r=garndt --- .../tasks/branches/b2g-inbound/job_flags.yml | 18 ++++++++++++++++++ testing/taskcluster/tasks/phone_test.yml | 9 ++++++++- .../tests/flame_kk_gaia_ui_test_functional.yml | 5 ----- .../flame_kk_gaia_ui_test_functional_dsds.yml | 5 ----- .../tests/flame_kk_gaia_ui_test_sanity.yml | 5 ----- .../tasks/tests/flame_kk_gaia_ui_test_unit.yml | 5 ----- 6 files changed, 26 insertions(+), 21 deletions(-) diff --git a/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml b/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml index ff3b8b988d2..5a27f9a776d 100644 --- a/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml +++ b/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml @@ -4,3 +4,21 @@ $inherits: from: tasks/branches/base_jobs.yml + +tests: + gaia-ui-test-functional: + allowed_build_tasks: + tasks/builds/b2g_flame_kk_eng.yml: + task: tasks/tests/flame_kk_gaia_ui_test_functional.yml + gaia-ui-test-functional-dsds: + allowed_build_tasks: + tasks/builds/b2g_flame_kk_eng.yml: + task: tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml + gaia-ui-test-sanity: + allowed_build_tasks: + tasks/builds/b2g_flame_kk_eng.yml: + task: tasks/tests/flame_kk_gaia_ui_test_sanity.yml + gaia-ui-test-unit: + allowed_build_tasks: + tasks/builds/b2g_flame_kk_eng.yml: + task: tasks/tests/flame_kk_gaia_ui_test_unit.yml diff --git a/testing/taskcluster/tasks/phone_test.yml b/testing/taskcluster/tasks/phone_test.yml index 023d654d00b..687d62c41f5 100644 --- a/testing/taskcluster/tasks/phone_test.yml +++ b/testing/taskcluster/tasks/phone_test.yml @@ -30,7 +30,14 @@ task: # All builds share a common artifact directory for ease of uploading. artifacts: - 'private/logs': + log: 'private/b2g/logs/live.log' + + 'private/b2g/device.json': + type: file + path: '/home/worker/data/device.json' + expires: '{{#from_now}}1 year{{/from_now}}' + + 'private/b2g/logs': type: directory path: '/home/worker/upload/logs/' expires: '{{#from_now}}1 year{{/from_now}}' diff --git a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml index 7a6c85a38c3..6722b1efa8c 100644 --- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml +++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml @@ -37,11 +37,6 @@ task: --log-mach=- --log-raw=/home/worker/upload/logs/raw.log gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/functional/manifest.ini - artifacts: - 'private/device.json': - type: file - path: '/home/worker/data/device.json' - expires: '{{#from_now}}1 year{{/from_now}}' extra: chunks: diff --git a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml index be6eadda5ac..fc76b3d9488 100644 --- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml +++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml @@ -35,11 +35,6 @@ task: --log-mach=- --log-raw=/home/worker/upload/logs/raw.log gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/functional/manifest.ini - artifacts: - 'private/device.json': - type: file - path: '/home/worker/data/device.json' - expires: '{{#from_now}}1 year{{/from_now}}' extra: treeherder: diff --git a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml index e3bafc6b863..56a6ea28fa3 100644 --- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml +++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml @@ -36,11 +36,6 @@ task: --log-mach=- --log-raw=/home/worker/upload/logs/raw.log gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/functional/manifest.ini - artifacts: - 'private/device.json': - type: file - path: '/home/worker/data/device.json' - expires: '{{#from_now}}1 year{{/from_now}}' extra: treeherder: diff --git a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml index 42bb8238dc8..6f2b7c122b5 100644 --- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml +++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml @@ -35,11 +35,6 @@ task: --log-mach=- --log-raw=/home/worker/upload/logs/raw.log gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/unit/manifest.ini - artifacts: - 'private/device.json': - type: file - path: '/home/worker/data/device.json' - expires: '{{#from_now}}1 year{{/from_now}}' extra: treeherder: From 4cb8fe0313e6f6e99bebcb99b4738a995dcfc490 Mon Sep 17 00:00:00 2001 From: Johan Lorenzo Date: Fri, 18 Dec 2015 17:07:12 +0100 Subject: [PATCH 09/39] Backed out Bug 1230134 - [tc-gip] Make the logs private For not having the correct payload configuration --- .../tasks/branches/b2g-inbound/job_flags.yml | 18 ------------------ testing/taskcluster/tasks/phone_test.yml | 9 +-------- .../tests/flame_kk_gaia_ui_test_functional.yml | 5 +++++ .../flame_kk_gaia_ui_test_functional_dsds.yml | 5 +++++ .../tests/flame_kk_gaia_ui_test_sanity.yml | 5 +++++ .../tasks/tests/flame_kk_gaia_ui_test_unit.yml | 5 +++++ 6 files changed, 21 insertions(+), 26 deletions(-) diff --git a/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml b/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml index 5a27f9a776d..ff3b8b988d2 100644 --- a/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml +++ b/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml @@ -4,21 +4,3 @@ $inherits: from: tasks/branches/base_jobs.yml - -tests: - gaia-ui-test-functional: - allowed_build_tasks: - tasks/builds/b2g_flame_kk_eng.yml: - task: tasks/tests/flame_kk_gaia_ui_test_functional.yml - gaia-ui-test-functional-dsds: - allowed_build_tasks: - tasks/builds/b2g_flame_kk_eng.yml: - task: tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml - gaia-ui-test-sanity: - allowed_build_tasks: - tasks/builds/b2g_flame_kk_eng.yml: - task: tasks/tests/flame_kk_gaia_ui_test_sanity.yml - gaia-ui-test-unit: - allowed_build_tasks: - tasks/builds/b2g_flame_kk_eng.yml: - task: tasks/tests/flame_kk_gaia_ui_test_unit.yml diff --git a/testing/taskcluster/tasks/phone_test.yml b/testing/taskcluster/tasks/phone_test.yml index 687d62c41f5..023d654d00b 100644 --- a/testing/taskcluster/tasks/phone_test.yml +++ b/testing/taskcluster/tasks/phone_test.yml @@ -30,14 +30,7 @@ task: # All builds share a common artifact directory for ease of uploading. artifacts: - log: 'private/b2g/logs/live.log' - - 'private/b2g/device.json': - type: file - path: '/home/worker/data/device.json' - expires: '{{#from_now}}1 year{{/from_now}}' - - 'private/b2g/logs': + 'private/logs': type: directory path: '/home/worker/upload/logs/' expires: '{{#from_now}}1 year{{/from_now}}' diff --git a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml index 6722b1efa8c..7a6c85a38c3 100644 --- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml +++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml @@ -37,6 +37,11 @@ task: --log-mach=- --log-raw=/home/worker/upload/logs/raw.log gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/functional/manifest.ini + artifacts: + 'private/device.json': + type: file + path: '/home/worker/data/device.json' + expires: '{{#from_now}}1 year{{/from_now}}' extra: chunks: diff --git a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml index fc76b3d9488..be6eadda5ac 100644 --- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml +++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml @@ -35,6 +35,11 @@ task: --log-mach=- --log-raw=/home/worker/upload/logs/raw.log gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/functional/manifest.ini + artifacts: + 'private/device.json': + type: file + path: '/home/worker/data/device.json' + expires: '{{#from_now}}1 year{{/from_now}}' extra: treeherder: diff --git a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml index 56a6ea28fa3..e3bafc6b863 100644 --- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml +++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml @@ -36,6 +36,11 @@ task: --log-mach=- --log-raw=/home/worker/upload/logs/raw.log gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/functional/manifest.ini + artifacts: + 'private/device.json': + type: file + path: '/home/worker/data/device.json' + expires: '{{#from_now}}1 year{{/from_now}}' extra: treeherder: diff --git a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml index 6f2b7c122b5..42bb8238dc8 100644 --- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml +++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml @@ -35,6 +35,11 @@ task: --log-mach=- --log-raw=/home/worker/upload/logs/raw.log gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/unit/manifest.ini + artifacts: + 'private/device.json': + type: file + path: '/home/worker/data/device.json' + expires: '{{#from_now}}1 year{{/from_now}}' extra: treeherder: From 587a4c7c4e09191ab6c15e526d1ca2e5d758f6be Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 08:08:34 -0800 Subject: [PATCH 10/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/7af9bd7f9e72 Author: No-Jun Park Desc: Merge pull request #33612 from npark-mozilla/1233223 Bug 1233223 - Imagecompare RTL: Update apps/settings/regions/storage_region.py ======== https://hg.mozilla.org/integration/gaia-central/rev/cd72aa41b43b Author: g5njpark Desc: Bug 1233223 - Imagecompare RTL: Update apps/settings/regions/storage_region.py --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 637c76a41b2..e63c97729c4 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "37210d8e5376b514bef74048cc49043fc88d7954", + "git_revision": "eaa4648b1ac00bca878053dd0579600091e5c1ff", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "1b08f72edbca208bf81a7a2d4726b9cae10bcaa4", + "revision": "7af9bd7f9e72970ec0b054fde78cafdf9e0a565e", "repo_path": "integration/gaia-central" } From 508ebce0985a18548795d42ed80f1d93d374a08d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 08:09:58 -0800 Subject: [PATCH 11/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 43c104053b5..130b49f87a9 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 6eba15f224c..313b6902589 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 5731b220e8e..32cf30b8950 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 7c2ab9c78a5..119ae423ff8 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index dedcc1c3474..43c154a8a71 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 64fb63ca4be..7a046acf448 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 5731b220e8e..32cf30b8950 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index ec928b1366a..c2849c73dfe 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index 2be7a79a314..13788dd12a9 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 027835f86da..ee18936693a 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 0b687133558..eb6430200c6 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -21,7 +21,7 @@ - + From e1da53c8e3e3715afb9c2a5d2a591e973fad4069 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 08:30:29 -0800 Subject: [PATCH 12/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a6dad090472d Author: Wilson Page Desc: Merge pull request #33619 from wilsonpage/1233256 Bug 1233256 - UI icons may display as placeholder text for a split second on page load ======== https://hg.mozilla.org/integration/gaia-central/rev/ea3abce67404 Author: Wilson Page Desc: Bug 1233256 - UI icons may display as placeholder text for a split second on page load --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index e63c97729c4..11fb1529b62 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "eaa4648b1ac00bca878053dd0579600091e5c1ff", + "git_revision": "f47eb52a85e05e4a348376b41403c9bff2f968f6", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "7af9bd7f9e72970ec0b054fde78cafdf9e0a565e", + "revision": "a6dad090472d7b41a6579d613ce2fa079f60bb20", "repo_path": "integration/gaia-central" } From 580cd7ffeefa0f615c2156149965c8a562dbec49 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 08:31:52 -0800 Subject: [PATCH 13/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 130b49f87a9..47b073a1501 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 313b6902589..1fd7d9cab84 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 32cf30b8950..2e77b17af38 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 119ae423ff8..2614a46678c 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 43c154a8a71..4d7e1b9b311 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 7a046acf448..16464e55645 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 32cf30b8950..2e77b17af38 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index c2849c73dfe..d4dbc973d1a 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index 13788dd12a9..077dea4df59 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index ee18936693a..3f4b1e2da1e 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index eb6430200c6..dcd88967167 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -21,7 +21,7 @@ - + From 7c530f86011e44e1f04895124d2e1fc40efeff7e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 08:59:41 -0800 Subject: [PATCH 14/39] Bumping manifests a=b2g-bump --- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 2614a46678c..73f60d2530e 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -41,7 +41,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 3f4b1e2da1e..f4d5ef50c87 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -42,7 +42,7 @@ - + From cfadf9261cbea6abfd6348d6a9f3c704b145e7fb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 09:10:38 -0800 Subject: [PATCH 15/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/7011b1bd377c Author: Johan Lorenzo Desc: Merge pull request #33622 from JohanLorenzo/bug-1233733 Bug 1233733 - All the jenkins jobs are failing, the keyboard manifest… ======== https://hg.mozilla.org/integration/gaia-central/rev/c62c6e972fc5 Author: Johan Lorenzo Desc: Bug 1233733 - All the jenkins jobs are failing, the keyboard manifest is not found anymore --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 11fb1529b62..9355fc695a9 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "f47eb52a85e05e4a348376b41403c9bff2f968f6", + "git_revision": "e10439497e9cd86ab35f6b45009155ace60c7c02", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "a6dad090472d7b41a6579d613ce2fa079f60bb20", + "revision": "7011b1bd377c15fb7fc2cfb164a0ed57b138b85b", "repo_path": "integration/gaia-central" } From 5001de6ad3d12183914aec63514535df0ed9af0a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 09:13:11 -0800 Subject: [PATCH 16/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 47b073a1501..f597bc5155a 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 1fd7d9cab84..32ada8f5085 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 2e77b17af38..19c4cee81f3 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 73f60d2530e..f29373da65e 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 4d7e1b9b311..33d7643f1d6 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 16464e55645..06d6248fd49 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 2e77b17af38..19c4cee81f3 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index d4dbc973d1a..fbff8abf584 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index 077dea4df59..261e9e87710 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index f4d5ef50c87..afc81fe2fd1 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index dcd88967167..f0f4988b99b 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -21,7 +21,7 @@ - + From d17225300c2733d58a289638c38c0d426d88183e Mon Sep 17 00:00:00 2001 From: Johan Lorenzo Date: Fri, 18 Dec 2015 18:54:08 +0100 Subject: [PATCH 17/39] Bug 1230134 - [tc-gip] Make the logs private r=garndt --- .../tasks/branches/b2g-inbound/job_flags.yml | 18 ++++++++++++++++++ testing/taskcluster/tasks/phone_test.yml | 9 ++++++++- .../tests/flame_kk_gaia_ui_test_functional.yml | 5 ----- .../flame_kk_gaia_ui_test_functional_dsds.yml | 5 ----- .../tests/flame_kk_gaia_ui_test_sanity.yml | 5 ----- .../tasks/tests/flame_kk_gaia_ui_test_unit.yml | 5 ----- 6 files changed, 26 insertions(+), 21 deletions(-) diff --git a/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml b/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml index ff3b8b988d2..5a27f9a776d 100644 --- a/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml +++ b/testing/taskcluster/tasks/branches/b2g-inbound/job_flags.yml @@ -4,3 +4,21 @@ $inherits: from: tasks/branches/base_jobs.yml + +tests: + gaia-ui-test-functional: + allowed_build_tasks: + tasks/builds/b2g_flame_kk_eng.yml: + task: tasks/tests/flame_kk_gaia_ui_test_functional.yml + gaia-ui-test-functional-dsds: + allowed_build_tasks: + tasks/builds/b2g_flame_kk_eng.yml: + task: tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml + gaia-ui-test-sanity: + allowed_build_tasks: + tasks/builds/b2g_flame_kk_eng.yml: + task: tasks/tests/flame_kk_gaia_ui_test_sanity.yml + gaia-ui-test-unit: + allowed_build_tasks: + tasks/builds/b2g_flame_kk_eng.yml: + task: tasks/tests/flame_kk_gaia_ui_test_unit.yml diff --git a/testing/taskcluster/tasks/phone_test.yml b/testing/taskcluster/tasks/phone_test.yml index 023d654d00b..deb24be5fbd 100644 --- a/testing/taskcluster/tasks/phone_test.yml +++ b/testing/taskcluster/tasks/phone_test.yml @@ -28,9 +28,16 @@ task: GAIA_REF: '{{{gaia_ref}}}' GAIA_REV: '{{{gaia_rev}}}' + log: 'private/b2g/logs/live.log' + # All builds share a common artifact directory for ease of uploading. artifacts: - 'private/logs': + 'private/b2g/device.json': + type: file + path: '/home/worker/data/device.json' + expires: '{{#from_now}}1 year{{/from_now}}' + + 'private/b2g/logs': type: directory path: '/home/worker/upload/logs/' expires: '{{#from_now}}1 year{{/from_now}}' diff --git a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml index 7a6c85a38c3..6722b1efa8c 100644 --- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml +++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional.yml @@ -37,11 +37,6 @@ task: --log-mach=- --log-raw=/home/worker/upload/logs/raw.log gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/functional/manifest.ini - artifacts: - 'private/device.json': - type: file - path: '/home/worker/data/device.json' - expires: '{{#from_now}}1 year{{/from_now}}' extra: chunks: diff --git a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml index be6eadda5ac..fc76b3d9488 100644 --- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml +++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_functional_dsds.yml @@ -35,11 +35,6 @@ task: --log-mach=- --log-raw=/home/worker/upload/logs/raw.log gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/functional/manifest.ini - artifacts: - 'private/device.json': - type: file - path: '/home/worker/data/device.json' - expires: '{{#from_now}}1 year{{/from_now}}' extra: treeherder: diff --git a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml index e3bafc6b863..56a6ea28fa3 100644 --- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml +++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml @@ -36,11 +36,6 @@ task: --log-mach=- --log-raw=/home/worker/upload/logs/raw.log gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/functional/manifest.ini - artifacts: - 'private/device.json': - type: file - path: '/home/worker/data/device.json' - expires: '{{#from_now}}1 year{{/from_now}}' extra: treeherder: diff --git a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml index 42bb8238dc8..6f2b7c122b5 100644 --- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml +++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_unit.yml @@ -35,11 +35,6 @@ task: --log-mach=- --log-raw=/home/worker/upload/logs/raw.log gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/unit/manifest.ini - artifacts: - 'private/device.json': - type: file - path: '/home/worker/data/device.json' - expires: '{{#from_now}}1 year{{/from_now}}' extra: treeherder: From 8f75450a95ce0bf1f4f616e3c84381a8bef88f46 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 10:04:56 -0800 Subject: [PATCH 18/39] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/804f16342904 Author: Kevin Grandon Desc: NO BUG - Fix typo in README.md r=me --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 9355fc695a9..b1e2856d90f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "e10439497e9cd86ab35f6b45009155ace60c7c02", + "git_revision": "bc1ffac8950caf728c0e3ec5cec9a1b224f2e024", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "7011b1bd377c15fb7fc2cfb164a0ed57b138b85b", + "revision": "804f16342904957a7e16c4de6e395a9a5aaa9a7d", "repo_path": "integration/gaia-central" } From 7808eecd6c4b81f5538efeeae3f56043e22bf28b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 10:07:16 -0800 Subject: [PATCH 19/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index f597bc5155a..bcc9b250ff2 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 32ada8f5085..4fe3a5afdf5 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 19c4cee81f3..d14545f99e0 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index f29373da65e..66707722f9a 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 33d7643f1d6..1b305e71fee 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 06d6248fd49..44e870df4d2 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 19c4cee81f3..d14545f99e0 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index fbff8abf584..74548ba042a 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index 261e9e87710..44f78f9207d 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index afc81fe2fd1..4a7f87e4063 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index f0f4988b99b..6d4199d235a 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -21,7 +21,7 @@ - + From db934f1c1def6d8c83736e462411785de823295e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 11:05:08 -0800 Subject: [PATCH 20/39] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/cd8905d9ba27 Author: Michael Henretty Desc: Bug 1233777 - Disable apps/fm/test/marionette/fm_test.js --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index b1e2856d90f..b48eb87f992 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "bc1ffac8950caf728c0e3ec5cec9a1b224f2e024", + "git_revision": "fec571e13bc8a44e74ff9a1a0264a5386507a268", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "804f16342904957a7e16c4de6e395a9a5aaa9a7d", + "revision": "cd8905d9ba27c3d8b47742e6d435a8958d90925c", "repo_path": "integration/gaia-central" } From a7f5c40a7b360ab94e8691a0d0e5ade1098e6725 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 11:06:40 -0800 Subject: [PATCH 21/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index bcc9b250ff2..f2d45fc4b4a 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 4fe3a5afdf5..9377cf8666f 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index d14545f99e0..965cea8298c 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 66707722f9a..0fe35fd67ae 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 1b305e71fee..7130f6ec1f0 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 44e870df4d2..7759fe6e436 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index d14545f99e0..965cea8298c 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 74548ba042a..edb31bb076d 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index 44f78f9207d..70145714d92 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 4a7f87e4063..6e4775a3926 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 6d4199d235a..2f92dfb7e5c 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -21,7 +21,7 @@ - + From 950015278c8a7ee14ae75248d946821a4b53ffae Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 12:28:45 -0800 Subject: [PATCH 22/39] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8d92bfc27f4c Author: Russ Nicoletti Desc: Merge pull request #33220 from russnicoletti/bug-1219704 Bug 1219704 - Implement *test_play_ogg_video.py* as an integration test in JavaScript r=djf ======== https://hg.mozilla.org/integration/gaia-central/rev/44703d3b94da Author: Russ Nicoletti Desc: Bug 1219704 - Implement *test_play_ogg_video.py* as an integration test in JavaScript ======== https://hg.mozilla.org/integration/gaia-central/rev/708f38846177 Author: punamdahiya Desc: Merge pull request #33569 from punamdahiya/Bug1219662 Bug 1219662 - [Gallery] Implement fullscreen view change orientation Gij integration test ======== https://hg.mozilla.org/integration/gaia-central/rev/11725dc3dfc5 Author: Punam Dahiya Desc: Bug 1219662 - [Gallery] Implement fullscreen view change orientation Gij integration test --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index b48eb87f992..6b871673f16 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "fec571e13bc8a44e74ff9a1a0264a5386507a268", + "git_revision": "62ad7586b05670fee9a4df256b1cc6fdb5a692e8", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "cd8905d9ba27c3d8b47742e6d435a8958d90925c", + "revision": "8d92bfc27f4c24db9997a7218cc0ca7ecf7450bb", "repo_path": "integration/gaia-central" } From ed00293d0f144857dd528374e5b11f30d00762db Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 12:30:22 -0800 Subject: [PATCH 23/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index f2d45fc4b4a..32977ba0339 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 9377cf8666f..b7e5d1d125c 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 965cea8298c..29378b607ec 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 0fe35fd67ae..00b7115c730 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 7130f6ec1f0..9c1b52cb877 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 7759fe6e436..7fc910db08f 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 965cea8298c..29378b607ec 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index edb31bb076d..1b7ff91c65d 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index 70145714d92..e21734086c7 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 6e4775a3926..b0a032846ed 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 2f92dfb7e5c..33ebf760ad4 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -21,7 +21,7 @@ - + From 5e73041712b043980a65c5e33fe8b62ba444ee5d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 14:23:32 -0800 Subject: [PATCH 24/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/cc7ab2b8b561 Author: Russ Nicoletti Desc: Merge pull request #33627 from russnicoletti/bug-1219704-follow-up Bug 1219704 -- follow up patch to fix ElementNotAccessibleError r=me ======== https://hg.mozilla.org/integration/gaia-central/rev/e5952d19c2e3 Author: Russ Nicoletti Desc: Bug 1219704 -- follow up patch --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 6b871673f16..0c3d43b4bd0 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "62ad7586b05670fee9a4df256b1cc6fdb5a692e8", + "git_revision": "2cf0778d92505fc845e962b3a2eed3ac2afa45ad", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "8d92bfc27f4c24db9997a7218cc0ca7ecf7450bb", + "revision": "cc7ab2b8b561be8d3012563206a5e667479c81ad", "repo_path": "integration/gaia-central" } From 29a39d6753521802fcbb5d66022c0bcbeefe0486 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 14:24:54 -0800 Subject: [PATCH 25/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 32977ba0339..0b1fb315fc7 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index b7e5d1d125c..4ca5a079816 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 29378b607ec..e5cfdd19d54 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 00b7115c730..04dafb76f10 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 9c1b52cb877..582cc59a092 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 7fc910db08f..2ed8f53e406 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 29378b607ec..e5cfdd19d54 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 1b7ff91c65d..e88eb86f6b2 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index e21734086c7..ec947442ca8 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index b0a032846ed..35e4ad83954 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 33ebf760ad4..b42e721e560 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -21,7 +21,7 @@ - + From a3c65adcd1ee97f377fea72c929f323fe2c34dee Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 14:44:37 -0800 Subject: [PATCH 26/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/3743c30630cd Author: Fabrice Desré Desc: Merge pull request #33621 from staktrace/scrolltick Bug 1233715 - Make the visibility monitor test wait for scroll events… ======== https://hg.mozilla.org/integration/gaia-central/rev/2f04878fef64 Author: Kartikaya Gupta Desc: Bug 1233715 - Make the visibility monitor test wait for scroll events when appropriate. r=kgrandon --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 0c3d43b4bd0..d96910b6627 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "2cf0778d92505fc845e962b3a2eed3ac2afa45ad", + "git_revision": "ba6fd79d4b3142dae8c83db82d2f458dcb99cd77", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "cc7ab2b8b561be8d3012563206a5e667479c81ad", + "revision": "3743c30630cd513216e9d941d456ed86294cc0a0", "repo_path": "integration/gaia-central" } From 1de857121946285071188f68d9267621c4d9a283 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 14:46:01 -0800 Subject: [PATCH 27/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 0b1fb315fc7..f8da387583b 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 4ca5a079816..2936107ac05 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index e5cfdd19d54..39c1ee58451 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 04dafb76f10..a3098ed586a 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 582cc59a092..7471e9d3bb9 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 2ed8f53e406..c2885211667 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index e5cfdd19d54..39c1ee58451 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index e88eb86f6b2..77dc7be90f9 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index ec947442ca8..af4124c8e6e 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 35e4ad83954..1dc3dcb11df 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index b42e721e560..6c43858dc02 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -21,7 +21,7 @@ - + From ef0c91ae2cc5b6fbce4b69c999882e7009754a7d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 15:14:30 -0800 Subject: [PATCH 28/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/6ec6a201c26d Author: Michael Henretty Desc: Merge pull request #33625 from mikehenrty/bug-1233796-increase-waitforfullyloaded Bug 1233796 - Increase timeout for system.waitForFullyLoaded ======== https://hg.mozilla.org/integration/gaia-central/rev/e8e11bb1ba16 Author: Michael Henretty Desc: Bug 1233796 - Increase timeout for system.waitForFullyLoaded --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index d96910b6627..89326e98e3b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "ba6fd79d4b3142dae8c83db82d2f458dcb99cd77", + "git_revision": "2267290a7b9480a194fe5b18b2a056b3ff641512", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "3743c30630cd513216e9d941d456ed86294cc0a0", + "revision": "6ec6a201c26d72e7e7ca44a1220916d39958afe1", "repo_path": "integration/gaia-central" } From e8d97809ee3e222ac90e3cb9999a40a4568cd0b7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 15:15:55 -0800 Subject: [PATCH 29/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index f8da387583b..68bd8a26e1f 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 2936107ac05..f9c093562dc 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 39c1ee58451..18dcb28d9a4 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index a3098ed586a..8fe1f3fca6f 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 7471e9d3bb9..901a3041188 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index c2885211667..6884f8fd342 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 39c1ee58451..18dcb28d9a4 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 77dc7be90f9..b24f55c30d0 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index af4124c8e6e..eb1c9c75e09 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 1dc3dcb11df..f5c87069148 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 6c43858dc02..3fbc2528d88 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -21,7 +21,7 @@ - + From 4a93cb1c89aca348541c8cfa7d6aa43200f0d1cf Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 18:44:41 -0800 Subject: [PATCH 30/39] Bumping gaia.json for 6 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/785347d914d8 Author: Ghislain 'Aus' Lacroix Desc: Merge pull request #33630 from mikehenrty/bug-1233880-wait-for-disappear-options Bug 1233880 - Allow passing options object into helper.waitForElement… ======== https://hg.mozilla.org/integration/gaia-central/rev/b5864a6733c3 Author: Michael Henretty Desc: Bug 1233880 - Allow passing options object into helper.waitForElementToDisappear ======== https://hg.mozilla.org/integration/gaia-central/rev/05572a0793f6 Author: Ghislain 'Aus' Lacroix Desc: Merge pull request #33631 from mikehenrty/bug-1233892-increase-all-timeouts Bug 1233892 - Increase searchTimeout, scriptTimeout and waitFor timeout ======== https://hg.mozilla.org/integration/gaia-central/rev/991e448efb02 Author: Michael Henretty Desc: Bug 1233892 - Increase searchTimeout, scriptTimeout and waitFor timeout ======== https://hg.mozilla.org/integration/gaia-central/rev/aa18d0545d6b Author: Ghislain 'Aus' Lacroix Desc: Merge pull request #33628 from mikehenrty/bug-1233823-wait-for-system-not-homescreen Bug 1233823 - Make marionette-apps.launch wait for system rather than… ======== https://hg.mozilla.org/integration/gaia-central/rev/cf50c422f334 Author: Michael Henretty Desc: Bug 1233823 - Make marionette-apps.launch wait for system rather than homescreen --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 89326e98e3b..42edd2f0213 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "2267290a7b9480a194fe5b18b2a056b3ff641512", + "git_revision": "33c1dc1bf98c640c49d648e709e0fdbd8da2da78", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "6ec6a201c26d72e7e7ca44a1220916d39958afe1", + "revision": "785347d914d85b3babd6977258de358a9a3beed5", "repo_path": "integration/gaia-central" } From 2071cb5f6c598e78fad1223c75576065ad7b98b7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 18 Dec 2015 18:46:06 -0800 Subject: [PATCH 31/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 68bd8a26e1f..22a850a83bc 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index f9c093562dc..b9a35a9e19e 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 18dcb28d9a4..6bc8fe916fa 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 8fe1f3fca6f..a747ecefe36 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 901a3041188..1b3b3feb652 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 6884f8fd342..5b5150dcfb0 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 18dcb28d9a4..6bc8fe916fa 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index b24f55c30d0..246d1554199 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index eb1c9c75e09..42c9f9fd562 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index f5c87069148..e115ae1a667 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 3fbc2528d88..ae5c2a250e4 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -21,7 +21,7 @@ - + From 615c2afa270d19b4fcf767bc316de60344fdab27 Mon Sep 17 00:00:00 2001 From: Markus Stange Date: Thu, 17 Dec 2015 17:19:30 -0500 Subject: [PATCH 32/39] Bug 1209970 - Fire scroll events early in the refresh tick. r=mats With APZ we want to be firing scroll events to content more consistently, so we tie them to the refresh driver tick rather than firing them on paint or haphazardly on the next spin of the event loop. Patch by Markus Stange, test fixes by Kartikaya Gupta --- .../test/browser_scrollPositions.js | 2 ++ layout/generic/nsGfxScrollFrame.cpp | 29 ++++++++++++------- layout/generic/nsGfxScrollFrame.h | 13 +++++---- .../mochitest/tests/SimpleTest/EventUtils.js | 4 ++- widget/tests/window_wheeltransaction.xul | 1 + 5 files changed, 32 insertions(+), 17 deletions(-) diff --git a/browser/components/sessionstore/test/browser_scrollPositions.js b/browser/components/sessionstore/test/browser_scrollPositions.js index d59676fcb18..15a6754ce59 100644 --- a/browser/components/sessionstore/test/browser_scrollPositions.js +++ b/browser/components/sessionstore/test/browser_scrollPositions.js @@ -16,6 +16,8 @@ const SCROLL2_X = Math.round(300 * (1 + Math.random())); const SCROLL2_Y = Math.round(400 * (1 + Math.random())); const SCROLL2_STR = SCROLL2_X + "," + SCROLL2_Y; +requestLongerTimeout(2); + /** * This test ensures that we properly serialize and restore scroll positions * for an average page without any frames. diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp index 19ebdaa671b..fe73db6afb3 100644 --- a/layout/generic/nsGfxScrollFrame.cpp +++ b/layout/generic/nsGfxScrollFrame.cpp @@ -4225,18 +4225,28 @@ void ScrollFrameHelper::CurPosAttributeChanged(nsIContent* aContent) /* ============= Scroll events ========== */ -NS_IMETHODIMP -ScrollFrameHelper::ScrollEvent::Run() +ScrollFrameHelper::ScrollEvent::ScrollEvent(ScrollFrameHelper* aHelper) + : mHelper(aHelper) { - if (mHelper) - mHelper->FireScrollEvent(); - return NS_OK; + mHelper->mOuter->PresContext()->RefreshDriver()->AddRefreshObserver(this, Flush_Style); +} + +ScrollFrameHelper::ScrollEvent::~ScrollEvent() +{ + mHelper->mOuter->PresContext()->RefreshDriver()->RemoveRefreshObserver(this, Flush_Style); +} + +void +ScrollFrameHelper::ScrollEvent::WillRefresh(mozilla::TimeStamp aTime) +{ + mHelper->FireScrollEvent(); } void ScrollFrameHelper::FireScrollEvent() { - mScrollEvent.Forget(); + MOZ_ASSERT(mScrollEvent); + mScrollEvent = nullptr; ActiveLayerTracker::SetCurrentScrollHandlerFrame(mOuter); WidgetGUIEvent event(true, eScroll, nullptr); @@ -4263,14 +4273,11 @@ ScrollFrameHelper::FireScrollEvent() void ScrollFrameHelper::PostScrollEvent() { - if (mScrollEvent.IsPending()) + if (mScrollEvent) return; - nsRootPresContext* rpc = mOuter->PresContext()->GetRootPresContext(); - if (!rpc) - return; + // The ScrollEvent constructor registers itself with the refresh driver. mScrollEvent = new ScrollEvent(this); - rpc->AddWillPaintObserver(mScrollEvent.get()); } NS_IMETHODIMP diff --git a/layout/generic/nsGfxScrollFrame.h b/layout/generic/nsGfxScrollFrame.h index f8c554e6027..5ee4f1195fa 100644 --- a/layout/generic/nsGfxScrollFrame.h +++ b/layout/generic/nsGfxScrollFrame.h @@ -19,6 +19,7 @@ #include "nsIReflowCallback.h" #include "nsBoxLayoutState.h" #include "nsQueryFrame.h" +#include "nsRefreshDriver.h" #include "nsExpirationTracker.h" #include "TextOverflow.h" #include "ScrollVelocityQueue.h" @@ -101,11 +102,13 @@ public: bool IsSmoothScrollingEnabled(); - class ScrollEvent : public nsRunnable { + class ScrollEvent : public nsARefreshObserver { public: - NS_DECL_NSIRUNNABLE - explicit ScrollEvent(ScrollFrameHelper *helper) : mHelper(helper) {} - void Revoke() { mHelper = nullptr; } + NS_INLINE_DECL_REFCOUNTING(ScrollEvent, override) + explicit ScrollEvent(ScrollFrameHelper *helper); + void WillRefresh(mozilla::TimeStamp aTime) override; + protected: + virtual ~ScrollEvent(); private: ScrollFrameHelper *mHelper; }; @@ -417,7 +420,7 @@ public: nsCOMPtr mScrollCornerContent; nsCOMPtr mResizerContent; - nsRevocableEventPtr mScrollEvent; + RefPtr mScrollEvent; nsRevocableEventPtr mAsyncScrollPortEvent; nsRevocableEventPtr mScrolledAreaEvent; nsIFrame* mHScrollbarBox; diff --git a/testing/mochitest/tests/SimpleTest/EventUtils.js b/testing/mochitest/tests/SimpleTest/EventUtils.js index 8f35605b993..20f1e9e26c0 100644 --- a/testing/mochitest/tests/SimpleTest/EventUtils.js +++ b/testing/mochitest/tests/SimpleTest/EventUtils.js @@ -526,8 +526,10 @@ function sendWheelAndPaint(aTarget, aOffsetX, aOffsetY, aEvent, aCallback, aWind setTimeout(function() { utils.advanceTimeAndRefresh(1000); - if (!aCallback) + if (!aCallback) { + utils.advanceTimeAndRefresh(0); return; + } var waitForPaints = function () { SpecialPowers.Services.obs.removeObserver(waitForPaints, "apz-repaints-flushed", false); diff --git a/widget/tests/window_wheeltransaction.xul b/widget/tests/window_wheeltransaction.xul index e69396051f6..8573eb3a4a9 100644 --- a/widget/tests/window_wheeltransaction.xul +++ b/widget/tests/window_wheeltransaction.xul @@ -1034,6 +1034,7 @@ function initElements() resetScrollPosition(gSubView1); resetScrollPosition(gSubView2); resetScrollPosition(gSubView3); + _getDOMWindowUtils(window).advanceTimeAndRefresh(0); runNextTestStep(); } From 08b6cc13ece59593dcca44e190c6dd6324a113e2 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sat, 19 Dec 2015 18:05:25 -0800 Subject: [PATCH 33/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 22a850a83bc..b4ceca8b378 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -35,7 +35,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index b9a35a9e19e..508c37b2c4b 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -35,7 +35,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index a747ecefe36..5b59039e545 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -31,7 +31,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 1b3b3feb652..d53234582fb 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -34,7 +34,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 5b5150dcfb0..887e2c1a93c 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -34,7 +34,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 246d1554199..35dc48c7f1c 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -35,7 +35,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index 42c9f9fd562..4cffa823e96 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -35,7 +35,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index e115ae1a667..68a225947c9 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -32,7 +32,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index ae5c2a250e4..0fc14eb977d 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -35,7 +35,7 @@ - + From 0a4d4c0f9723ba9358c38117534299f6a3b561e3 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 20 Dec 2015 20:44:38 -0800 Subject: [PATCH 34/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/84d1dd4e6654 Author: Scott Wu Desc: Merge pull request #33615 from scottwu/1232797-enter-puk-code-labels Bug 1232797 - Added labels for PUK dialog, r=gasolin ======== https://hg.mozilla.org/integration/gaia-central/rev/2a1bde405178 Author: Scott Wu Desc: Bug 1232797 - Added labels for PUK dialog --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 42edd2f0213..79ab860f462 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "33c1dc1bf98c640c49d648e709e0fdbd8da2da78", + "git_revision": "4a83fc7a568158cd964c694463578c73644e2601", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "785347d914d85b3babd6977258de358a9a3beed5", + "revision": "84d1dd4e6654addba12afea1f2867bebf4c3b835", "repo_path": "integration/gaia-central" } From 0c163f499edc64681708b73083b8932d41013d9c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 20 Dec 2015 20:46:06 -0800 Subject: [PATCH 35/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index b4ceca8b378..fa5c1736624 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 508c37b2c4b..91e5e9c27cd 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 6bc8fe916fa..c69c0e06e6f 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 5b59039e545..67db37dc3f8 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index d53234582fb..3b68e70289b 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 887e2c1a93c..5d6a4bc5a07 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 6bc8fe916fa..c69c0e06e6f 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 35dc48c7f1c..be7139b536c 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index 4cffa823e96..c16ab04e549 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 68a225947c9..121253f9824 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 0fc14eb977d..3982b8d3883 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -21,7 +21,7 @@ - + From a193d3184ebe203bb0e7f2832f84cf02cdd85830 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 20 Dec 2015 22:34:03 -0800 Subject: [PATCH 36/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/bafe0ba03414 Author: gasolin Desc: Merge pull request #33638 from gasolin/issue-1233847 Bug 1233847 - load ApnHelper for apn settings panel, r=me ======== https://hg.mozilla.org/integration/gaia-central/rev/8ed4384073fa Author: gasolin Desc: Bug 1233847 - load ApnHelper for apn settings panel, r=me --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 79ab860f462..964d70b8c3c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "4a83fc7a568158cd964c694463578c73644e2601", + "git_revision": "69195defbbb725032c317136aa0e7a704b94bb4a", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "84d1dd4e6654addba12afea1f2867bebf4c3b835", + "revision": "bafe0ba034143c040affd2af4aae4227f5d404d2", "repo_path": "integration/gaia-central" } From 65c354f40f5b314211e54bd939bc647f049280f2 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 20 Dec 2015 22:35:26 -0800 Subject: [PATCH 37/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index fa5c1736624..c400ce9b24d 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 91e5e9c27cd..eb55703fdd7 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c69c0e06e6f..49215b0d8af 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 67db37dc3f8..fc9602581cd 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 3b68e70289b..834377b384c 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 5d6a4bc5a07..57f2e3233c2 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index c69c0e06e6f..49215b0d8af 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index be7139b536c..1cffdeae551 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index c16ab04e549..d54c65379aa 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 121253f9824..10ed21d1334 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 3982b8d3883..b1c9f6069b1 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -21,7 +21,7 @@ - + From fe54bf03c56389311662bdb12e25cc781b6498fb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 20 Dec 2015 23:34:02 -0800 Subject: [PATCH 38/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e384f9eb4a14 Author: gasolin Desc: Merge pull request #33367 from gasolin/issue-1227893 Bug 1227893 - reflect Bluetooth rtl css to Settings counter part, r=timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/e562a1e42c83 Author: gasolin Desc: Bug 1227893 - reflect Bluetooth rtl css to Settings counter part, r=timdream --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 964d70b8c3c..14fa25ae5da 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "69195defbbb725032c317136aa0e7a704b94bb4a", + "git_revision": "14aefb2519becfa32f31bcc3c9c995693421f19c", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "bafe0ba034143c040affd2af4aae4227f5d404d2", + "revision": "e384f9eb4a149302c38df25a4aa772ddd1415f7e", "repo_path": "integration/gaia-central" } From fdb8c98c6481bd24c345f834ff46baaedd67b839 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 20 Dec 2015 23:35:25 -0800 Subject: [PATCH 39/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index c400ce9b24d..4a91bfebec1 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index eb55703fdd7..fcd1bd8c216 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 49215b0d8af..6ab4dd959df 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index fc9602581cd..ba670368af0 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 834377b384c..88c0ab8a827 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 57f2e3233c2..3830796e423 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 49215b0d8af..6ab4dd959df 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 1cffdeae551..6f133957e8b 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml index d54c65379aa..51d11c8fecc 100644 --- a/b2g/config/nexus-4-kk/sources.xml +++ b/b2g/config/nexus-4-kk/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 10ed21d1334..2f2bb1eb731 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -21,7 +21,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index b1c9f6069b1..68dccbeda9e 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -21,7 +21,7 @@ - +