From 65f89b28be2062fac866bb6c19924247a74e5455 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 9 Jan 2014 12:05:21 -0800 Subject: [PATCH 01/40] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f871f45dc2e2 Author: Kevin Grandon Desc: Merge pull request #14990 from EverythingMe/partners-api Bug 957976 - [Rocketbar] Use Everything.me Partners API [r=ranbena, kgrandon] ======== https://hg.mozilla.org/integration/gaia-central/rev/02f24a306ba5 Author: Amir Nissim Desc: Bug 957976 - [Rocketbar] Use Everything.me Partners API [r=ranbena, kgrandon] --- 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 8b7a8a064fb4..d20b288d90f6 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "f1f4304e9f2fe7bcf79b1e6ead334706c119ac4a", + "revision": "f871f45dc2e24b0d39261e21d8e413d9ebca8304", "repo_path": "/integration/gaia-central" } From 3ed1a1e8e4b58ee7f505dd0935c3c9fe9787cd2a Mon Sep 17 00:00:00 2001 From: Jonathan Griffin Date: Wed, 8 Jan 2014 18:43:12 -0800 Subject: [PATCH 02/40] Bug 929122 - Disable debug mochitests on B2G that fail, r=gwagner --- testing/mochitest/b2g-debug.json | 60 +++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/testing/mochitest/b2g-debug.json b/testing/mochitest/b2g-debug.json index 653d34b2db53..b6fdf6a38c4f 100644 --- a/testing/mochitest/b2g-debug.json +++ b/testing/mochitest/b2g-debug.json @@ -432,6 +432,64 @@ "layout/style/test/test_visited_reftests.html":"bug 870262, :visited support", "Harness_sanity/test_sanityEventUtils.html": "bug 688052", - "Harness_sanity/test_sanitySimpletest.html": "bug 688052" + "Harness_sanity/test_sanitySimpletest.html": "bug 688052", + + "content/base/test/csp/test_CSP_bug909029.html": "debug-only failure", + "content/base/test/test_bug578096.html": "debug-only failure; crash", + "content/base/test/test_bug827160.html": "debug-only failure", + "content/base/test/test_bug585978.html": "debug-only timeout", + "content/base/test/csp/test_CSP_bug941404.html": "debug-only failure", + "content/base/test/csp/test_bug886164.html": "debug-only failure", + "content/base/test/csp/test_nonce_source.html": "debug-only failure", + "content/base/test/csp/test_policyuri_regression_from_multipolicy.html": "debug-only failure", + "content/canvas/test/test_canvas.html": "debug-only crash; bug 933541", + "content/events/test/test_bug864040.html": "debug-only failure", + "content/html/content/test/forms/test_input_range_mouse_and_touch_events.html": "debug-only failure; bug 926546", + "content/html/content/test/test_bug595449.html": "debug-only failure", + "content/html/content/test/test_bug841466.html": "debug-only failure", + "content/html/content/test/test_ignoreuserfocus.html": "debug-only failure", + "docshell/test/test_bug570341.html": "debug-only failure", + "docshell/test/test_bug529119-2.html": "debug-only failure", + "dom/apps/tests/test_app_update.html": "debug-only failure", + "dom/apps/tests/test_packaged_app_update.html": "debug-only timeout", + "dom/bindings/test/test_exceptions_from_jsimplemented.html": "debug-only failure; bug 926547", + "dom/camera/test/test_camera.html": "debug-only failure; no assertions when 34 were expected", + "dom/contacts/tests/test_contacts_basics.html": "debug-only failure", + "dom/contacts/tests/test_contacts_getall.html": "debug-only failure", + "dom/datastore/tests/test_arrays.html": "debug-only failure; time out", + "dom/datastore/tests/test_sync.html": "debug-only failure; time out", + "dom/imptests/editing/selecttest/test_extend.html": "debug-only failure; time out", + "dom/imptests/editing/selecttest/test_selectAllChildren.html": "debug-only failure", + "dom/imptests/html/dom/": "debug-only failure", + "dom/imptests/html/html/": "debug-only failure", + "dom/imptests/webapps/": "debug-only failure", + "dom/indexedDB/test/test_success_events_after_abort.html": "debug-only failure; time out", + "dom/media/tests/mochitest/test_getUserMedia_playVideoAudioTwice.html": "debug-only failure; bug 926558", + "dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStream.html": "debug-only failure", + "dom/media/tests/mochitest/test_getUserMedia_basicVideo.html": "debug-only failure", + "dom/media/tests/ipc/test_ipc.html": "debug-only failure", + "dom/permission/tests/test_idle.html": "debug-only failure", + "dom/settings/tests/": "debug-only failure, bug 932878", + "dom/src/jsurl/test/test_bug351633-2.html": "debug-only failure", + "dom/src/jsurl/test/test_bug351633-4.html": "debug-only failure", + "dom/tests/mochitest/localstorage/test_localStorageOriginsEquals.html": "debug-only timeout", + "dom/tests/mochitest/ajax/jquery/test_jQuery.html": "debug-only timeout", + "dom/tests/mochitest/ajax/scriptaculous/test_Scriptaculous.html": "debug-only failure", + "dom/tests/mochitest/ajax/prototype/test_Prototype.html": "debug-only timeout", + "dom/tests/mochitest/geolocation/test_errorcheck.html": "debug-only timeout", + "dom/tests/mochitest/localstorage/test_cookieSession.html": "debug-only failure", + "dom/tests/mochitest/orientation/test_bug507902.html": "debug-only failure", + "dom/workers/test/test_csp.html": "debug-only failure", + "dom/workers/test/test_url.html": "debug-only crash, bug 931887", + "dom/workers/test/test_jsversion.html": "debug-only failure", + "layout/forms/test/test_bug542914.html": "debug-only failure", + "layout/base/tests/test_reftests_with_caret.html": "debug-only timeout", + "layout/generic/test/test_bug448860.html": "debug-only failure", + "layout/style/test/test_media_queries.html": "debug-only failure; timed out", + "layout/style/test/test_selectors.html": "debug-only failure; timed out", + "layout/style/test/test_value_cloning.html": "debug-only failure; timed out", + "layout/style/test/test_value_computation.html": "debug-only failure", + "layout/style/test/test_value_storage.html": "debug-only failure", + "layout/style/test/test_pseudoelement_state.html": "debug-only failure" } } From bc858b61d1b1329362ec5e95caaff87884498114 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 9 Jan 2014 12:40:29 -0800 Subject: [PATCH 03/40] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/dc152a32d508 Author: Andrew Sutherland Desc: Merge pull request #15127 from asutherland/163-imap Bug 951076 - [fugu][buri] Force 163.com to use IMAP with custom autoconfig because the AutoDiscovered ActiveSync implementation deviates from standard. r=mcav ======== https://hg.mozilla.org/integration/gaia-central/rev/f7514a5dff23 Author: Andrew Sutherland Desc: Bug 951076 - [fugu][buri] Force 163.com to use IMAP with custom autoconfig because the AutoDiscovered ActiveSync implementation deviates from standard. --- 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 d20b288d90f6..d6c087b10238 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "f871f45dc2e24b0d39261e21d8e413d9ebca8304", + "revision": "dc152a32d5085acb097ffc58d236c88b05664684", "repo_path": "/integration/gaia-central" } From 9d5f5047d70814ffe43416297bbe19c99a06ada3 Mon Sep 17 00:00:00 2001 From: Clayton Hughes Date: Fri, 1 Nov 2013 18:02:31 -0700 Subject: [PATCH 04/40] Bug 931424 - Fix AutoMounter to use AutoRestore instead of AutoBool. r=dhylands --- dom/system/gonk/AutoMounter.cpp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dom/system/gonk/AutoMounter.cpp b/dom/system/gonk/AutoMounter.cpp index 4ed891820ac8..af1e6c849a4c 100644 --- a/dom/system/gonk/AutoMounter.cpp +++ b/dom/system/gonk/AutoMounter.cpp @@ -21,6 +21,7 @@ #include "nsVolumeService.h" #include "AutoMounterSetting.h" #include "base/message_loop.h" +#include "mozilla/AutoRestore.h" #include "mozilla/FileUtils.h" #include "mozilla/Hal.h" #include "mozilla/StaticPtr.h" @@ -331,20 +332,6 @@ AutoMounterResponseCallback::ResponseReceived(const VolumeCommand* aCommand) } } -class AutoBool { -public: - explicit AutoBool(bool &aBool) : mBool(aBool) { - mBool = true; - } - - ~AutoBool() { - mBool = false; - } - -private: - bool &mBool; -}; - /***************************************************************************/ void @@ -360,7 +347,8 @@ AutoMounter::UpdateState() // things up. return; } - AutoBool inUpdateStateDetector(inUpdateState); + AutoRestore inUpdateStateDetector(inUpdateState); + inUpdateState = true; MOZ_ASSERT(MessageLoop::current() == XRE_GetIOMessageLoop()); From 434db77ed5bc1299ff5bcb0d715281cd036a73cb Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 9 Jan 2014 13:20:28 -0800 Subject: [PATCH 05/40] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/6dd2c8bd9a82 Author: Jose M. Cantera Desc: Merge pull request #15072 from jmcanterafonseca/sim_export_full Bug 949594 - [B2G][Contacts] The user will get stuck on the export scree... ======== https://hg.mozilla.org/integration/gaia-central/rev/5dc5e745d1be Author: Jose M. Cantera Desc: Bug 949594 - [B2G][Contacts] The user will get stuck on the export screen when exporting contacts to the SIM that has no space available for the exported contacts --- 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 d6c087b10238..e23fa39aed57 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "dc152a32d5085acb097ffc58d236c88b05664684", + "revision": "6dd2c8bd9a82c019d635762e28ba3ff076ea157c", "repo_path": "/integration/gaia-central" } From 4b8a847e745756883541fb8cb8a3736e1488bb90 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 9 Jan 2014 13:30:18 -0800 Subject: [PATCH 06/40] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/62905c39e74e Author: Diego Marcos Desc: Merge pull request #15123 from dmarcos/bug934657 Bug 934657 - [Camera] Restructuring code following model / view pattern ======== https://hg.mozilla.org/integration/gaia-central/rev/9bec90f44f1b Author: Diego Marcos Desc: Bug 934657 - [Camera] Restructuring code following model / view pattern --- 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 e23fa39aed57..bef22ca3af95 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "6dd2c8bd9a82c019d635762e28ba3ff076ea157c", + "revision": "62905c39e74ed3d325e76bc4c61bbecaae8e7635", "repo_path": "/integration/gaia-central" } From 939cbd71ae9fe45ae90a446149e66765f8e41bf2 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 9 Jan 2014 14:05:18 -0800 Subject: [PATCH 07/40] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/65b86877ca39 Author: Mason Chang Desc: Merge pull request #15164 from changm/bug957913 Bug 957913 Async Load submodules of connectivity. r+ :kaze ======== https://hg.mozilla.org/integration/gaia-central/rev/7944fd7e464e Author: Mason Chang Desc: Bug 957913 Async Load submodules of connectivity --- 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 bef22ca3af95..6051bc87d238 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "62905c39e74ed3d325e76bc4c61bbecaae8e7635", + "revision": "65b86877ca39765f2777bf68db5c94453f51dbf8", "repo_path": "/integration/gaia-central" } From 39a69e390dd437c0c34a2c062c8a8be46ae48850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= Date: Thu, 9 Jan 2014 14:06:02 -0800 Subject: [PATCH 08/40] Bug 958250 - Improve lazy loading in TelemetryPing.js r=nfroyd --- toolkit/components/telemetry/TelemetryPing.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/toolkit/components/telemetry/TelemetryPing.js b/toolkit/components/telemetry/TelemetryPing.js index b265432610ac..fd560125227f 100644 --- a/toolkit/components/telemetry/TelemetryPing.js +++ b/toolkit/components/telemetry/TelemetryPing.js @@ -14,10 +14,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm"); #ifndef MOZ_WIDGET_GONK Cu.import("resource://gre/modules/LightweightThemeManager.jsm"); #endif -Cu.import("resource://gre/modules/ctypes.jsm"); Cu.import("resource://gre/modules/ThirdPartyCookieProbe.jsm"); -Cu.import("resource://gre/modules/TelemetryFile.jsm"); -Cu.import("resource://gre/modules/UITelemetry.jsm"); // When modifying the payload in incompatible ways, please bump this version number const PAYLOAD_VERSION = 1; @@ -67,6 +64,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "UpdateChannel", "resource://gre/modules/UpdateChannel.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "AddonManagerPrivate", "resource://gre/modules/AddonManager.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "TelemetryFile", + "resource://gre/modules/TelemetryFile.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "UITelemetry", "resource://gre/modules/UITelemetry.jsm"); @@ -93,6 +92,7 @@ let processInfo = { }, getCounters_Windows: function() { if (!this._initialized){ + Cu.import("resource://gre/modules/ctypes.jsm"); this._IO_COUNTERS = new ctypes.StructType("IO_COUNTERS", [ {'readOps': ctypes.unsigned_long_long}, {'writeOps': ctypes.unsigned_long_long}, From b01b3d73a3fa170cba2201bd10322167016bd97d Mon Sep 17 00:00:00 2001 From: Botond Ballo Date: Thu, 9 Jan 2014 16:54:34 -0500 Subject: [PATCH 09/40] Bug 958254 - Remove an unnecessary (and harmful) assertion. r=ajones --- dom/ipc/TabChild.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index 8ecec17bdbec..709371d5c2fd 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -590,7 +590,6 @@ TabChild::HandlePossibleViewportChange() // by AsyncPanZoomController and causes a blurry flash. bool isFirstPaint; nsresult rv = utils->GetIsFirstPaint(&isFirstPaint); - MOZ_ASSERT(NS_SUCCEEDED(rv)); if (NS_FAILED(rv) || isFirstPaint) { // FIXME/bug 799585(?): GetViewportInfo() returns a defaultZoom of // 0.0 to mean "did not calculate a zoom". In that case, we default From dde97d99ed11e6c861092106e32cc94e292f421a Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 9 Jan 2014 14:55:29 -0800 Subject: [PATCH 10/40] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8e359c1f4fef Author: Pavel Ivanov Desc: Merge pull request #14668 from pivanov/bug-946625 Bug 946625 - [Settings - Email Settings] Toggles have incorrect right margin ======== https://hg.mozilla.org/integration/gaia-central/rev/21246f8af939 Author: Pavel Ivanov Desc: Bug 946625 - [Settings - Email Settings] Toggles have incorrect right margin --- 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 6051bc87d238..a437f5a4c5e0 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "65b86877ca39765f2777bf68db5c94453f51dbf8", + "revision": "8e359c1f4fef8d7449c923fa6457e1c4ef2228ea", "repo_path": "/integration/gaia-central" } From faa2de939fd9d3fd9366dd2ba7eda3fe58de9c72 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 9 Jan 2014 15:20:25 -0800 Subject: [PATCH 11/40] Bumping gaia.json for 8 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4e77ad67bf73 Author: Pavel Ivanov Desc: Merge pull request #14447 from pivanov/bug-947099 Bug 947099 - [Dialer] Update tab bar to new 1.3 visual designs ======== https://hg.mozilla.org/integration/gaia-central/rev/2796dde5f3bd Author: Pavel Ivanov Desc: Bug 947099 - [Dialer] Update tab bar to new 1.3 visual designs ======== https://hg.mozilla.org/integration/gaia-central/rev/5986e9b97933 Author: Pavel Ivanov Desc: Merge pull request #14446 from pivanov/bug-947097 Bug 947097 - [Clock] Update tabs to use the new 1.3 designs ======== https://hg.mozilla.org/integration/gaia-central/rev/bc9ef5fe7284 Author: Pavel Ivanov Desc: Bug 947097 - [Clock] Update tabs to use the new 1.3 designs ======== https://hg.mozilla.org/integration/gaia-central/rev/23be9f994677 Author: Pavel Ivanov Desc: Merge pull request #14443 from pivanov/bug-947094 Bug 947094 - [Calendar] Update tool bar and tab bar designs ======== https://hg.mozilla.org/integration/gaia-central/rev/eca3d9f5d8fa Author: Pavel Ivanov Desc: Bug 947094 - [Calendar] Update tool bar and tab bar designs ======== https://hg.mozilla.org/integration/gaia-central/rev/b3e0cdb79ae8 Author: Pavel Ivanov Desc: Merge pull request #14444 from pivanov/bug-947093 Bug 947093 - [BB] Update toolbar and tab bar building blocks ======== https://hg.mozilla.org/integration/gaia-central/rev/7e41406539d5 Author: Pavel Ivanov Desc: Bug 947093 - [BB] Update toolbar and tab bar building blocks --- 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 a437f5a4c5e0..d7a88b661c8f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "8e359c1f4fef8d7449c923fa6457e1c4ef2228ea", + "revision": "4e77ad67bf73b2186411b95fa2bc723c464bc7dd", "repo_path": "/integration/gaia-central" } From b8555e13300c249a0beb0461cd1cc1f08a336837 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 9 Jan 2014 15:35:30 -0800 Subject: [PATCH 12/40] Bumping gaia.json for 6 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/da6be4c77e54 Author: Pavel Ivanov Desc: Merge pull request #14445 from pivanov/bug-947095 Bug 947095 - [Email] Update to new light 1.3 tool bar design ======== https://hg.mozilla.org/integration/gaia-central/rev/27cf8ac00b4b Author: Pavel Ivanov Desc: Bug 947095 - [Email] Update to new light 1.3 tool bar design ======== https://hg.mozilla.org/integration/gaia-central/rev/f7d525bc9297 Author: Pavel Ivanov Desc: Merge pull request #14449 from pivanov/bug-947104 Bug 947104 - [Music] Update to new 1.3 tab bar visual design ======== https://hg.mozilla.org/integration/gaia-central/rev/ccebd25a7121 Author: Pavel Ivanov Desc: Bug 947104 - [Music] Update to new 1.3 tab bar visual design ======== https://hg.mozilla.org/integration/gaia-central/rev/3c1c7938854f Author: Pavel Ivanov Desc: Merge pull request #14450 from pivanov/bug-947106 Bug 947106 - [Browser] Update toolbar in browser to updated 1.3 visual designs ======== https://hg.mozilla.org/integration/gaia-central/rev/70ff5fd6f1dd Author: Pavel Ivanov Desc: Bug 947106 - [Browser] Update toolbar in browser to updated 1.3 visual designs --- 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 d7a88b661c8f..ba95afe443de 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "4e77ad67bf73b2186411b95fa2bc723c464bc7dd", + "revision": "da6be4c77e548c3edf17aecd2b8735598ced501e", "repo_path": "/integration/gaia-central" } From 5cd4f91a7759abb253ec66ddf35e0ec677cd9221 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 9 Jan 2014 16:00:24 -0800 Subject: [PATCH 13/40] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/59a671836550 Author: Pavel Ivanov Desc: Merge pull request #15174 from pivanov/bug-947099-followup follow up patch for Bug 947099 - [Dialer] ======== https://hg.mozilla.org/integration/gaia-central/rev/5a194f6dcf52 Author: Pavel Ivanov Desc: follow up patch for Bug 947099 - [Dialer] --- 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 ba95afe443de..884215aed6cc 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "da6be4c77e548c3edf17aecd2b8735598ced501e", + "revision": "59a6718365502294c605c4852b55a7718a512e93", "repo_path": "/integration/gaia-central" } From 8652ff1dd5addda2a92cf9959e8e897f00d1222b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= Date: Thu, 9 Jan 2014 16:32:19 -0800 Subject: [PATCH 14/40] Bug 957241 - Don't package the full sdk when we don't need it r=gps --- addon-sdk/Makefile.in | 8 +++++++- addon-sdk/copy_source.py | 21 +++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/addon-sdk/Makefile.in b/addon-sdk/Makefile.in index c4b3ee11d307..6e893381d28f 100644 --- a/addon-sdk/Makefile.in +++ b/addon-sdk/Makefile.in @@ -4,8 +4,14 @@ include $(topsrcdir)/config/config.mk +ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) +MOZ_B2G=1 +else +MOZ_B2G=0 +endif + libs:: - $(PYTHON) $(srcdir)/copy_source.py $(topsrcdir) $(srcdir)/source/lib $(FINAL_TARGET)/modules/commonjs >copy_source.mk + $(PYTHON) $(srcdir)/copy_source.py $(topsrcdir) $(srcdir)/source/lib $(FINAL_TARGET)/modules/commonjs $(MOZ_B2G) >copy_source.mk $(MAKE) -f copy_source.mk libs include $(topsrcdir)/config/rules.mk diff --git a/addon-sdk/copy_source.py b/addon-sdk/copy_source.py index 2710eca103ba..e504f556e9ac 100644 --- a/addon-sdk/copy_source.py +++ b/addon-sdk/copy_source.py @@ -5,14 +5,15 @@ import os import sys -if len(sys.argv) != 4: +if len(sys.argv) != 5: print >> sys.stderr, "Usage: copy_source.py " \ - " " + " " sys.exit(1) topsrcdir = sys.argv[1] source_dir = sys.argv[2] target_dir = sys.argv[3] +isB2G = sys.argv[4] print """ DEPTH = .. @@ -35,6 +36,22 @@ for dirpath, dirnames, filenames in os.walk(real_source): continue dirpath = dirpath.replace(os.sep, '/') relative = dirpath[len(source_dir):] + if isB2G and relative in [ + '/method/test', + '/sdk/ui', + '/sdk/ui/button', + '/sdk/ui/sidebar', + '/sdk/places', + '/sdk/places/host', + '/sdk/tabs', + '/sdk/panel', + '/sdk/frame', + '/sdk/test', + '/sdk/window', + '/sdk/windows', + '/sdk/deprecated', + ]: + continue varname = "COMMONJS%s" % relative.replace('/', '_') print "%s_FILES = \\" % varname for name in filenames: From 4110b86321f6eadecba641b630974c6222d287e6 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 9 Jan 2014 17:25:16 -0800 Subject: [PATCH 15/40] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/04a42c857f3d Author: Pavel Ivanov Desc: Merge pull request #15179 from pivanov/bug-947099-followup-2 follow up patch for Bug 947099 - [Dialer] ======== https://hg.mozilla.org/integration/gaia-central/rev/0e89a77fe081 Author: Pavel Ivanov Desc: follow up patch for Bug 947099 - [Dialer] ======== https://hg.mozilla.org/integration/gaia-central/rev/24347af51f8d Author: Pavel Ivanov Desc: Merge pull request #15177 from pivanov/bug-947094-followup follow up patch for Bug 947094 - [Calendar] ======== https://hg.mozilla.org/integration/gaia-central/rev/429aaf5fb3ed Author: Pavel Ivanov Desc: follow up patch for Bug 947094 - [Calendar] --- 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 884215aed6cc..01c1486c0356 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "59a6718365502294c605c4852b55a7718a512e93", + "revision": "04a42c857f3da6cb2ee57a0884c4771732a63579", "repo_path": "/integration/gaia-central" } From 92c451b823dd57a806978d9e2ce69268ec3c010d Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 9 Jan 2014 17:40:18 -0800 Subject: [PATCH 16/40] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ee4c88f58d3d Author: Gareth Aye Desc: Merge pull request #15082 from gaye/bug-956064 Bug 956064 - Reenable today and week view calendar tests ======== https://hg.mozilla.org/integration/gaia-central/rev/15023f00b160 Author: Gareth Aye Desc: Bug 956064 - Reenable today and week view calendar tests --- 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 01c1486c0356..2933ab228789 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "04a42c857f3da6cb2ee57a0884c4771732a63579", + "revision": "ee4c88f58d3d1ed278a88fc6b8f28584e1b209ea", "repo_path": "/integration/gaia-central" } From 056b4181d152bb3daeb0717913d663b90c9b4f3f Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 9 Jan 2014 17:50:16 -0800 Subject: [PATCH 17/40] Bumping gaia.json for 2 gaia-central 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/4c17313c6f22 Author: Fabrice Desré Desc: Merge pull request #15173 from fabricedesre/adb-debug-only Bug 956185 - Add a 'adb only' debugging option r=kaze ======== https://hg.mozilla.org/integration/gaia-central/rev/a29eec4d4061 Author: Fabrice Desre Desc: Bug 956185 - Add a 'adb only' debugging option r=kaze --- 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 2933ab228789..c4f53daf6fea 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "ee4c88f58d3d1ed278a88fc6b8f28584e1b209ea", + "revision": "4c17313c6f225cf317dde22bdfabad16758d1934", "repo_path": "/integration/gaia-central" } From d7e0e58772b9e3258832ae77ead4245dffbd8d60 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 9 Jan 2014 18:30:16 -0800 Subject: [PATCH 18/40] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a90ab6c6ba17 Author: James Burke Desc: Merge pull request #14737 from jrburke/bug950588-email-missing-folder-list Bug 950588 - [Email][V1.3] Cannot get the folder list while you want to move multiple mails r=gaye ======== https://hg.mozilla.org/integration/gaia-central/rev/fc9cf6fdaef3 Author: jrburke Desc: Bug 950588 - [Email][V1.3] Cannot get the folder list while you want to move multiple mails --- 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 c4f53daf6fea..b21b18c796c6 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "4c17313c6f225cf317dde22bdfabad16758d1934", + "revision": "a90ab6c6ba171fd623340f88ae582169b15249ff", "repo_path": "/integration/gaia-central" } From c8b9c64f7f3164a85fd114afc5ef09f38777cb51 Mon Sep 17 00:00:00 2001 From: Wes Kocher Date: Thu, 9 Jan 2014 19:08:25 -0800 Subject: [PATCH 19/40] Backed out changeset 9da8bc670c03 (bug 957241) for frequent intermittent m-bc orange --- addon-sdk/Makefile.in | 8 +------- addon-sdk/copy_source.py | 21 ++------------------- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/addon-sdk/Makefile.in b/addon-sdk/Makefile.in index 6e893381d28f..c4b3ee11d307 100644 --- a/addon-sdk/Makefile.in +++ b/addon-sdk/Makefile.in @@ -4,14 +4,8 @@ include $(topsrcdir)/config/config.mk -ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) -MOZ_B2G=1 -else -MOZ_B2G=0 -endif - libs:: - $(PYTHON) $(srcdir)/copy_source.py $(topsrcdir) $(srcdir)/source/lib $(FINAL_TARGET)/modules/commonjs $(MOZ_B2G) >copy_source.mk + $(PYTHON) $(srcdir)/copy_source.py $(topsrcdir) $(srcdir)/source/lib $(FINAL_TARGET)/modules/commonjs >copy_source.mk $(MAKE) -f copy_source.mk libs include $(topsrcdir)/config/rules.mk diff --git a/addon-sdk/copy_source.py b/addon-sdk/copy_source.py index e504f556e9ac..2710eca103ba 100644 --- a/addon-sdk/copy_source.py +++ b/addon-sdk/copy_source.py @@ -5,15 +5,14 @@ import os import sys -if len(sys.argv) != 5: +if len(sys.argv) != 4: print >> sys.stderr, "Usage: copy_source.py " \ - " " + " " sys.exit(1) topsrcdir = sys.argv[1] source_dir = sys.argv[2] target_dir = sys.argv[3] -isB2G = sys.argv[4] print """ DEPTH = .. @@ -36,22 +35,6 @@ for dirpath, dirnames, filenames in os.walk(real_source): continue dirpath = dirpath.replace(os.sep, '/') relative = dirpath[len(source_dir):] - if isB2G and relative in [ - '/method/test', - '/sdk/ui', - '/sdk/ui/button', - '/sdk/ui/sidebar', - '/sdk/places', - '/sdk/places/host', - '/sdk/tabs', - '/sdk/panel', - '/sdk/frame', - '/sdk/test', - '/sdk/window', - '/sdk/windows', - '/sdk/deprecated', - ]: - continue varname = "COMMONJS%s" % relative.replace('/', '_') print "%s_FILES = \\" % varname for name in filenames: From 035fe650a590b2c1db07366b4cea8cecec744a9c Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 9 Jan 2014 19:16:18 -0800 Subject: [PATCH 20/40] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/0df65f0ba82a Author: Rudy Lu Desc: Merge pull request #15147 from Seinlin/Bug-953050 Bug 953050 - Not to do Uppercase conversion for Myanmar keyboard layout. r=rudylu ======== https://hg.mozilla.org/integration/gaia-central/rev/e64dcafee2c8 Author: Kai-Zhen Li Desc: Bug 953050 - Not to do Uppercase conversion for Myanmar keyboard layout. --- 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 b21b18c796c6..83d84d3e9cea 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "a90ab6c6ba171fd623340f88ae582169b15249ff", + "revision": "0df65f0ba82a66dbdfd8c6f6979f738d5da04304", "repo_path": "/integration/gaia-central" } From f5de2cc4fd13a1cfde3fbaad3eb1fc2a4f526843 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 9 Jan 2014 19:45:17 -0800 Subject: [PATCH 21/40] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/df2257cbb908 Author: Dominic Kuo Desc: Merge pull request #15141 from dominickuo/bug-949845 Bug 949845 - [music] hide the cover controls for music open activity, r=jimporter ======== https://hg.mozilla.org/integration/gaia-central/rev/4a16437a10bf Author: Dominic Kuo Desc: Bug 949845 - [music] hide the cover controls for music open activity ======== https://hg.mozilla.org/integration/gaia-central/rev/9eb641e673cb Author: Ryan VanderMeulen Desc: Merge pull request #14122 from svic/handover Bug 933093 - Implementation of HandoverManager for file transfer ======== https://hg.mozilla.org/integration/gaia-central/rev/e9202e371702 Author: Arno Puder Desc: Bug 933093 - Implementation of HandoverManager for file transfer --- 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 83d84d3e9cea..c35986996bad 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "0df65f0ba82a66dbdfd8c6f6979f738d5da04304", + "revision": "df2257cbb90872b67ff5abe50ae283f3e39453d1", "repo_path": "/integration/gaia-central" } From 8c2d6efd0b5d690f4af5199f6f6c65c802026fc4 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 9 Jan 2014 22:11:17 -0800 Subject: [PATCH 22/40] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/0790c974385d Author: Arthur Chen Desc: Merge pull request #14957 from crh0716/909266 Bug 909266 - Add settings helper for roaming perference r=alive, jaoo ======== https://hg.mozilla.org/integration/gaia-central/rev/b331fc595656 Author: Arthur Chen Desc: Bug 909266 - Add settings helper for roaming perference ======== https://hg.mozilla.org/integration/gaia-central/rev/fae8f318c43e Author: Kevin Grandon Desc: Merge pull request #15131 from KevinGrandon/bug_957930_clear_results_on_close Bug 957930 - [Search] Old results should not display when opening the search app r=daleharvey,benfrancis ======== https://hg.mozilla.org/integration/gaia-central/rev/fbc6ff5bc164 Author: Kevin Grandon Desc: Bug 957930 - [Search] Results should clear after closing the search app --- 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 c35986996bad..389224a5e036 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "df2257cbb90872b67ff5abe50ae283f3e39453d1", + "revision": "0790c974385ddebcef1515e437c7bceece900739", "repo_path": "/integration/gaia-central" } From 6cb58d14fe755b223433d4e8ee7e0c91ae9a21e3 Mon Sep 17 00:00:00 2001 From: Vincent Chang Date: Fri, 10 Jan 2014 10:39:13 +0800 Subject: [PATCH 23/40] Bug 957572 - Wifi failed to Turn on after Wifi-Hotspot is turned on/off. r=chulee --- dom/wifi/WifiWorker.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dom/wifi/WifiWorker.js b/dom/wifi/WifiWorker.js index 47b2b22c1056..a4bd519b1675 100644 --- a/dom/wifi/WifiWorker.js +++ b/dom/wifi/WifiWorker.js @@ -192,20 +192,24 @@ var WifiManager = (function() { }); } - function unloadDriver(callback) { + function unloadDriver(type, callback) { if (!unloadDriverEnabled) { // Unloading drivers is generally unnecessary and // can trigger bugs in some drivers. // On properly written drivers, bringing the interface // down powers down the interface. - notify("supplicantlost", { success: true }); + if (type === WIFI_FIRMWARE_STATION) { + notify("supplicantlost", { success: true }); + } callback(0); return; } wifiCommand.unloadDriver(function(status) { driverLoaded = (status < 0); - notify("supplicantlost", { success: true }); + if (type === WIFI_FIRMWARE_STATION) { + notify("supplicantlost", { success: true }); + } callback(status); }); } @@ -879,7 +883,7 @@ var WifiManager = (function() { cancelWaitForDriverReadyTimer(); wifiCommand.startSupplicant(function (status) { if (status < 0) { - unloadDriver(function() { + unloadDriver(WIFI_FIRMWARE_STATION, function() { callback(status); }); manager.state = "UNINITIALIZED"; @@ -914,7 +918,7 @@ var WifiManager = (function() { wifiCommand.closeSupplicantConnection(function () { manager.state = "UNINITIALIZED"; netUtil.disableInterface(manager.ifname, function (ok) { - unloadDriver(callback); + unloadDriver(WIFI_FIRMWARE_STATION, callback); }); }); }); @@ -962,7 +966,7 @@ var WifiManager = (function() { // Should we fire a dom event if we fail to set wifi tethering ? debug("Disable Wifi tethering result: " + (result ? result : "successfully")); // Unload wifi driver even if we fail to control wifi tethering. - unloadDriver(function(status) { + unloadDriver(WIFI_FIRMWARE_AP, function(status) { if (status < 0) { debug("Fail to unload wifi driver"); } From 5683863a86a747e38a1a053fcd2af3e6610d4b68 Mon Sep 17 00:00:00 2001 From: Michael Wu Date: Fri, 10 Jan 2014 14:48:18 +0800 Subject: [PATCH 24/40] Bug 958383 - Make gonk nsWindow::Destroy act like other implementations, r=roc --- widget/gonk/nsWindow.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/widget/gonk/nsWindow.cpp b/widget/gonk/nsWindow.cpp index ef8dc7be08ba..490e42bbfbe9 100644 --- a/widget/gonk/nsWindow.cpp +++ b/widget/gonk/nsWindow.cpp @@ -301,11 +301,13 @@ nsWindow::Create(nsIWidget *aParent, NS_IMETHODIMP nsWindow::Destroy(void) { + mOnDestroyCalled = true; sTopWindows.RemoveElement(this); if (this == gWindowToRedraw) gWindowToRedraw = nullptr; if (this == gFocusedWindow) gFocusedWindow = nullptr; + nsBaseWidget::OnDestroy(); return NS_OK; } From ac2a05d6a2a1ba63bc846b4a295116aff90d9c3a Mon Sep 17 00:00:00 2001 From: Ben Tian Date: Fri, 10 Jan 2014 09:34:43 +0800 Subject: [PATCH 25/40] Bug 956258 - [cleanup] Patch 1/2: rename g* variables to s* ones, r=echou --- dom/bluetooth/BluetoothService.cpp | 60 +++++++++---------- dom/bluetooth/ipc/BluetoothChild.cpp | 22 +++---- dom/bluetooth/ipc/BluetoothParent.cpp | 2 +- .../ipc/BluetoothServiceChildProcess.cpp | 32 +++++----- 4 files changed, 58 insertions(+), 58 deletions(-) diff --git a/dom/bluetooth/BluetoothService.cpp b/dom/bluetooth/BluetoothService.cpp index 3a4d7aa32b60..243c89f43f26 100644 --- a/dom/bluetooth/BluetoothService.cpp +++ b/dom/bluetooth/BluetoothService.cpp @@ -83,10 +83,10 @@ USING_BLUETOOTH_NAMESPACE namespace { -StaticRefPtr gBluetoothService; +StaticRefPtr sBluetoothService; -bool gInShutdown = false; -bool gToggleInProgress = false; +bool sInShutdown = false; +bool sToggleInProgress = false; bool IsMainProcess() @@ -145,26 +145,26 @@ public: { MOZ_ASSERT(NS_IsMainThread()); - NS_ENSURE_TRUE(gBluetoothService, NS_OK); + NS_ENSURE_TRUE(sBluetoothService, NS_OK); - if (gInShutdown) { - gBluetoothService = nullptr; + if (sInShutdown) { + sBluetoothService = nullptr; return NS_OK; } // Update mEnabled of BluetoothService object since // StartInternal/StopInternal have been already done. - gBluetoothService->SetEnabled(mEnabled); - gToggleInProgress = false; + sBluetoothService->SetEnabled(mEnabled); + sToggleInProgress = false; nsAutoString signalName; signalName = mEnabled ? NS_LITERAL_STRING("Enabled") : NS_LITERAL_STRING("Disabled"); BluetoothSignal signal(signalName, NS_LITERAL_STRING(KEY_MANAGER), true); - gBluetoothService->DistributeSignal(signal); + sBluetoothService->DistributeSignal(signal); // Event 'AdapterAdded' has to be fired after firing 'Enabled' - gBluetoothService->TryFiringAdapterAdded(); + sBluetoothService->TryFiringAdapterAdded(); return NS_OK; } @@ -189,7 +189,7 @@ public: /** * mEnabled: expected status of bluetooth - * gBluetoothService->IsEnabled(): real status of bluetooth + * sBluetoothService->IsEnabled(): real status of bluetooth * * When two values are the same, we don't switch on/off bluetooth * but we still do ToggleBtAck task. One special case happens at startup @@ -198,17 +198,17 @@ public: * * Please see bug 892392 for more information. */ - if (!mIsStartup && mEnabled == gBluetoothService->IsEnabledInternal()) { + if (!mIsStartup && mEnabled == sBluetoothService->IsEnabledInternal()) { BT_WARNING("Bluetooth has already been enabled/disabled before."); } else { // Switch on/off bluetooth if (mEnabled) { - if (NS_FAILED(gBluetoothService->StartInternal())) { + if (NS_FAILED(sBluetoothService->StartInternal())) { BT_WARNING("Bluetooth service failed to start!"); mEnabled = !mEnabled; } } else { - if (NS_FAILED(gBluetoothService->StopInternal())) { + if (NS_FAILED(sBluetoothService->StopInternal())) { BT_WARNING("Bluetooth service failed to stop!"); mEnabled = !mEnabled; } @@ -257,8 +257,8 @@ public: // It is theoretically possible to shut down before the first settings check // has completed (though extremely unlikely). - if (gBluetoothService) { - return gBluetoothService->HandleStartupSettingsCheck(aResult.toBoolean()); + if (sBluetoothService) { + return sBluetoothService->HandleStartupSettingsCheck(aResult.toBoolean()); } return NS_OK; @@ -278,7 +278,7 @@ NS_IMPL_ISUPPORTS1(BluetoothService, nsIObserver) bool BluetoothService::IsToggling() const { - return gToggleInProgress; + return sToggleInProgress; } BluetoothService::~BluetoothService() @@ -463,7 +463,7 @@ BluetoothService::StartStopBluetooth(bool aStart, bool aIsStartup) { MOZ_ASSERT(NS_IsMainThread()); - if (gInShutdown) { + if (sInShutdown) { if (aStart) { // Don't try to start if we're already shutting down. MOZ_ASSERT(false, "Start called while in shutdown!"); @@ -547,8 +547,8 @@ BluetoothService::SetEnabled(bool aEnabled) * aEnabled: expected status of bluetooth */ if (mEnabled == aEnabled) { - BT_WARNING("Bluetooth has already been enabled/disabled before\ - or the toggling is failed."); + BT_WARNING("Bluetooth has already been enabled/disabled before" + "or the toggling is failed."); } mEnabled = aEnabled; @@ -558,7 +558,7 @@ nsresult BluetoothService::HandleStartup() { MOZ_ASSERT(NS_IsMainThread()); - MOZ_ASSERT(!gToggleInProgress); + MOZ_ASSERT(!sToggleInProgress); nsCOMPtr settings = do_GetService("@mozilla.org/settingsService;1"); @@ -572,7 +572,7 @@ BluetoothService::HandleStartup() rv = settingsLock->Get(BLUETOOTH_ENABLED_SETTING, callback); NS_ENSURE_SUCCESS(rv, rv); - gToggleInProgress = true; + sToggleInProgress = true; return NS_OK; } @@ -659,12 +659,12 @@ BluetoothService::HandleSettingsChanged(const nsAString& aData) return NS_ERROR_UNEXPECTED; } - if (gToggleInProgress || value.toBoolean() == IsEnabled()) { + if (sToggleInProgress || value.toBoolean() == IsEnabled()) { // Nothing to do here. return NS_OK; } - gToggleInProgress = true; + sToggleInProgress = true; nsresult rv = StartStopBluetooth(value.toBoolean(), false); NS_ENSURE_SUCCESS(rv, rv); @@ -682,7 +682,7 @@ BluetoothService::HandleShutdown() // bluetooth is going away, and then we wait for them to acknowledge. Then we // close down all the bluetooth machinery. - gInShutdown = true; + sInShutdown = true; Cleanup(); @@ -745,12 +745,12 @@ BluetoothService::Get() MOZ_ASSERT(NS_IsMainThread()); // If we already exist, exit early - if (gBluetoothService) { - return gBluetoothService; + if (sBluetoothService) { + return sBluetoothService; } // If we're in shutdown, don't create a new instance - if (gInShutdown) { + if (sInShutdown) { BT_WARNING("BluetoothService can't be created during shutdown"); return nullptr; } @@ -764,8 +764,8 @@ BluetoothService::Get() return nullptr; } - gBluetoothService = service; - return gBluetoothService; + sBluetoothService = service; + return sBluetoothService; } nsresult diff --git a/dom/bluetooth/ipc/BluetoothChild.cpp b/dom/bluetooth/ipc/BluetoothChild.cpp index 1bbd6b10ce61..6847c42854a8 100644 --- a/dom/bluetooth/ipc/BluetoothChild.cpp +++ b/dom/bluetooth/ipc/BluetoothChild.cpp @@ -21,7 +21,7 @@ USING_BLUETOOTH_NAMESPACE namespace { -BluetoothServiceChildProcess* gBluetoothService; +BluetoothServiceChildProcess* sBluetoothService; } // anonymous namespace @@ -33,19 +33,19 @@ BluetoothChild::BluetoothChild(BluetoothServiceChildProcess* aBluetoothService) : mShutdownState(Running) { MOZ_COUNT_CTOR(BluetoothChild); - MOZ_ASSERT(!gBluetoothService); + MOZ_ASSERT(!sBluetoothService); MOZ_ASSERT(aBluetoothService); - gBluetoothService = aBluetoothService; + sBluetoothService = aBluetoothService; } BluetoothChild::~BluetoothChild() { MOZ_COUNT_DTOR(BluetoothChild); - MOZ_ASSERT(gBluetoothService); + MOZ_ASSERT(sBluetoothService); MOZ_ASSERT(mShutdownState == Dead); - gBluetoothService = nullptr; + sBluetoothService = nullptr; } void @@ -61,9 +61,9 @@ BluetoothChild::BeginShutdown() void BluetoothChild::ActorDestroy(ActorDestroyReason aWhy) { - MOZ_ASSERT(gBluetoothService); + MOZ_ASSERT(sBluetoothService); - gBluetoothService->NoteDeadActor(); + sBluetoothService->NoteDeadActor(); #ifdef DEBUG mShutdownState = Dead; @@ -73,18 +73,18 @@ BluetoothChild::ActorDestroy(ActorDestroyReason aWhy) bool BluetoothChild::RecvNotify(const BluetoothSignal& aSignal) { - MOZ_ASSERT(gBluetoothService); + MOZ_ASSERT(sBluetoothService); - gBluetoothService->DistributeSignal(aSignal); + sBluetoothService->DistributeSignal(aSignal); return true; } bool BluetoothChild::RecvEnabled(const bool& aEnabled) { - MOZ_ASSERT(gBluetoothService); + MOZ_ASSERT(sBluetoothService); - gBluetoothService->SetEnabled(aEnabled); + sBluetoothService->SetEnabled(aEnabled); return true; } diff --git a/dom/bluetooth/ipc/BluetoothParent.cpp b/dom/bluetooth/ipc/BluetoothParent.cpp index 2c9cc88d76f9..58aedd723219 100644 --- a/dom/bluetooth/ipc/BluetoothParent.cpp +++ b/dom/bluetooth/ipc/BluetoothParent.cpp @@ -403,7 +403,7 @@ BluetoothRequestParent::DoRequest(const ConnectedDevicePropertiesRequest& aReque MOZ_ASSERT(mRequestType == Request::TConnectedDevicePropertiesRequest); nsresult rv = mService->GetConnectedDevicePropertiesInternal(aRequest.serviceUuid(), - mReplyRunnable.get()); + mReplyRunnable.get()); NS_ENSURE_SUCCESS(rv, false); return true; diff --git a/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp b/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp index 2ad030201c84..391796d7744d 100644 --- a/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp +++ b/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp @@ -18,7 +18,7 @@ USING_BLUETOOTH_NAMESPACE namespace { -BluetoothChild* gBluetoothChild; +BluetoothChild* sBluetoothChild; inline void @@ -27,13 +27,13 @@ SendRequest(BluetoothReplyRunnable* aRunnable, const Request& aRequest) MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(aRunnable); - NS_WARN_IF_FALSE(gBluetoothChild, + NS_WARN_IF_FALSE(sBluetoothChild, "Calling methods on BluetoothServiceChildProcess during " "shutdown!"); - if (gBluetoothChild) { + if (sBluetoothChild) { BluetoothRequestChild* actor = new BluetoothRequestChild(aRunnable); - gBluetoothChild->SendPBluetoothRequestConstructor(actor, aRequest); + sBluetoothChild->SendPBluetoothRequestConstructor(actor, aRequest); } } @@ -43,7 +43,7 @@ SendRequest(BluetoothReplyRunnable* aRunnable, const Request& aRequest) BluetoothServiceChildProcess* BluetoothServiceChildProcess::Create() { - MOZ_ASSERT(!gBluetoothChild); + MOZ_ASSERT(!sBluetoothChild); mozilla::dom::ContentChild* contentChild = mozilla::dom::ContentChild::GetSingleton(); @@ -51,8 +51,8 @@ BluetoothServiceChildProcess::Create() BluetoothServiceChildProcess* btService = new BluetoothServiceChildProcess(); - gBluetoothChild = new BluetoothChild(btService); - contentChild->SendPBluetoothConstructor(gBluetoothChild); + sBluetoothChild = new BluetoothChild(btService); + contentChild->SendPBluetoothConstructor(sBluetoothChild); return btService; } @@ -63,14 +63,14 @@ BluetoothServiceChildProcess::BluetoothServiceChildProcess() BluetoothServiceChildProcess::~BluetoothServiceChildProcess() { - gBluetoothChild = nullptr; + sBluetoothChild = nullptr; } void BluetoothServiceChildProcess::NoteDeadActor() { - MOZ_ASSERT(gBluetoothChild); - gBluetoothChild = nullptr; + MOZ_ASSERT(sBluetoothChild); + sBluetoothChild = nullptr; } void @@ -78,8 +78,8 @@ BluetoothServiceChildProcess::RegisterBluetoothSignalHandler( const nsAString& aNodeName, BluetoothSignalObserver* aHandler) { - if (gBluetoothChild && !IsSignalRegistered(aNodeName)) { - gBluetoothChild->SendRegisterSignalHandler(nsString(aNodeName)); + if (sBluetoothChild && !IsSignalRegistered(aNodeName)) { + sBluetoothChild->SendRegisterSignalHandler(nsString(aNodeName)); } BluetoothService::RegisterBluetoothSignalHandler(aNodeName, aHandler); } @@ -90,8 +90,8 @@ BluetoothServiceChildProcess::UnregisterBluetoothSignalHandler( BluetoothSignalObserver* aHandler) { BluetoothService::UnregisterBluetoothSignalHandler(aNodeName, aHandler); - if (gBluetoothChild && !IsSignalRegistered(aNodeName)) { - gBluetoothChild->SendUnregisterSignalHandler(nsString(aNodeName)); + if (sBluetoothChild && !IsSignalRegistered(aNodeName)) { + sBluetoothChild->SendUnregisterSignalHandler(nsString(aNodeName)); } } @@ -361,8 +361,8 @@ BluetoothServiceChildProcess::HandleShutdown() { // If this process is shutting down then we need to disconnect ourselves from // the parent. - if (gBluetoothChild) { - gBluetoothChild->BeginShutdown(); + if (sBluetoothChild) { + sBluetoothChild->BeginShutdown(); } return NS_OK; } From 95cf96304b074b468f5bde6b5b02d179f8b105b7 Mon Sep 17 00:00:00 2001 From: Ben Tian Date: Fri, 3 Jan 2014 17:25:04 +0800 Subject: [PATCH 26/40] Bug 956258 - [cleanup] Patch 2/2: reduce warnings and remove cancel_discovery() in SendFile(), r=echou --- dom/bluetooth/bluedroid/BluetoothHfpManager.cpp | 12 ++++++------ dom/bluetooth/bluedroid/BluetoothOppManager.h | 6 ------ dom/bluetooth/bluedroid/BluetoothSocket.cpp | 14 +++++++++----- .../bluedroid/gonk/BluetoothServiceBluedroid.cpp | 14 +++++--------- dom/bluetooth/bluez/BluetoothHfpManager.cpp | 8 ++------ dom/bluetooth/bluez/BluetoothOppManager.h | 6 ------ 6 files changed, 22 insertions(+), 38 deletions(-) diff --git a/dom/bluetooth/bluedroid/BluetoothHfpManager.cpp b/dom/bluetooth/bluedroid/BluetoothHfpManager.cpp index 7abb61c9dd96..022c941497ab 100644 --- a/dom/bluetooth/bluedroid/BluetoothHfpManager.cpp +++ b/dom/bluetooth/bluedroid/BluetoothHfpManager.cpp @@ -570,9 +570,12 @@ BluetoothHfpManager::ProcessVolumeControl(bthf_volume_type_t aType, if (aType == BTHF_VOLUME_TYPE_MIC) { mCurrentVgm = aVolume; } else if (aType == BTHF_VOLUME_TYPE_SPK) { - // Adjust volume by headset mReceiveVgsFlag = true; - NS_ENSURE_TRUE_VOID(aVolume != mCurrentVgs); + + if (aVolume == mCurrentVgs) { + // Keep current volume + return; + } nsString data; data.AppendInt(aVolume); @@ -851,10 +854,7 @@ BluetoothHfpManager::HandleVoiceConnectionChanged(uint32_t aClientId) // Signal JS::Value value; voiceInfo->GetRelSignalStrength(&value); - if (!value.isNumber()) { - BT_WARNING("Failed to get relSignalStrength in BluetoothHfpManager"); - return; - } + NS_ENSURE_TRUE_VOID(value.isNumber()); mSignal = (int)ceil(value.toNumber() / 20.0); UpdateDeviceCIND(); diff --git a/dom/bluetooth/bluedroid/BluetoothOppManager.h b/dom/bluetooth/bluedroid/BluetoothOppManager.h index e1b7659efc7d..43a87f612786 100644 --- a/dom/bluetooth/bluedroid/BluetoothOppManager.h +++ b/dom/bluetooth/bluedroid/BluetoothOppManager.h @@ -37,12 +37,6 @@ public: aName.AssignLiteral("OPP"); } - /* - * Channel of reserved services are fixed values, please check - * function add_reserved_service_records() in - * external/bluetooth/bluez/src/adapter.c for more information. - */ - static const int DEFAULT_OPP_CHANNEL = 10; static const int MAX_PACKET_LENGTH = 0xFFFE; virtual ~BluetoothOppManager(); diff --git a/dom/bluetooth/bluedroid/BluetoothSocket.cpp b/dom/bluetooth/bluedroid/BluetoothSocket.cpp index 6e38176be805..b1d1a8c25983 100644 --- a/dom/bluetooth/bluedroid/BluetoothSocket.cpp +++ b/dom/bluetooth/bluedroid/BluetoothSocket.cpp @@ -605,10 +605,12 @@ BluetoothSocket::Connect(const nsAString& aDeviceAddress, int aChannel) // TODO: uuid as argument int fd; NS_ENSURE_TRUE(BT_STATUS_SUCCESS == - sBluetoothSocketInterface->connect((bt_bdaddr_t *) &remoteBdAddress, - (btsock_type_t) BTSOCK_RFCOMM, + sBluetoothSocketInterface->connect(&remoteBdAddress, + BTSOCK_RFCOMM, UUID_OBEX_OBJECT_PUSH, - aChannel, &fd, (mAuth << 1) | mEncrypt), + aChannel, + &fd, + (mAuth << 1) | mEncrypt), false); NS_ENSURE_TRUE(fd >= 0, false); @@ -626,10 +628,12 @@ BluetoothSocket::Listen(int aChannel) nsAutoCString serviceName("OBEX Object Push"); int fd; NS_ENSURE_TRUE(BT_STATUS_SUCCESS == - sBluetoothSocketInterface->listen((btsock_type_t) BTSOCK_RFCOMM, + sBluetoothSocketInterface->listen(BTSOCK_RFCOMM, serviceName.get(), UUID_OBEX_OBJECT_PUSH, - aChannel, &fd, (mAuth << 1) | mEncrypt), + aChannel, + &fd, + (mAuth << 1) | mEncrypt), false); NS_ENSURE_TRUE(fd >= 0, false); diff --git a/dom/bluetooth/bluedroid/gonk/BluetoothServiceBluedroid.cpp b/dom/bluetooth/bluedroid/gonk/BluetoothServiceBluedroid.cpp index f242bdc3daf8..21fb0fe5798b 100644 --- a/dom/bluetooth/bluedroid/gonk/BluetoothServiceBluedroid.cpp +++ b/dom/bluetooth/bluedroid/gonk/BluetoothServiceBluedroid.cpp @@ -666,9 +666,12 @@ static nsresult StartStopGonkBluetooth(bool aShouldEnable) { MOZ_ASSERT(!NS_IsMainThread()); - NS_ENSURE_TRUE(sBtInterface, NS_ERROR_FAILURE); - NS_ENSURE_TRUE(sIsBtEnabled != aShouldEnable, NS_OK); + + if (sIsBtEnabled == aShouldEnable) { + // Keep current enable status + return NS_OK; + } int ret = aShouldEnable ? sBtInterface->enable() : sBtInterface->disable(); NS_ENSURE_TRUE(ret == BT_STATUS_SUCCESS, NS_ERROR_FAILURE); @@ -1221,13 +1224,6 @@ BluetoothServiceBluedroid::SendFile(const nsAString& aDeviceAddress, { MOZ_ASSERT(NS_IsMainThread()); - // Force to stop discovery, otherwise socket connecting would fail - if (!IsReady() || BT_STATUS_SUCCESS != sBtInterface->cancel_discovery()) { - NS_NAMED_LITERAL_STRING(errorStr, "Calling cancel_discovery() failed"); - DispatchBluetoothReply(aRunnable, BluetoothValue(true), errorStr); - return; - } - // Currently we only support one device sending one file at a time, // so we don't need aDeviceAddress here because the target device // has been determined when calling 'Connect()'. Nevertheless, keep diff --git a/dom/bluetooth/bluez/BluetoothHfpManager.cpp b/dom/bluetooth/bluez/BluetoothHfpManager.cpp index 1fae4ca0fd67..6ca59a0e3407 100644 --- a/dom/bluetooth/bluez/BluetoothHfpManager.cpp +++ b/dom/bluetooth/bluez/BluetoothHfpManager.cpp @@ -620,14 +620,10 @@ BluetoothHfpManager::HandleVoiceConnectionChanged(uint32_t aClientId) } UpdateCIND(CINDType::SERVICE, service); - uint8_t signal; JS::Value value; voiceInfo->GetRelSignalStrength(&value); - if (!value.isNumber()) { - BT_WARNING("Failed to get relSignalStrength in BluetoothHfpManager"); - return; - } - signal = ceil(value.toNumber() / 20.0); + NS_ENSURE_TRUE_VOID(value.isNumber()); + uint8_t signal = ceil(value.toNumber() / 20.0); UpdateCIND(CINDType::SIGNAL, signal); /** diff --git a/dom/bluetooth/bluez/BluetoothOppManager.h b/dom/bluetooth/bluez/BluetoothOppManager.h index 9a384bcb6376..7a9f81cea149 100644 --- a/dom/bluetooth/bluez/BluetoothOppManager.h +++ b/dom/bluetooth/bluez/BluetoothOppManager.h @@ -37,12 +37,6 @@ public: aName.AssignLiteral("OPP"); } - /* - * Channel of reserved services are fixed values, please check - * function add_reserved_service_records() in - * external/bluetooth/bluez/src/adapter.c for more information. - */ - static const int DEFAULT_OPP_CHANNEL = 10; static const int MAX_PACKET_LENGTH = 0xFFFE; virtual ~BluetoothOppManager(); From 6309f17ccfa34d0b449f8abced765836da985655 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 9 Jan 2014 23:15:17 -0800 Subject: [PATCH 27/40] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/0c3afab70cbe Author: Jim Porter Desc: Merge pull request #14793 from jimporter/music-scale-progress Bug 950783 - [music] Make progress bar scale to the whole width of the screen, no matter the resolution; r=dkuo ======== https://hg.mozilla.org/integration/gaia-central/rev/bc4f8368e95c Author: Jim Porter Desc: Bug 950783 - [music] Make progress bar scale to the whole width of the screen, no matter the resolution --- 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 389224a5e036..e23d26cd15a6 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "0790c974385ddebcef1515e437c7bceece900739", + "revision": "0c3afab70cbe8797e69e50397dd0b688e40d1233", "repo_path": "/integration/gaia-central" } From e8a417e582a7f0e273b0ca464d09e4d43dcff9ff Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Thu, 9 Jan 2014 23:40:21 -0800 Subject: [PATCH 28/40] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/57413760b640 Author: Yuren Ju Desc: Merge pull request #15149 from yurenju/multilocale-integration Bug 900182 - integration for multilocale r=@timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/2424d7769009 Author: Yuren Ju Desc: Bug 900182 - integration for multilocale --- 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 e23d26cd15a6..8d3bd5d6091e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "0c3afab70cbe8797e69e50397dd0b688e40d1233", + "revision": "57413760b640015c41a33e5d21631619ba52fb2d", "repo_path": "/integration/gaia-central" } From d4dab415deb90590967c7efdc98ac2407f864b4b Mon Sep 17 00:00:00 2001 From: Michael Wu Date: Fri, 10 Jan 2014 17:02:01 +0800 Subject: [PATCH 29/40] Bug 937713 - Replace gWindowToRedraw with a simpler mechanism, r=roc --- widget/gonk/nsWindow.cpp | 53 +++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/widget/gonk/nsWindow.cpp b/widget/gonk/nsWindow.cpp index 490e42bbfbe9..da19993af4d4 100644 --- a/widget/gonk/nsWindow.cpp +++ b/widget/gonk/nsWindow.cpp @@ -68,7 +68,6 @@ static nsIntRect sVirtualBounds; static nsRefPtr sGLContext; static nsTArray sTopWindows; -static nsWindow *gWindowToRedraw = nullptr; static nsWindow *gFocusedWindow = nullptr; static bool sFramebufferOpen; static bool sUsingOMTC; @@ -185,20 +184,24 @@ nsWindow::DoDraw(void) return; } - if (!gWindowToRedraw) { + if (sTopWindows.IsEmpty()) { LOG(" no window to draw, bailing"); return; } - nsIntRegion region = gWindowToRedraw->mDirtyRegion; - gWindowToRedraw->mDirtyRegion.SetEmpty(); + nsWindow *targetWindow = (nsWindow *)sTopWindows[0]; + while (targetWindow->GetLastChild()) + targetWindow = (nsWindow *)targetWindow->GetLastChild(); - nsIWidgetListener* listener = gWindowToRedraw->GetWidgetListener(); + nsIntRegion region = sTopWindows[0]->mDirtyRegion; + sTopWindows[0]->mDirtyRegion.SetEmpty(); + + nsIWidgetListener* listener = targetWindow->GetWidgetListener(); if (listener) { - listener->WillPaintWindow(gWindowToRedraw); + listener->WillPaintWindow(targetWindow); } - LayerManager* lm = gWindowToRedraw->GetLayerManager(); + LayerManager* lm = targetWindow->GetLayerManager(); if (mozilla::layers::LAYERS_CLIENT == lm->GetBackendType()) { // No need to do anything, the compositor will handle drawing } else if (mozilla::layers::LAYERS_BASIC == lm->GetBackendType()) { @@ -217,12 +220,12 @@ nsWindow::DoDraw(void) // No double-buffering needed. AutoLayerManagerSetup setupLayerManager( - gWindowToRedraw, ctx, mozilla::layers::BUFFER_NONE, + targetWindow, ctx, mozilla::layers::BUFFER_NONE, ScreenRotation(EffectiveScreenRotation())); - listener = gWindowToRedraw->GetWidgetListener(); + listener = targetWindow->GetWidgetListener(); if (listener) { - listener->PaintWindow(gWindowToRedraw, region); + listener->PaintWindow(targetWindow, region); } } @@ -234,7 +237,7 @@ nsWindow::DoDraw(void) NS_RUNTIMEABORT("Unexpected layer manager type"); } - listener = gWindowToRedraw->GetWidgetListener(); + listener = targetWindow->GetWidgetListener(); if (listener) { listener->DidPaintWindow(); } @@ -281,11 +284,10 @@ nsWindow::Create(nsIWidget *aParent, mBounds = aRect; - nsWindow *parent = (nsWindow *)aNativeParent; - mParent = parent; + mParent = (nsWindow *)aParent; mVisible = false; - if (!aNativeParent) { + if (!aParent) { mBounds = sVirtualBounds; } @@ -303,8 +305,6 @@ nsWindow::Destroy(void) { mOnDestroyCalled = true; sTopWindows.RemoveElement(this); - if (this == gWindowToRedraw) - gWindowToRedraw = nullptr; if (this == gFocusedWindow) gFocusedWindow = nullptr; nsBaseWidget::OnDestroy(); @@ -381,8 +381,8 @@ nsWindow::Resize(double aX, if (mWidgetListener) mWidgetListener->WindowResized(this, mBounds.width, mBounds.height); - if (aRepaint && gWindowToRedraw) - gWindowToRedraw->Invalidate(sVirtualBounds); + if (aRepaint) + Invalidate(sVirtualBounds); return NS_OK; } @@ -418,14 +418,13 @@ nsWindow::ConfigureChildren(const nsTArray&) NS_IMETHODIMP nsWindow::Invalidate(const nsIntRect &aRect) { - nsWindow *parent = mParent; - while (parent && parent != sTopWindows[0]) - parent = parent->mParent; - if (parent != sTopWindows[0]) + nsWindow *top = mParent; + while (top && top->mParent) + top = top->mParent; + if (top != sTopWindows[0] && this != sTopWindows[0]) return NS_OK; mDirtyRegion.Or(mDirtyRegion, aRect); - gWindowToRedraw = this; gDrawRequest = true; mozilla::NotifyEvent(); return NS_OK; @@ -453,8 +452,6 @@ nsWindow::GetNativeData(uint32_t aDataType) switch (aDataType) { case NS_NATIVE_WINDOW: return GetGonkDisplay()->GetNativeWindow(); - case NS_NATIVE_WIDGET: - return this; } return nullptr; } @@ -766,12 +763,12 @@ nsScreenGonk::SetRotation(uint32_t aRotation) sVirtualBounds = gScreenBounds; } + nsAppShell::NotifyScreenRotation(); + for (unsigned int i = 0; i < sTopWindows.Length(); i++) sTopWindows[i]->Resize(sVirtualBounds.width, sVirtualBounds.height, - !i); - - nsAppShell::NotifyScreenRotation(); + true); return NS_OK; } From 2250ce6fa8e63dd3cee101aa60c544c490e2639a Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Fri, 10 Jan 2014 01:41:19 -0800 Subject: [PATCH 30/40] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/1e92e8607b4c Author: gasolin Desc: Merge pull request #15101 from MBRSL/bug-931655-fm Bug 931655 - [HW test] Simple FM app implementation, r=pzhang ======== https://hg.mozilla.org/integration/gaia-central/rev/4cabbbaf5665 Author: Tom Jao Desc: Bug 931655 - [HW test] Simple FM app implementation, r=pzhang --- 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 8d3bd5d6091e..1e84813d17dd 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "57413760b640015c41a33e5d21631619ba52fb2d", + "revision": "1e92e8607b4c07ea9239380ac9a53b7629a6ed59", "repo_path": "/integration/gaia-central" } From 5b2c1cbbf7a1f267482590808d1d72e51baf4b3c Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Fri, 10 Jan 2014 01:55:17 -0800 Subject: [PATCH 31/40] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/3136a3840ace Author: Alive.Kuo Desc: Merge pull request #15183 from alivedise/bugzilla/948226/activity-orientation-lock Bug 948226 - Activity orientation lock order, r=timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/b974a9e1970e Author: Alive Kuo Desc: Bug 948226 - Activity orientation lock order ======== https://hg.mozilla.org/integration/gaia-central/rev/3c40f1d0b1f7 Author: EragonJ Desc: Merge pull request #14953 from EragonJ/bug-949982 Bug 949982 - [Gaia][DSDS] Fine tune SIM manager UI ======== https://hg.mozilla.org/integration/gaia-central/rev/38c1f53e6557 Author: EragonJ Desc: Bug 949982 - [Gaia][DSDS] Fine tune SIM manager UI --- 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 1e84813d17dd..f58a70fb0428 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "1e92e8607b4c07ea9239380ac9a53b7629a6ed59", + "revision": "3136a3840aceda77fa9c57e175272979ed88c8ab", "repo_path": "/integration/gaia-central" } From 248f1a7c13a456f25e23d482e6642c03aaecd8bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Jim=C3=A9nez?= Date: Fri, 10 Jan 2014 11:02:58 +0100 Subject: [PATCH 32/40] Bug 926737 - FOTA update includes device GUID for identification purpose. Part 1: B2G. r=fabrice --- b2g/chrome/content/settings.js | 45 ++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/b2g/chrome/content/settings.js b/b2g/chrome/content/settings.js index 7173e92a3410..aa3f4107f489 100644 --- a/b2g/chrome/content/settings.js +++ b/b2g/chrome/content/settings.js @@ -21,6 +21,10 @@ XPCOMUtils.defineLazyGetter(this, "libcutils", function () { }); #endif +XPCOMUtils.defineLazyServiceGetter(this, "uuidgen", + "@mozilla.org/uuid-generator;1", + "nsIUUIDGenerator"); + // Once Bug 731746 - Allow chrome JS object to implement nsIDOMEventTarget // is resolved this helper could be removed. var SettingsListener = { @@ -521,6 +525,14 @@ SettingsListener.observe('privacy.donottrackheader.enabled', false, function(val SettingsListener.observe('privacy.donottrackheader.value', 1, function(value) { Services.prefs.setIntPref('privacy.donottrackheader.value', value); + // If the user specifically disallows tracking, we set the value of + // app.update.custom (update tracking ID) to an empty string. + if (value == 1) { + Services.prefs.setCharPref('app.update.custom', ''); + return; + } + // Otherwise, we assure that the update tracking ID exists. + setUpdateTrackingId(); }); // =================== Crash Reporting ==================== @@ -537,6 +549,39 @@ SettingsListener.observe('app.reportCrashes', 'ask', function(value) { }); // ================ Updates ================ +/** + * For tracking purposes some partners require us to add an UUID to the + * update URL. The update tracking ID will be an empty string if the + * do-not-track feature specifically disallows tracking and it is reseted + * to a different ID if the do-not-track value changes from disallow to allow. + */ +function setUpdateTrackingId() { + try { + let dntEnabled = Services.prefs.getBoolPref('privacy.donottrackheader.enabled'); + let dntValue = Services.prefs.getIntPref('privacy.donottrackheader.value'); + // If the user specifically decides to disallow tracking (1), we just bail out. + if (dntEnabled && (dntValue == 1)) { + return; + } + + let trackingId = + Services.prefs.getPrefType('app.update.custom') == + Ci.nsIPrefBranch.PREF_STRING && + Services.prefs.getCharPref('app.update.custom'); + + // If there is no previous registered tracking ID, we generate a new one. + // This should only happen on first usage or after changing the + // do-not-track value from disallow to allow. + if (!trackingId) { + trackingId = uuidgen.generateUUID().toString().replace(/[{}]/g, ""); + Services.prefs.setCharPref('app.update.custom', trackingId); + } + } catch(e) { + dump('Error getting tracking ID ' + e + '\n'); + } +} +setUpdateTrackingId(); + SettingsListener.observe('app.update.interval', 86400, function(value) { Services.prefs.setIntPref('app.update.interval', value); }); From 8da0d818e12daff845d4deddca807d3709e3eee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Jim=C3=A9nez?= Date: Fri, 10 Jan 2014 11:02:58 +0100 Subject: [PATCH 33/40] Bug 926737 - FOTA update includes device GUID for identification purpose. Part 2: nsUpdateService r=rstrong --- toolkit/mozapps/update/nsUpdateService.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js index e6475389e9d2..445b89072abf 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -31,6 +31,7 @@ const PREF_APP_UPDATE_CERT_CHECKATTRS = "app.update.cert.checkAttributes"; const PREF_APP_UPDATE_CERT_ERRORS = "app.update.cert.errors"; const PREF_APP_UPDATE_CERT_MAXERRORS = "app.update.cert.maxErrors"; const PREF_APP_UPDATE_CERT_REQUIREBUILTIN = "app.update.cert.requireBuiltIn"; +const PREF_APP_UPDATE_CUSTOM = "app.update.custom"; const PREF_APP_UPDATE_ENABLED = "app.update.enabled"; const PREF_APP_UPDATE_METRO_ENABLED = "app.update.metro.enabled"; const PREF_APP_UPDATE_IDLETIME = "app.update.idletime"; @@ -40,12 +41,12 @@ const PREF_APP_UPDATE_LASTUPDATETIME = "app.update.lastUpdateTime.backgroun const PREF_APP_UPDATE_LOG = "app.update.log"; const PREF_APP_UPDATE_MODE = "app.update.mode"; const PREF_APP_UPDATE_NEVER_BRANCH = "app.update.never."; +const PREF_APP_UPDATE_NOTIFIEDUNSUPPORTED = "app.update.notifiedUnsupported"; const PREF_APP_UPDATE_POSTUPDATE = "app.update.postupdate"; const PREF_APP_UPDATE_PROMPTWAITTIME = "app.update.promptWaitTime"; const PREF_APP_UPDATE_SHOW_INSTALLED_UI = "app.update.showInstalledUI"; const PREF_APP_UPDATE_SILENT = "app.update.silent"; const PREF_APP_UPDATE_STAGING_ENABLED = "app.update.staging.enabled"; -const PREF_APP_UPDATE_NOTIFIEDUNSUPPORTED = "app.update.notifiedUnsupported"; const PREF_APP_UPDATE_URL = "app.update.url"; const PREF_APP_UPDATE_URL_DETAILS = "app.update.url.details"; const PREF_APP_UPDATE_URL_OVERRIDE = "app.update.url.override"; @@ -1980,7 +1981,7 @@ const UpdateServiceFactory = { function UpdateService() { LOG("Creating UpdateService"); Services.obs.addObserver(this, "xpcom-shutdown", false); - Services.prefs.addObserver("app.update.log", this, false); + Services.prefs.addObserver(PREF_APP_UPDATE_LOG, this, false); #ifdef MOZ_WIDGET_GONK // PowerManagerService::SyncProfile (which is called for Reboot, PowerOff // and Restart) sends the profile-change-net-teardown event. We can then @@ -2050,7 +2051,7 @@ UpdateService.prototype = { #endif case "xpcom-shutdown": Services.obs.removeObserver(this, topic); - Services.prefs.removeObserver("app.update.log", this); + Services.prefs.removeObserver(PREF_APP_UPDATE_LOG, this); if (this._retryTimer) { this._retryTimer.cancel(); @@ -3595,6 +3596,7 @@ Checker.prototype = { getDistributionPrefValue(PREF_APP_DISTRIBUTION)); url = url.replace(/%DISTRIBUTION_VERSION%/g, getDistributionPrefValue(PREF_APP_DISTRIBUTION_VERSION)); + url = url.replace(/%CUSTOM%/g, getPref("getCharPref", PREF_APP_UPDATE_CUSTOM, "")); url = url.replace(/\+/g, "%2B"); #ifdef MOZ_WIDGET_GONK From dd2f2d0accc15fd18c948688474854ee1a63ce7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Jim=C3=A9nez?= Date: Fri, 10 Jan 2014 11:02:59 +0100 Subject: [PATCH 34/40] Bug 926737 - FOTA update includes device GUID for identification purpose. Part 3: Tests. r=rstrong --- .../tests/unit_aus_update/urlConstruction.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/toolkit/mozapps/update/tests/unit_aus_update/urlConstruction.js b/toolkit/mozapps/update/tests/unit_aus_update/urlConstruction.js index 3b61a4617a10..876dd3bbe7a6 100644 --- a/toolkit/mozapps/update/tests/unit_aus_update/urlConstruction.js +++ b/toolkit/mozapps/update/tests/unit_aus_update/urlConstruction.js @@ -394,5 +394,19 @@ function run_test_pt13() { function check_test_pt13() { do_check_eq(getResult(gRequestURL), "?extra=param&force=1"); + run_test_pt14(); +} + +function run_test_pt14() { + Services.prefs.setCharPref("app.update.custom", "custom"); + gCheckFunc = check_test_pt14; + var url = URL_PREFIX + "?custom=%CUSTOM%"; + logTestInfo("testing url constructed with %CUSTOM% - " + url); + setUpdateURLOverride(url); + gUpdateChecker.checkForUpdates(updateCheckListener, true); +} + +function check_test_pt14() { + do_check_eq(getResult(gRequestURL), "?custom=custom&force=1"); do_test_finished(); } From ce8c974daf4fdaaae7b22f443119c98ec7194be8 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Fri, 10 Jan 2014 12:40:51 +0100 Subject: [PATCH 35/40] Bug 958444: Fix address setup in NFC connector, r=allstars.chh The use of htons on the network address truncates its value. Using htonl instead fixes this problem. The change also makes Nfc.cpp build without warnings. --- ipc/nfc/Nfc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipc/nfc/Nfc.cpp b/ipc/nfc/Nfc.cpp index ca56bb75ebe5..e9785650e87c 100644 --- a/ipc/nfc/Nfc.cpp +++ b/ipc/nfc/Nfc.cpp @@ -241,7 +241,7 @@ NfcConnector::CreateAddr(bool aIsServer, case AF_INET: aAddr.in.sin_family = af; aAddr.in.sin_port = htons(NFC_TEST_PORT); - aAddr.in.sin_addr.s_addr = htons(INADDR_LOOPBACK); + aAddr.in.sin_addr.s_addr = htonl(INADDR_LOOPBACK); aAddrSize = sizeof(sockaddr_in); break; default: From cde90c3993fd5dedf438b13bd0bcc32083e05f12 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Fri, 10 Jan 2014 12:40:57 +0100 Subject: [PATCH 36/40] Bug 958444: Fix address setup in RIL connector, r=vicamo The use of htons on the network address truncates its value. Using htonl instead fixes this problem. The change also makes Ril.cpp build without warnings. --- ipc/ril/Ril.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipc/ril/Ril.cpp b/ipc/ril/Ril.cpp index 9118aad18709..b8ec276529e1 100644 --- a/ipc/ril/Ril.cpp +++ b/ipc/ril/Ril.cpp @@ -251,7 +251,7 @@ RilConnector::CreateAddr(bool aIsServer, case AF_INET: aAddr.in.sin_family = af; aAddr.in.sin_port = htons(RIL_TEST_PORT + mClientId); - aAddr.in.sin_addr.s_addr = htons(INADDR_LOOPBACK); + aAddr.in.sin_addr.s_addr = htonl(INADDR_LOOPBACK); aAddrSize = sizeof(sockaddr_in); break; default: From 29da23b22b9fe919c227ce495c9eeb5b0fedde0d Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Fri, 10 Jan 2014 03:45:20 -0800 Subject: [PATCH 37/40] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/d04c5d6ed8a7 Author: Etienne Segonzac Desc: Merge pull request #14901 from etiennesegonzac/bug-952099-better-hang-up-hit-target Bug 952099 - Better hit target for the call screen hang up / pick up buttons. r=rik ======== https://hg.mozilla.org/integration/gaia-central/rev/61399480a8ec Author: Etienne Segonzac Desc: Bug 952099 - Better hit target for the call screen hang up / pick up button. --- 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 f58a70fb0428..7007eab9497a 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "3136a3840aceda77fa9c57e175272979ed88c8ab", + "revision": "d04c5d6ed8a71ae37d964a28f6f1fd78e274ed1d", "repo_path": "/integration/gaia-central" } From 2612a977dc897eb2636f1f8f1ccf872e4b3613a1 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Fri, 10 Jan 2014 05:00:19 -0800 Subject: [PATCH 38/40] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/94fca24c87ab Author: Ben Francis Desc: Merge pull request #15157 from acperez/bug-957966 Bug 957966 - Single variant browser bookmarks are not loaded. r=benfrancis ======== https://hg.mozilla.org/integration/gaia-central/rev/934d7e47cbd8 Author: Albert Desc: Bug 957966 - Single variant browser bookmarks are not loaded. r=benfrancis --- 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 7007eab9497a..395ea535bbc7 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "d04c5d6ed8a71ae37d964a28f6f1fd78e274ed1d", + "revision": "94fca24c87ab20a96fe6927d234ccc98518ce416", "repo_path": "/integration/gaia-central" } From 1acb8c09126045ee8a94905bf64333da925fb4f7 Mon Sep 17 00:00:00 2001 From: Jed Davis Date: Fri, 10 Jan 2014 08:22:58 -0500 Subject: [PATCH 39/40] Bug 945330 - Reword and slightly improve sandbox violation log message. r=kang The main goal is to have a message that unambiguously indicates a crash, so mozharness can grep for it even if some of the details change later. Also now includes the entire argument list; most syscalls don't use all six, so the last few will be meaningless, but it can't hurt to log them. --- security/sandbox/linux/Sandbox.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/security/sandbox/linux/Sandbox.cpp b/security/sandbox/linux/Sandbox.cpp index a1c81b9493d4..f0e0893ef4b0 100644 --- a/security/sandbox/linux/Sandbox.cpp +++ b/security/sandbox/linux/Sandbox.cpp @@ -65,7 +65,7 @@ static void Reporter(int nr, siginfo_t *info, void *void_context) { ucontext_t *ctx = static_cast(void_context); - unsigned int syscall, arg1; + unsigned long syscall, args[6]; if (nr != SIGSYS) { return; @@ -78,9 +78,16 @@ Reporter(int nr, siginfo_t *info, void *void_context) } syscall = SECCOMP_SYSCALL(ctx); - arg1 = SECCOMP_PARM1(ctx); + args[0] = SECCOMP_PARM1(ctx); + args[1] = SECCOMP_PARM2(ctx); + args[2] = SECCOMP_PARM3(ctx); + args[3] = SECCOMP_PARM4(ctx); + args[4] = SECCOMP_PARM5(ctx); + args[5] = SECCOMP_PARM6(ctx); - LOG_ERROR("PID %u is missing syscall %u, arg1 %u\n", getpid(), syscall, arg1); + LOG_ERROR("seccomp sandbox violation: pid %u, syscall %lu, args %lu %lu %lu" + " %lu %lu %lu. Killing process.", getpid(), syscall, + args[0], args[1], args[2], args[3], args[4], args[5]); _exit(127); } From 91f62414a0ba15f211c72796fd69df08d311e015 Mon Sep 17 00:00:00 2001 From: Jamin Liu Date: Fri, 10 Jan 2014 08:23:13 -0500 Subject: [PATCH 40/40] Bug 953036 - Set HSP flag when BluetoothHfpManager chooses to connect HSP. r=echou --- dom/bluetooth/bluez/BluetoothHfpManager.cpp | 9 ++++++--- dom/bluetooth/bluez/BluetoothHfpManager.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dom/bluetooth/bluez/BluetoothHfpManager.cpp b/dom/bluetooth/bluez/BluetoothHfpManager.cpp index 6ca59a0e3407..4369490c19c1 100644 --- a/dom/bluetooth/bluez/BluetoothHfpManager.cpp +++ b/dom/bluetooth/bluez/BluetoothHfpManager.cpp @@ -389,7 +389,7 @@ BluetoothHfpManager::Reset() mCMER = false; mConnectScoRequest = false; mSlcConnected = false; - mHspConnected = false; + mIsHsp = false; mReceiveVgsFlag = false; #ifdef MOZ_B2G_RIL @@ -1638,13 +1638,14 @@ BluetoothHfpManager::OnSocketConnectSuccess(BluetoothSocket* aSocket) */ if (aSocket == mHandsfreeSocket) { MOZ_ASSERT(!mSocket); + mIsHsp = false; mHandsfreeSocket.swap(mSocket); mHeadsetSocket->Disconnect(); mHeadsetSocket = nullptr; } else if (aSocket == mHeadsetSocket) { MOZ_ASSERT(!mSocket); - mHspConnected = true; + mIsHsp = true; mHeadsetSocket.swap(mSocket); mHandsfreeSocket->Disconnect(); @@ -1739,6 +1740,8 @@ BluetoothHfpManager::OnGetServiceChannel(const nsAString& aDeviceAddress, } else if (NS_FAILED(bs->GetServiceChannel(aDeviceAddress, hspUuid, this))) { OnConnect(NS_LITERAL_STRING(ERR_NO_AVAILABLE_RESOURCE)); + } else { + mIsHsp = true; } return; @@ -1825,7 +1828,7 @@ BluetoothHfpManager::ConnectSco(BluetoothReplyRunnable* aRunnable) // If we are not using HSP, we have to make sure Service Level Connection // established before we start to set up SCO (synchronous connection). - if (!mSlcConnected && !mHspConnected) { + if (!mSlcConnected && !mIsHsp) { mConnectScoRequest = true; BT_WARNING("ConnectSco called before Service Level Connection established"); return false; diff --git a/dom/bluetooth/bluez/BluetoothHfpManager.h b/dom/bluetooth/bluez/BluetoothHfpManager.h index eaff1eb9cd79..a3f3ca05237c 100644 --- a/dom/bluetooth/bluez/BluetoothHfpManager.h +++ b/dom/bluetooth/bluez/BluetoothHfpManager.h @@ -191,7 +191,7 @@ private: bool mCMER; bool mConnectScoRequest; bool mSlcConnected; - bool mHspConnected; + bool mIsHsp; #ifdef MOZ_B2G_RIL bool mFirstCKPD; int mNetworkSelectionMode;