From 8063ecbe976d5ea660625aa2b6c14c64fb1667cb Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 19 Jun 2013 06:46:22 -0700 Subject: [PATCH 01/13] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/0b5b9a1ad7c1 Author: Anthony Ricaud Desc: Merge pull request #10458 from Rik/disable-travis Bug 884217 - Disable travis on v1.1.0hd r=yurenju ======== https://hg.mozilla.org/integration/gaia-central/rev/dffbc85920f5 Author: Anthony Ricaud Desc: Bug 884217 - Disable travis on v1.1.0hd --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 95615a40c8bb..1e277eea1ac5 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "c86fcf41322b8bfc7b139cc54a68b178ba071f26", + "revision": "0b5b9a1ad7c1d4d2b9c39d839e13d90e0f6d2205", "repo_path": "/integration/gaia-central" } From e979ac0cb322e7ff06d0809b49b6c5bbcb77e394 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 19 Jun 2013 08:16:21 -0700 Subject: [PATCH 02/13] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/b87eb11393b9 Author: ochameau Desc: Merge pull request #10440 from ochameau/touch-scroll Bug 883834 - Touch events position is wrong on desktop when a DOM element is scrollable r=vingtetun ======== https://hg.mozilla.org/integration/gaia-central/rev/a5fa8b409586 Author: Alexandre Poirot Desc: Bug 883834 - Touch events position is wrong on desktop when a DOM element is scrollable --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 1e277eea1ac5..adbd7ac452ff 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "0b5b9a1ad7c1d4d2b9c39d839e13d90e0f6d2205", + "revision": "b87eb11393b90fbaf5ea5315fc37ffca53d764f8", "repo_path": "/integration/gaia-central" } From bf7235efdbf6d1a0be4f6d7a1d828ce77fbd9965 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 19 Jun 2013 09:31:24 -0700 Subject: [PATCH 03/13] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/50fddaae85a2 Author: Michael Wu Desc: Merge pull request #10406 from michaelwu/bug-871501 Bug 871501 - Make zip file generation consistent ======== https://hg.mozilla.org/integration/gaia-central/rev/6c5016942202 Author: Michael Wu Desc: Bug 871501 - Make zip file generation consistent --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index adbd7ac452ff..6583362768c7 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "b87eb11393b90fbaf5ea5315fc37ffca53d764f8", + "revision": "50fddaae85a237d9dff8871f2ef2836604a3c85b", "repo_path": "/integration/gaia-central" } From 9b97917811a911e11135c02f7d0b90a21cd50454 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 19 Jun 2013 09:46:23 -0700 Subject: [PATCH 04/13] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/feed41b8b879 Author: Dale Harvey Desc: Merge pull request #10475 from cctuan/863932 Bug 863932 - [B2G][Leo][Lockscreen][Camera] Camera does not work from lockscreen. r=daleharvey ======== https://hg.mozilla.org/integration/gaia-central/rev/f6aed694c314 Author: gduan Desc: Bug 863932 - [B2G][Leo][Lockscreen][Camera] Camera does not work from lockscreen with passcode --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 6583362768c7..ff2f33b2032c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "50fddaae85a237d9dff8871f2ef2836604a3c85b", + "revision": "feed41b8b87930cf93295f01837e178e61f3ad40", "repo_path": "/integration/gaia-central" } From 6cc2612b548848a76ab32dd026d667c2f78909e0 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 19 Jun 2013 10:01:26 -0700 Subject: [PATCH 05/13] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/75423c872bf4 Author: Anthony Ricaud Desc: Merge pull request #10486 from Rik/deleted-files-884592 Bug 884592 - Only lint existing files in the pre-commit hook r=vingtetun ======== https://hg.mozilla.org/integration/gaia-central/rev/a0d0d891a524 Author: Anthony Ricaud Desc: Bug 884592 - Only lint existing files in the pre-commit hook --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index ff2f33b2032c..bb1cb17830fd 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "feed41b8b87930cf93295f01837e178e61f3ad40", + "revision": "75423c872bf4517f2ec83227981879ca71a6daa1", "repo_path": "/integration/gaia-central" } From 51b0bcb2580d94a754b0462d1cb96342a53209ea Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 19 Jun 2013 10:16:22 -0700 Subject: [PATCH 06/13] Bumping gaia.json for 1 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/d56d449c7476 Author: Mike Pennisi Desc: Bug 883813 - [SMS][Translation][Spanish][Portugues] Some tokens are not translated r=julienw In order to support a variable width of the "To:" field in the Recipients section, some restructuring is necessary. --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index bb1cb17830fd..c94edbdb9cc7 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "75423c872bf4517f2ec83227981879ca71a6daa1", + "revision": "d56d449c7476dfc57d238756eed167f38ef18922", "repo_path": "/integration/gaia-central" } From 5080be29cfff8ad9b6c7545871ae8b6b1af14b64 Mon Sep 17 00:00:00 2001 From: Sotaro Ikeda Date: Wed, 19 Jun 2013 13:40:31 -0400 Subject: [PATCH 07/13] Bug 884440 - Remove item correctly from vector. r=doublec --- .../omx/mediaresourcemanager/MediaResourceManagerService.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp b/content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp index 13e13cb85775..c75ff19488ed 100644 --- a/content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp +++ b/content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp @@ -160,7 +160,7 @@ void MediaResourceManagerService::cancelClientLocked(const sp& binder) Fifo::iterator it(mVideoCodecRequestQueue.begin()); while (it != mVideoCodecRequestQueue.end()) { if (*it == binder) { - *it = NULL; + it = mVideoCodecRequestQueue.erase(it); continue; } it++; From 7b8932b4f3677fca038d075d55b79e6bebe7a0e0 Mon Sep 17 00:00:00 2001 From: Vincent Chang Date: Mon, 17 Jun 2013 12:20:39 +0800 Subject: [PATCH 08/13] Bug 868913 - Part 2: Fix the wifi initial start problem. r=mrbkap --- dom/wifi/WifiWorker.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dom/wifi/WifiWorker.js b/dom/wifi/WifiWorker.js index dc3ebacf40b2..c66657eb1bb1 100644 --- a/dom/wifi/WifiWorker.js +++ b/dom/wifi/WifiWorker.js @@ -1698,7 +1698,7 @@ function WifiWorker() { this._connectionInfoTimer = null; this._reconnectOnDisconnect = false; - // Users of instances of nsITimer should keep a reference to the timer until + // Users of instances of nsITimer should keep a reference to the timer until // it is no longer needed in order to assure the timer is fired. this._callbackTimer = null; @@ -2258,7 +2258,7 @@ WifiWorker.prototype = { tetheringSettings: {}, initTetheringSettings: function initTetheringSettings() { - this.tetheringSettings[SETTINGS_WIFI_ENABLED] = false; + this.tetheringSettings[SETTINGS_WIFI_TETHERING_ENABLED] = null; this.tetheringSettings[SETTINGS_WIFI_SSID] = DEFAULT_WIFI_SSID; this.tetheringSettings[SETTINGS_WIFI_SECURITY_TYPE] = DEFAULT_WIFI_SECURITY_TYPE; this.tetheringSettings[SETTINGS_WIFI_SECURITY_PASSWORD] = DEFAULT_WIFI_SECURITY_PASSWORD; From acc08c61f7303350b3a5d004a4a4335c8eb84175 Mon Sep 17 00:00:00 2001 From: Anton Kovalyov Date: Wed, 19 Jun 2013 10:07:04 -0700 Subject: [PATCH 09/13] Bug 863636 - Make 'profiler close' do nothing when toolbox is closed; r=jwalker --- browser/devtools/profiler/cmd-profiler.jsm | 3 ++ .../profiler/test/browser_profiler_cmd.js | 28 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/browser/devtools/profiler/cmd-profiler.jsm b/browser/devtools/profiler/cmd-profiler.jsm index 7744b8f372b8..b8454febb4d6 100644 --- a/browser/devtools/profiler/cmd-profiler.jsm +++ b/browser/devtools/profiler/cmd-profiler.jsm @@ -49,6 +49,9 @@ gcli.addCommand({ params: [], exec: function (args, context) { + if (!getPanel(context, "jsprofiler")) + return; + return gDevTools.closeToolbox(context.environment.target) .then(function () null); } diff --git a/browser/devtools/profiler/test/browser_profiler_cmd.js b/browser/devtools/profiler/test/browser_profiler_cmd.js index eb546500d201..321b01b48284 100644 --- a/browser/devtools/profiler/test/browser_profiler_cmd.js +++ b/browser/devtools/profiler/test/browser_profiler_cmd.js @@ -26,6 +26,7 @@ function test() { .then(testProfilerList) .then(testProfilerStop) .then(testProfilerClose) + .then(testProfilerCloseWhenClosed) }).then(finishUp); } @@ -118,6 +119,33 @@ function testProfilerClose() { return deferred.promise; } +function testProfilerCloseWhenClosed() { + // We need to call this test to make sure there are no + // errors when executing 'profiler close' on a closed + // toolbox. See bug 863636 for more info. + + let deferred = Promise.defer(); + + helpers.audit(gOptions, [{ + setup: "profiler close", + completed: false, + exec: { output: "" } + }]); + + let toolbox = gDevTools.getToolbox(gOptions.target); + if (!toolbox) { + ok(true, "Profiler was closed."); + deferred.resolve(); + } else { + toolbox.on("destroyed", function () { + ok(true, "Profiler was closed."); + deferred.resolve(); + }); + } + + return deferred.promise; +} + function finishUp() { gTarget = null; gPanel = null; From 69b770b5279e23cf268320541b8805d2610ba5dd Mon Sep 17 00:00:00 2001 From: Anton Kovalyov Date: Wed, 19 Jun 2013 10:09:28 -0700 Subject: [PATCH 10/13] Bug 884638 - Make 'dbg close' do nothing when toolbox is closed; r=jwalker --- browser/devtools/debugger/CmdDebugger.jsm | 3 ++ .../devtools/debugger/test/browser_dbg_cmd.js | 38 ++++++++++++------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/browser/devtools/debugger/CmdDebugger.jsm b/browser/devtools/debugger/CmdDebugger.jsm index 2a1ee0cff808..dc61b62e52a8 100644 --- a/browser/devtools/debugger/CmdDebugger.jsm +++ b/browser/devtools/debugger/CmdDebugger.jsm @@ -274,6 +274,9 @@ gcli.addCommand({ description: gcli.lookup("dbgClose"), params: [], exec: function(args, context) { + if (!getPanel(context, "jsdebugger")) + return; + return gDevTools.closeToolbox(context.environment.target) .then(() => null); } diff --git a/browser/devtools/debugger/test/browser_dbg_cmd.js b/browser/devtools/debugger/test/browser_dbg_cmd.js index b002169dd61f..544eddbaa5f7 100644 --- a/browser/devtools/debugger/test/browser_dbg_cmd.js +++ b/browser/devtools/debugger/test/browser_dbg_cmd.js @@ -57,22 +57,32 @@ function test() { cmd("dbg continue", function() { is(output.value, "dbg continue", "debugger continued"); - helpers.audit(options, [{ - setup: "dbg close", - completed: false, - exec: { output: "" } - }]); + function closeDebugger(cb) { + helpers.audit(options, [{ + setup: "dbg close", + completed: false, + exec: { output: "" } + }]); - let toolbox = gDevTools.getToolbox(options.target); - if (!toolbox) { - ok(true, "Debugger was closed."); - deferred.resolve(); - } else { - toolbox.on("destroyed", function () { + let toolbox = gDevTools.getToolbox(options.target); + if (!toolbox) { ok(true, "Debugger was closed."); - deferred.resolve(); - }); + cb(); + } else { + toolbox.on("destroyed", function () { + ok(true, "Debugger was closed."); + cb(); + }); + } } + + // We're closing the debugger twice to make sure + // 'dbg close' doesn't error when toolbox is already + // closed. See bug 884638 for more info. + + closeDebugger(() => { + closeDebugger(() => deferred.resolve()); + }); }); }); }); @@ -95,4 +105,4 @@ function test() { return deferred.promise; }).then(finish); -} +} \ No newline at end of file From f5932f4e663719533ab828c455091c959be08b89 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 19 Jun 2013 11:46:22 -0700 Subject: [PATCH 11/13] Bumping gaia.json for 1 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/393b5209f9bc Author: John Hu Desc: Bug 878735 - [SMS / MMS] entering new message screen not rendering correctly when accessed via contacts app - r=gnarf Closes gh-10204 --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index c94edbdb9cc7..5e6e4850a584 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "d56d449c7476dfc57d238756eed167f38ef18922", + "revision": "393b5209f9bc300017f2e037b1d0beeda4da7519", "repo_path": "/integration/gaia-central" } From 41d42f3330c886e9260f576e9dd9493c001bab56 Mon Sep 17 00:00:00 2001 From: Aki Sasaki Date: Wed, 19 Jun 2013 11:51:42 -0700 Subject: [PATCH 12/13] bug 882691 - inari configs. r=catlee --HG-- extra : rebase_source : 131685c868a93281ccbd0c21d34112927be96eff --- b2g/config/inari/config.json | 36 ++++++++++++++++++++++++++++++++ b2g/config/inari/releng-inari.tt | 20 ++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 b2g/config/inari/config.json create mode 100644 b2g/config/inari/releng-inari.tt diff --git a/b2g/config/inari/config.json b/b2g/config/inari/config.json new file mode 100644 index 000000000000..ebbb4a5e78a8 --- /dev/null +++ b/b2g/config/inari/config.json @@ -0,0 +1,36 @@ +{ + "config_version": 2, + "tooltool_manifest": "releng-inari.tt", + "mock_target": "mozilla-centos6-i386", + "mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel", "java-1.6.0-openjdk-devel", "git"], + "mock_files": [["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"]], + "build_targets": [], + "upload_files": [ + "{objdir}/dist/b2g-*.crashreporter-symbols.zip", + "{objdir}/dist/b2g-*.tar.gz", + "{workdir}/sources.xml" + ], + "zip_files": [ + ["{workdir}/out/target/product/inari/*.img", "out/target/product/inari/"], + ["{workdir}/boot.img", "out/target/product/inari/"], + "{workdir}/flash.sh", + "{workdir}/load-config.sh", + "{workdir}/.config", + "{workdir}/sources.xml" + ], + "env": { + "VARIANT": "user", + "MOZILLA_OFFICIAL": "1", + "B2GUPDATER": "1" + }, + "b2g_manifest": "inari.xml", + "b2g_manifest_branch": "master", + "additional_source_tarballs": ["backup-inari.tar.xz"], + "gecko_l10n_root": "http://hg.mozilla.org/l10n-central", + "gaia": { + "l10n": { + "vcs": "hgtool", + "root": "http://hg.mozilla.org/gaia-l10n" + } + } +} diff --git a/b2g/config/inari/releng-inari.tt b/b2g/config/inari/releng-inari.tt new file mode 100644 index 000000000000..217dd998dacc --- /dev/null +++ b/b2g/config/inari/releng-inari.tt @@ -0,0 +1,20 @@ +[ +{ +"size": 4249600, +"digest": "9f2150350e6fb2e8fe8744f47c02799865de16f8539844374188c2b421d8a044c213af57c8fe9dc7ad2038150687b50eba251dc782fa606674a86d8acc9e3dad", +"algorithm": "sha512", +"filename": "boot.img" +}, +{ +"size": 33335060, +"digest": "aa60b13458fabcb60c671e80db4dfc0cda3090fc5df27215cec3fb01f9cf2ac4403c93be99d1816a1f2d903febd4b027f7193a5fcec1aacf18ebb419ee9f32d7", +"algorithm": "sha512", +"filename": "backup-inari.tar.xz" +}, +{ +"size": 1570553, +"digest": "ea03de74df73b05e939c314cd15c54aac7b5488a407b7cc4f5f263f3049a1f69642c567dd35c43d0bc3f0d599d0385a26ab2dd947a6b18f9044e4918b382eea7", +"algorithm": "sha512", +"filename": "Adreno200-AU_LINUX_ANDROID_ICS_CHOCO_CS.04.00.03.06.001.zip" +} +] From 0b4cd8265bf1ba5523f935974fdfe3b4ac604fd2 Mon Sep 17 00:00:00 2001 From: Tim Taubert Date: Wed, 19 Jun 2013 22:07:59 +0200 Subject: [PATCH 13/13] Bug 883099 - Fire TabOpen after swapping docShells for preloaded newtab pages; r=dao --- browser/base/content/tabbrowser.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml index 2722bd565e65..c4a3f964399b 100644 --- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -1410,13 +1410,6 @@ b._fastFind = this.fastFind; b.droppedLinkHandler = handleDroppedLink; - // Dispatch a new tab notification. We do this once we're - // entirely done, so that things are in a consistent state - // even if the event listener opens or closes tabs. - var evt = document.createEvent("Events"); - evt.initEvent("TabOpen", true, false); - t.dispatchEvent(evt); - // If we just created a new tab that loads the default // newtab url, swap in a preloaded page if possible. // Do nothing if we're a private window. @@ -1426,6 +1419,13 @@ docShellsSwapped = gBrowserNewTabPreloader.newTab(t); } + // Dispatch a new tab notification. We do this once we're + // entirely done, so that things are in a consistent state + // even if the event listener opens or closes tabs. + var evt = document.createEvent("Events"); + evt.initEvent("TabOpen", true, false); + t.dispatchEvent(evt); + // If we didn't swap docShells with a preloaded browser // then let's just continue loading the page normally. if (!docShellsSwapped && !uriIsAboutBlank) {