From 5b9b7ae1857e8a5d328b534ee87f2629d5ba76e9 Mon Sep 17 00:00:00 2001 From: Alastor Wu Date: Wed, 9 Sep 2015 18:32:00 +0800 Subject: [PATCH 01/38] Bug 1203068 - Add system type into kMozAudioChannelAttributeTable. r=baku --HG-- extra : transplant_source : %F6m%06%85%DF%C0%07%8B%E3%8F%D8%96%B9%85%1C%5E%DF%F9a8 --- dom/audiochannel/AudioChannelService.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/dom/audiochannel/AudioChannelService.cpp b/dom/audiochannel/AudioChannelService.cpp index 7a9024b41595..634a27a7a10a 100644 --- a/dom/audiochannel/AudioChannelService.cpp +++ b/dom/audiochannel/AudioChannelService.cpp @@ -158,6 +158,7 @@ static const nsAttrValue::EnumTable kMozAudioChannelAttributeTable[] = { { "telephony", (int16_t)AudioChannel::Telephony }, { "ringer", (int16_t)AudioChannel::Ringer }, { "publicnotification", (int16_t)AudioChannel::Publicnotification }, + { "system", (int16_t)AudioChannel::System }, { nullptr } }; From 61577abd58a804bd73f22793f543652ecd3eb578 Mon Sep 17 00:00:00 2001 From: Sean Lin Date: Tue, 1 Sep 2015 16:52:51 +0800 Subject: [PATCH 02/38] Bug 1201805 - [Presentation WebAPI] Fix collaboration issues with control channel. Part 1 - String mismatch in channel description. r=fabrice --- .../nsIPresentationControlChannel.idl | 2 +- .../provider/TCPPresentationServer.js | 10 +++--- .../PresentationSessionChromeScript.js | 34 ++++++++++++++++++- .../mochitest/test_presentation_receiver.html | 5 +++ .../test_presentation_receiver_oop.html | 5 +++ .../mochitest/test_presentation_sender.html | 4 +-- .../test_presentation_sender_disconnect.html | 4 +-- ...esentation_sender_start_session_error.html | 12 +++---- .../xpcshell/test_tcp_control_channel.js | 8 ++--- 9 files changed, 63 insertions(+), 21 deletions(-) diff --git a/dom/presentation/interfaces/nsIPresentationControlChannel.idl b/dom/presentation/interfaces/nsIPresentationControlChannel.idl index faf29c0eada4..5952cc3ce49b 100644 --- a/dom/presentation/interfaces/nsIPresentationControlChannel.idl +++ b/dom/presentation/interfaces/nsIPresentationControlChannel.idl @@ -16,7 +16,7 @@ interface nsIPresentationChannelDescription: nsISupports // Type of transport channel. readonly attribute uint8_t type; - // Addresses for TCP channel. + // Addresses for TCP channel (as a list of nsISupportsCString). // Should only be used while type == TYPE_TCP. readonly attribute nsIArray tcpAddress; diff --git a/dom/presentation/provider/TCPPresentationServer.js b/dom/presentation/provider/TCPPresentationServer.js index cd8e76cd68f3..b8e2cf136c76 100644 --- a/dom/presentation/provider/TCPPresentationServer.js +++ b/dom/presentation/provider/TCPPresentationServer.js @@ -264,8 +264,8 @@ function ChannelDescription(aInit) { this._tcpAddresses = Cc["@mozilla.org/array;1"] .createInstance(Ci.nsIMutableArray); for (let address of aInit.tcpAddress) { - let wrapper = Cc["@mozilla.org/supports-string;1"] - .createInstance(Ci.nsISupportsString); + let wrapper = Cc["@mozilla.org/supports-cstring;1"] + .createInstance(Ci.nsISupportsCString); wrapper.data = address; this._tcpAddresses.appendElement(wrapper, false); } @@ -313,7 +313,7 @@ function discriptionAsJson(aDescription) { let addresses = aDescription.tcpAddress.QueryInterface(Ci.nsIArray); json.tcpAddress = []; for (let idx = 0; idx < addresses.length; idx++) { - let address = addresses.queryElementAt(idx, Ci.nsISupportsString); + let address = addresses.queryElementAt(idx, Ci.nsISupportsCString); json.tcpAddress.push(address.data); } json.tcpPort = aDescription.tcpPort; @@ -541,11 +541,11 @@ TCPControlChannel.prototype = { break; } case "requestSession:Offer": { - this._listener.onOffer(new ChannelDescription(aMsg.offer)); + this._onOffer(aMsg.offer); break; } case "requestSession:Answer": { - this._listener.onAnswer(new ChannelDescription(aMsg.answer)); + this._onAnswer(aMsg.answer); break; } } diff --git a/dom/presentation/tests/mochitest/PresentationSessionChromeScript.js b/dom/presentation/tests/mochitest/PresentationSessionChromeScript.js index 3c8574cc0216..16e09a938d15 100644 --- a/dom/presentation/tests/mochitest/PresentationSessionChromeScript.js +++ b/dom/presentation/tests/mochitest/PresentationSessionChromeScript.js @@ -100,9 +100,41 @@ const mockedControlChannel = { return this._listener; }, sendOffer: function(offer) { - sendAsyncMessage('offer-sent'); + var isValid = false; + try { + var addresses = offer.tcpAddress; + if (addresses.length > 0) { + for (var i = 0; i < addresses.length; i++) { + // Ensure CString addresses are used. Otherwise, an error will be thrown. + addresses.queryElementAt(i, Ci.nsISupportsCString); + } + + isValid = true; + } + } catch (e) { + isValid = false; + } + + sendAsyncMessage('offer-sent', isValid); }, sendAnswer: function(answer) { + var isValid = false; + try { + var addresses = answer.tcpAddress; + if (addresses.length > 0) { + for (var i = 0; i < addresses.length; i++) { + // Ensure CString addresses are used. Otherwise, an error will be thrown. + addresses.queryElementAt(i, Ci.nsISupportsCString); + } + + isValid = true; + } + } catch (e) { + isValid = false; + } + + sendAsyncMessage('answer-sent', isValid); + this._listener.QueryInterface(Ci.nsIPresentationSessionTransportCallback).notifyTransportReady(); }, close: function(reason) { diff --git a/dom/presentation/tests/mochitest/test_presentation_receiver.html b/dom/presentation/tests/mochitest/test_presentation_receiver.html index 7275abf2f458..c926402f28dc 100644 --- a/dom/presentation/tests/mochitest/test_presentation_receiver.html +++ b/dom/presentation/tests/mochitest/test_presentation_receiver.html @@ -62,6 +62,11 @@ function setup() { info("An offer is received."); }); + gScript.addMessageListener('answer-sent', function answerSentHandler(aIsValid) { + gScript.removeMessageListener('answer-sent', answerSentHandler); + ok(aIsValid, "A valid answer is sent."); + }); + gScript.addMessageListener('control-channel-closed', function controlChannelClosedHandler(aReason) { gScript.removeMessageListener('control-channel-closed', controlChannelClosedHandler); is(aReason, SpecialPowers.Cr.NS_OK, "The control channel is closed normally."); diff --git a/dom/presentation/tests/mochitest/test_presentation_receiver_oop.html b/dom/presentation/tests/mochitest/test_presentation_receiver_oop.html index 1499146516b0..842c7579ec80 100644 --- a/dom/presentation/tests/mochitest/test_presentation_receiver_oop.html +++ b/dom/presentation/tests/mochitest/test_presentation_receiver_oop.html @@ -111,6 +111,11 @@ function setup() { info("An offer is received."); }); + gScript.addMessageListener('answer-sent', function answerSentHandler(aIsValid) { + gScript.removeMessageListener('answer-sent', answerSentHandler); + ok(aIsValid, "A valid answer is sent."); + }); + gScript.addMessageListener('control-channel-closed', function controlChannelClosedHandler(aReason) { gScript.removeMessageListener('control-channel-closed', controlChannelClosedHandler); is(aReason, SpecialPowers.Cr.NS_OK, "The control channel is closed normally."); diff --git a/dom/presentation/tests/mochitest/test_presentation_sender.html b/dom/presentation/tests/mochitest/test_presentation_sender.html index a8b1bada2e98..9038603d5399 100644 --- a/dom/presentation/tests/mochitest/test_presentation_sender.html +++ b/dom/presentation/tests/mochitest/test_presentation_sender.html @@ -48,9 +48,9 @@ function testStartSession() { info("The control channel is closed. " + aReason); }); - gScript.addMessageListener('offer-sent', function offerSentHandler() { + gScript.addMessageListener('offer-sent', function offerSentHandler(aIsValid) { gScript.removeMessageListener('offer-sent', offerSentHandler); - info("An offer is sent out."); + ok(aIsValid, "A valid offer is sent out."); gScript.sendAsyncMessage('trigger-incoming-transport'); }); diff --git a/dom/presentation/tests/mochitest/test_presentation_sender_disconnect.html b/dom/presentation/tests/mochitest/test_presentation_sender_disconnect.html index 28b10108e761..cb00ea88493f 100644 --- a/dom/presentation/tests/mochitest/test_presentation_sender_disconnect.html +++ b/dom/presentation/tests/mochitest/test_presentation_sender_disconnect.html @@ -48,9 +48,9 @@ function testStartSession() { info("The control channel is closed. " + aReason); }); - gScript.addMessageListener('offer-sent', function offerSentHandler() { + gScript.addMessageListener('offer-sent', function offerSentHandler(aIsValid) { gScript.removeMessageListener('offer-sent', offerSentHandler); - info("An offer is sent out."); + ok(aIsValid, "A valid offer is sent out."); gScript.sendAsyncMessage('trigger-incoming-answer'); }); diff --git a/dom/presentation/tests/mochitest/test_presentation_sender_start_session_error.html b/dom/presentation/tests/mochitest/test_presentation_sender_start_session_error.html index 85e0cf4178f9..8c09b6b8845f 100644 --- a/dom/presentation/tests/mochitest/test_presentation_sender_start_session_error.html +++ b/dom/presentation/tests/mochitest/test_presentation_sender_start_session_error.html @@ -83,9 +83,9 @@ function testStartSessionUnexpectedControlChannelCloseBeforeDataTransportInit() info("The control channel is closed. " + aReason); }); - gScript.addMessageListener('offer-sent', function offerSentHandler() { + gScript.addMessageListener('offer-sent', function offerSentHandler(aIsValid) { gScript.removeMessageListener('offer-sent', offerSentHandler); - info("An offer is sent out."); + ok(aIsValid, "A valid offer is sent out."); gScript.sendAsyncMessage('trigger-control-channel-close', SpecialPowers.Cr.NS_ERROR_FAILURE); }); @@ -120,9 +120,9 @@ function testStartSessionUnexpectedControlChannelCloseBeforeDataTransportReady() info("The control channel is closed. " + aReason); }); - gScript.addMessageListener('offer-sent', function offerSentHandler() { + gScript.addMessageListener('offer-sent', function offerSentHandler(aIsValid) { gScript.removeMessageListener('offer-sent', offerSentHandler); - info("An offer is sent out."); + ok(aIsValid, "A valid offer is sent out."); gScript.sendAsyncMessage('trigger-incoming-transport'); }); @@ -168,9 +168,9 @@ function testStartSessionUnexpectedDataTransportClose() { info("The control channel is closed. " + aReason); }); - gScript.addMessageListener('offer-sent', function offerSentHandler() { + gScript.addMessageListener('offer-sent', function offerSentHandler(aIsValid) { gScript.removeMessageListener('offer-sent', offerSentHandler); - info("An offer is sent out."); + ok(aIsValid, "A valid offer is sent out."); gScript.sendAsyncMessage('trigger-incoming-transport'); }); diff --git a/dom/presentation/tests/xpcshell/test_tcp_control_channel.js b/dom/presentation/tests/xpcshell/test_tcp_control_channel.js index d3435c4d7698..d643b1b913cd 100644 --- a/dom/presentation/tests/xpcshell/test_tcp_control_channel.js +++ b/dom/presentation/tests/xpcshell/test_tcp_control_channel.js @@ -29,8 +29,8 @@ function TestDescription(aType, aTcpAddress, aTcpPort) { this.tcpAddress = Cc["@mozilla.org/array;1"] .createInstance(Ci.nsIMutableArray); for (let address of aTcpAddress) { - let wrapper = Cc["@mozilla.org/supports-string;1"] - .createInstance(Ci.nsISupportsString); + let wrapper = Cc["@mozilla.org/supports-cstring;1"] + .createInstance(Ci.nsISupportsCString); wrapper.data = address; this.tcpAddress.appendElement(wrapper, false); } @@ -91,7 +91,7 @@ function testPresentationServer() { this.status = 'onOffer'; let offer = aOffer.QueryInterface(Ci.nsIPresentationChannelDescription); - Assert.strictEqual(offer.tcpAddress.queryElementAt(0,Ci.nsISupportsString).data, + Assert.strictEqual(offer.tcpAddress.queryElementAt(0,Ci.nsISupportsCString).data, OFFER_ADDRESS, 'expected offer address array'); Assert.equal(offer.tcpPort, OFFER_PORT, 'expected offer port'); @@ -148,7 +148,7 @@ function testPresentationServer() { Assert.equal(this.status, 'opened', '2. presenterControlChannel: get answer, close channel'); let answer = aAnswer.QueryInterface(Ci.nsIPresentationChannelDescription); - Assert.strictEqual(answer.tcpAddress.queryElementAt(0,Ci.nsISupportsString).data, + Assert.strictEqual(answer.tcpAddress.queryElementAt(0,Ci.nsISupportsCString).data, ANSWER_ADDRESS, 'expected answer address array'); Assert.equal(answer.tcpPort, ANSWER_PORT, 'expected answer port'); From 9715827d6eec08c1a23bb6eab8415404368885a9 Mon Sep 17 00:00:00 2001 From: Sean Lin Date: Fri, 4 Sep 2015 15:54:34 +0800 Subject: [PATCH 03/38] Bug 1201805 - [Presentation WebAPI] Fix collaboration issues with control channel. Part 2 - Adjust the timing to send offer. r=smaug --- dom/presentation/PresentationSessionInfo.cpp | 76 +++++++++---------- .../PresentationSessionChromeScript.js | 8 ++ .../mochitest/test_presentation_sender.html | 6 ++ .../test_presentation_sender_disconnect.html | 6 ++ ...esentation_sender_start_session_error.html | 18 +++++ 5 files changed, 72 insertions(+), 42 deletions(-) diff --git a/dom/presentation/PresentationSessionInfo.cpp b/dom/presentation/PresentationSessionInfo.cpp index b372a166b012..30d253823ba0 100644 --- a/dom/presentation/PresentationSessionInfo.cpp +++ b/dom/presentation/PresentationSessionInfo.cpp @@ -344,18 +344,21 @@ PresentationSessionInfo::NotifyData(const nsACString& aData) * Implementation of PresentationRequesterInfo * * During presentation session establishment, the sender expects the following - * after trying to establish the control channel: (The order between step 2 and - * 3 is not guaranteed.) + * after trying to establish the control channel: (The order between step 3 and + * 4 is not guaranteed.) * 1. |Init| is called to open a socket |mServerSocket| for data transport - * channel and send the offer to the receiver via the control channel. - * 2.1 |OnSocketAccepted| of |nsIServerSocketListener| is called to indicate the + * channel. + * 2. |NotifyOpened| of |nsIPresentationControlChannelListener| is called to + * indicate the control channel is ready to use. Then send the offer to the + * receiver via the control channel. + * 3.1 |OnSocketAccepted| of |nsIServerSocketListener| is called to indicate the * data transport channel is connected. Then initialize |mTransport|. - * 2.2 |NotifyTransportReady| of |nsIPresentationSessionTransportCallback| is + * 3.2 |NotifyTransportReady| of |nsIPresentationSessionTransportCallback| is * called. - * 3. |OnAnswer| of |nsIPresentationControlChannelListener| is called to + * 4. |OnAnswer| of |nsIPresentationControlChannelListener| is called to * indicate the receiver is ready. Close the control channel since it's no * longer needed. - * 4. Once both step 2 and 3 are done, the presentation session is ready to use. + * 5. Once both step 3 and 4 are done, the presentation session is ready to use. * So notify the listener of CONNECTED state. */ @@ -385,26 +388,6 @@ PresentationRequesterInfo::Init(nsIPresentationControlChannel* aControlChannel) return rv; } - // Prepare and send the offer. - int32_t port; - rv = mServerSocket->GetPort(&port); - if (NS_WARN_IF(NS_FAILED(rv))) { - return rv; - } - - nsCString address; - rv = GetAddress(address); - if (NS_WARN_IF(NS_FAILED(rv))) { - return rv; - } - - nsRefPtr description = - new PresentationChannelDescription(address, static_cast(port)); - rv = mControlChannel->SendOffer(description); - if (NS_WARN_IF(NS_FAILED(rv))) { - return rv; - } - return NS_OK; } @@ -496,8 +479,22 @@ PresentationRequesterInfo::OnAnswer(nsIPresentationChannelDescription* aDescript NS_IMETHODIMP PresentationRequesterInfo::NotifyOpened() { - // Do nothing and wait for receiver to be ready. - return NS_OK; + // Prepare and send the offer. + int32_t port; + nsresult rv = mServerSocket->GetPort(&port); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + + nsCString address; + rv = GetAddress(address); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + + nsRefPtr description = + new PresentationChannelDescription(address, static_cast(port)); + return mControlChannel->SendOffer(description); } NS_IMETHODIMP @@ -666,24 +663,19 @@ PresentationResponderInfo::InitTransportAndSendAnswer() // description for the answer, which is not actually checked at requester side. nsCOMPtr selfAddr; rv = mTransport->GetSelfAddress(getter_AddRefs(selfAddr)); - if (NS_WARN_IF(NS_FAILED(rv))) { - return rv; - } + NS_WARN_IF(NS_FAILED(rv)); nsCString address; - selfAddr->GetAddress(address); - uint16_t port; - selfAddr->GetPort(&port); + uint16_t port = 0; + if (NS_SUCCEEDED(rv)) { + selfAddr->GetAddress(address); + selfAddr->GetPort(&port); + } nsCOMPtr description = new PresentationChannelDescription(address, port); - rv = mControlChannel->SendAnswer(description); - if (NS_WARN_IF(NS_FAILED(rv))) { - return rv; - } - - return NS_OK; - } + return mControlChannel->SendAnswer(description); +} nsresult PresentationResponderInfo::UntrackFromService() diff --git a/dom/presentation/tests/mochitest/PresentationSessionChromeScript.js b/dom/presentation/tests/mochitest/PresentationSessionChromeScript.js index 16e09a938d15..b644cac09737 100644 --- a/dom/presentation/tests/mochitest/PresentationSessionChromeScript.js +++ b/dom/presentation/tests/mochitest/PresentationSessionChromeScript.js @@ -152,6 +152,10 @@ const mockedControlChannel = { sendAsyncMessage('answer-received'); this._listener.QueryInterface(Ci.nsIPresentationControlChannelListener).onAnswer(mockedChannelDescription); }, + simulateNotifyOpened: function() { + sendAsyncMessage('control-channel-opened'); + this._listener.QueryInterface(Ci.nsIPresentationControlChannelListener).notifyOpened(); + }, }; const mockedDevice = { @@ -369,6 +373,10 @@ addMessageListener('trigger-incoming-transport', function() { mockedServerSocket.simulateOnSocketAccepted(mockedServerSocket, mockedSocketTransport); }); +addMessageListener('trigger-control-channel-open', function(reason) { + mockedControlChannel.simulateNotifyOpened(); +}); + addMessageListener('trigger-control-channel-close', function(reason) { mockedControlChannel.close(reason); }); diff --git a/dom/presentation/tests/mochitest/test_presentation_sender.html b/dom/presentation/tests/mochitest/test_presentation_sender.html index 9038603d5399..66d142adb41f 100644 --- a/dom/presentation/tests/mochitest/test_presentation_sender.html +++ b/dom/presentation/tests/mochitest/test_presentation_sender.html @@ -41,6 +41,12 @@ function testStartSession() { gScript.addMessageListener('control-channel-established', function controlChannelEstablishedHandler() { gScript.removeMessageListener('control-channel-established', controlChannelEstablishedHandler); info("A control channel is established."); + gScript.sendAsyncMessage('trigger-control-channel-open'); + }); + + gScript.addMessageListener('control-channel-opened', function controlChannelOpenedHandler(aReason) { + gScript.removeMessageListener('control-channel-opened', controlChannelOpenedHandler); + info("The control channel is opened."); }); gScript.addMessageListener('control-channel-closed', function controlChannelClosedHandler(aReason) { diff --git a/dom/presentation/tests/mochitest/test_presentation_sender_disconnect.html b/dom/presentation/tests/mochitest/test_presentation_sender_disconnect.html index cb00ea88493f..4874a91c8d22 100644 --- a/dom/presentation/tests/mochitest/test_presentation_sender_disconnect.html +++ b/dom/presentation/tests/mochitest/test_presentation_sender_disconnect.html @@ -41,6 +41,12 @@ function testStartSession() { gScript.addMessageListener('control-channel-established', function controlChannelEstablishedHandler() { gScript.removeMessageListener('control-channel-established', controlChannelEstablishedHandler); info("A control channel is established."); + gScript.sendAsyncMessage('trigger-control-channel-open'); + }); + + gScript.addMessageListener('control-channel-opened', function controlChannelOpenedHandler(aReason) { + gScript.removeMessageListener('control-channel-opened', controlChannelOpenedHandler); + info("The control channel is opened."); }); gScript.addMessageListener('control-channel-closed', function controlChannelClosedHandler(aReason) { diff --git a/dom/presentation/tests/mochitest/test_presentation_sender_start_session_error.html b/dom/presentation/tests/mochitest/test_presentation_sender_start_session_error.html index 8c09b6b8845f..3d5852681e4d 100644 --- a/dom/presentation/tests/mochitest/test_presentation_sender_start_session_error.html +++ b/dom/presentation/tests/mochitest/test_presentation_sender_start_session_error.html @@ -76,6 +76,12 @@ function testStartSessionUnexpectedControlChannelCloseBeforeDataTransportInit() gScript.addMessageListener('control-channel-established', function controlChannelEstablishedHandler() { gScript.removeMessageListener('control-channel-established', controlChannelEstablishedHandler); info("A control channel is established."); + gScript.sendAsyncMessage('trigger-control-channel-open'); + }); + + gScript.addMessageListener('control-channel-opened', function controlChannelOpenedHandler(aReason) { + gScript.removeMessageListener('control-channel-opened', controlChannelOpenedHandler); + info("The control channel is opened."); }); gScript.addMessageListener('control-channel-closed', function controlChannelClosedHandler(aReason) { @@ -113,6 +119,12 @@ function testStartSessionUnexpectedControlChannelCloseBeforeDataTransportReady() gScript.addMessageListener('control-channel-established', function controlChannelEstablishedHandler() { gScript.removeMessageListener('control-channel-established', controlChannelEstablishedHandler); info("A control channel is established."); + gScript.sendAsyncMessage('trigger-control-channel-open'); + }); + + gScript.addMessageListener('control-channel-opened', function controlChannelOpenedHandler(aReason) { + gScript.removeMessageListener('control-channel-opened', controlChannelOpenedHandler); + info("The control channel is opened."); }); gScript.addMessageListener('control-channel-closed', function controlChannelClosedHandler(aReason) { @@ -161,6 +173,12 @@ function testStartSessionUnexpectedDataTransportClose() { gScript.addMessageListener('control-channel-established', function controlChannelEstablishedHandler() { gScript.removeMessageListener('control-channel-established', controlChannelEstablishedHandler); info("A control channel is established."); + gScript.sendAsyncMessage('trigger-control-channel-open'); + }); + + gScript.addMessageListener('control-channel-opened', function controlChannelOpenedHandler(aReason) { + gScript.removeMessageListener('control-channel-opened', controlChannelOpenedHandler); + info("The control channel is opened."); }); gScript.addMessageListener('control-channel-closed', function controlChannelClosedHandler(aReason) { From ec77469e00395150d02952fbd3ebcb36d2cc8e09 Mon Sep 17 00:00:00 2001 From: Kershaw Chang Date: Thu, 10 Sep 2015 20:03:00 +0200 Subject: [PATCH 04/38] Bug 1199564 - start/stop mDNS on demand - v3. r=mcmanus --- .../mdns/libmdns/nsDNSServiceDiscovery.cpp | 49 +++++++++++++++++-- .../dns/mdns/libmdns/nsDNSServiceDiscovery.h | 4 +- 2 files changed, 47 insertions(+), 6 deletions(-) diff --git a/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.cpp b/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.cpp index f0f198bd7e36..7f1ef5191666 100644 --- a/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.cpp +++ b/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.cpp @@ -7,6 +7,7 @@ #include #include "MDNSResponderOperator.h" #include "nsICancelable.h" +#include "nsXULAppAPI.h" #include "private/pprio.h" namespace mozilla { @@ -14,7 +15,7 @@ namespace net { namespace { -void +inline void StartService() { char value[PROPERTY_VALUE_MAX] = { '\0' }; @@ -38,7 +39,39 @@ StopService() property_set("ctl.stop", "mdnsd"); } +class ServiceCounter +{ +public: + static bool IsServiceRunning() + { + return !!sUseCount; + } + +private: + static uint32_t sUseCount; + +protected: + ServiceCounter() + { + MOZ_ASSERT(NS_IsMainThread()); + if (!sUseCount++) { + StartService(); + } + } + + virtual ~ServiceCounter() + { + MOZ_ASSERT(NS_IsMainThread()); + if (!--sUseCount) { + StopService(); + } + } +}; + +uint32_t ServiceCounter::sUseCount = 0; + class DiscoveryRequest final : public nsICancelable + , private ServiceCounter { public: NS_DECL_ISUPPORTS @@ -75,6 +108,7 @@ DiscoveryRequest::Cancel(nsresult aReason) } class RegisterRequest final : public nsICancelable + , private ServiceCounter { public: NS_DECL_ISUPPORTS @@ -124,7 +158,10 @@ nsDNSServiceDiscovery::~nsDNSServiceDiscovery() nsresult nsDNSServiceDiscovery::Init() { - StartService(); + if (!XRE_IsParentProcess()) { + MOZ_ASSERT(false, "nsDNSServiceDiscovery can only be used in parent process"); + return NS_ERROR_FAILURE; + } return NS_OK; } @@ -140,6 +177,7 @@ nsDNSServiceDiscovery::StartDiscovery(const nsACString& aServiceType, return rv; } + nsCOMPtr req = new DiscoveryRequest(this, aListener); nsRefPtr browserOp = new BrowseOperator(aServiceType, aListener); if (NS_WARN_IF(NS_FAILED(rv = browserOp->Start()))) { @@ -148,7 +186,6 @@ nsDNSServiceDiscovery::StartDiscovery(const nsACString& aServiceType, mDiscoveryMap.Put(aListener, browserOp); - nsCOMPtr req = new DiscoveryRequest(this, aListener); req.forget(aRetVal); return NS_OK; @@ -185,6 +222,7 @@ nsDNSServiceDiscovery::RegisterService(nsIDNSServiceInfo* aServiceInfo, return rv; } + nsCOMPtr req = new RegisterRequest(this, aListener); nsRefPtr registerOp = new RegisterOperator(aServiceInfo, aListener); if (NS_WARN_IF(NS_FAILED(rv = registerOp->Start()))) { @@ -193,7 +231,6 @@ nsDNSServiceDiscovery::RegisterService(nsIDNSServiceInfo* aServiceInfo, mRegisterMap.Put(aListener, registerOp); - nsCOMPtr req = new RegisterRequest(this, aListener); req.forget(aRetVal); return NS_OK; @@ -222,6 +259,10 @@ NS_IMETHODIMP nsDNSServiceDiscovery::ResolveService(nsIDNSServiceInfo* aServiceInfo, nsIDNSServiceResolveListener* aListener) { + if (!ServiceCounter::IsServiceRunning()) { + return NS_ERROR_FAILURE; + } + nsresult rv; nsRefPtr resolveOp = new ResolveOperator(aServiceInfo, diff --git a/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.h b/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.h index 3e92d63ec68f..ec2f2755b977 100644 --- a/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.h +++ b/netwerk/dns/mdns/libmdns/nsDNSServiceDiscovery.h @@ -26,8 +26,8 @@ public: explicit nsDNSServiceDiscovery() = default; /* - ** The mDNS service is started in this function. However, the function returns - ** without waiting. Therefore, all operations before service started will fail + ** The mDNS service is started on demand. If no one uses, mDNS service will not + ** start. Therefore, all operations before service started will fail ** and get error code |kDNSServiceErr_ServiceNotRunning| defined in dns_sd.h. **/ nsresult Init(); From a637c0b974c322fe7aa1a89b3bf359ea18289444 Mon Sep 17 00:00:00 2001 From: Boris Chiou Date: Fri, 4 Sep 2015 00:52:00 +0200 Subject: [PATCH 05/38] Bug 1198522 - Separate customized and sys cmd menu items. r=kanru Use a different array to store 'copy-image' and 'copy-link' menu items. --- .../BrowserElementChildPreload.js | 6 +++--- .../browserElement_ContextmenuEvents.js | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dom/browser-element/BrowserElementChildPreload.js b/dom/browser-element/BrowserElementChildPreload.js index 21b90e49027f..70fdffc8a675 100644 --- a/dom/browser-element/BrowserElementChildPreload.js +++ b/dom/browser-element/BrowserElementChildPreload.js @@ -1258,7 +1258,7 @@ BrowserElementChild.prototype = { }, _buildMenuObj: function(menu, idPrefix, copyableElements) { - var menuObj = {type: 'menu', items: []}; + var menuObj = {type: 'menu', items: [], sysItems: []}; // Customized context menu if (menu) { this._maybeCopyAttribute(menu, menuObj, 'label'); @@ -1280,11 +1280,11 @@ BrowserElementChild.prototype = { // put together with other image options if elem is an image link. // "Copy Link" menu item if (copyableElements.link) { - menuObj.items.push({id: 'copy-link'}); + menuObj.sysItems.push({id: 'copy-link'}); } // "Copy Image" menu item if (copyableElements.image) { - menuObj.items.push({id: 'copy-image'}); + menuObj.sysItems.push({id: 'copy-image'}); } return menuObj; diff --git a/dom/browser-element/mochitest/browserElement_ContextmenuEvents.js b/dom/browser-element/mochitest/browserElement_ContextmenuEvents.js index b55a9334225b..954feb144bf4 100644 --- a/dom/browser-element/mochitest/browserElement_ContextmenuEvents.js +++ b/dom/browser-element/mochitest/browserElement_ContextmenuEvents.js @@ -24,7 +24,12 @@ function checkEmptyContextMenu() { function checkInnerContextMenu() { sendContextMenuTo('#inner-link', function onContextMenu(detail) { is(detail.systemTargets.length, 1, 'Includes anchor data'); - is(detail.contextmenu.items.length, 3, 'Inner clicks trigger correct menu'); + is(detail.contextmenu.items.length, 2, 'Inner clicks trigger correct customized menu'); + is(detail.contextmenu.items[0].label, 'foo', 'Customized menu has a "foo" menu item'); + is(detail.contextmenu.items[1].label, 'bar', 'Customized menu has a "bar" menu item'); + is(detail.contextmenu.sysItems.length, 1, 'Inner clicks trigger correct sys cmd menu'); + is(detail.contextmenu.sysItems[0].id, 'copy-link', '#inner-link has a copy-link menu item'); + var target = detail.systemTargets[0]; is(target.nodeName, 'A', 'Reports correct nodeName'); is(target.data.uri, 'foo.html', 'Reports correct uri'); @@ -47,9 +52,16 @@ function checkNestedContextMenu() { var innerMenu = detail.contextmenu.items.filter(function(x) { return x.type === 'menu'; }); - is(detail.systemTargets.length, 2, 'Includes anchor and img data'); + is(detail.systemTargets.length, 2, 'Includes two systemTargets'); + is(detail.systemTargets[0].nodeName, 'IMG', 'Includes "IMG" node'); + is(detail.systemTargets[0].data.uri, 'example.png', 'Img data has the correct uri'); + is(detail.systemTargets[1].nodeName, 'A', 'Includes "A" node'); + is(detail.systemTargets[1].data.uri, 'bar.html', 'Anchor has the correct uri'); ok(innerMenu.length > 0, 'Menu contains a nested menu'); + is(detail.contextmenu.sysItems.length, 2, 'Sys cmd menu has the correct # of menu items') + is(detail.contextmenu.sysItems[0].id, 'copy-link', 'Has a copy-link menu item'); + is(detail.contextmenu.sysItems[1].id, 'copy-image', 'Has a copy-image menu item'); checkPreviousContextMenuHandler(); }); } @@ -131,6 +143,8 @@ function checkImageContextMenu() { var target = detail.systemTargets[0]; is(target.nodeName, 'IMG', 'Reports correct nodeName'); is(target.data.uri, 'example.png', 'Reports correct uri'); + is(detail.contextmenu.sysItems.length, 1, 'Reports correct # of sys cmd menu items'); + is(detail.contextmenu.sysItems[0].id, 'copy-image', 'IMG has a copy-image menu item'); checkVideoContextMenu(); }, /* ignorePreventDefault */ true); From 79deccc8bcc1489b1bce7608c1748866c493bb3b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 01:29:29 -0700 Subject: [PATCH 06/38] Bumping gaia.json for 9 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/1cf90901f457 Author: Carsten Book Desc: Merge pull request #31673 from BorisChiou/Bug1198522 Bug 1198522 - Separate customized and sys cmd menu items. r=timdream ======== https://hg.mozilla.org/integration/gaia-central/rev/21458b0bc182 Author: Boris Chiou Desc: Bug 1198522 - Separate customized and sys cmd menu items ======== https://hg.mozilla.org/integration/gaia-central/rev/1ad64fc8d0d5 Author: Carsten Book Desc: Merge pull request #31699 from petemoore/bug1201951 Bug 1201951 - upgraded slugid/taskcluster-client. r=aus ======== https://hg.mozilla.org/integration/gaia-central/rev/485d6f6c8cbd Author: Pete Moore Desc: Removed slugid as direct dependency, and now use taskcluster client library to generate slugids indirectly ======== https://hg.mozilla.org/integration/gaia-central/rev/cc3e553dd180 Author: Pete Moore Desc: Bug 1201951 - upgraded slugid/taskcluster-client This is to switch to using the new slugid.nice() function instead of the slugid.v4() function. The nice() function guarantees that slugs start with [A-Za-f] which is safer, especially as it excludes slugids starting with a '-' which can cause problems when used as command line parameters. ======== https://hg.mozilla.org/integration/gaia-central/rev/c0902ad97cdb Author: Staś Małolepszy Desc: Merge pull request #31755 from stasm/1202407-langpack.channel Bug 1202407 - Rename moz.b2g.version to langpack.channel. r=rickychien f=fabrice f=gandalf ======== https://hg.mozilla.org/integration/gaia-central/rev/687bfea416fd Author: Staś Małolepszy Desc: Bug 1202407 - Rename moz.b2g.version to langpack.channel. r=rickychien f=fabrice f=gandalf ======== https://hg.mozilla.org/integration/gaia-central/rev/cab9ff9d9ff0 Author: Carsten Book Desc: Merge pull request #31777 from zbraniecki/1203348-system-intl Bug 1203348 - Move remaining DateTimeFormat calls to Intl/async. r=apastor ======== https://hg.mozilla.org/integration/gaia-central/rev/6305cf045975 Author: Zibi Braniecki Desc: Bug 1203348 - Move remaining DateTimeFormat calls to Intl/async --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 2977a80a9272..a650576bf670 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "758c75ee087ea3722213ea2c185cca1d952c8a29", + "git_revision": "676caf58c4de93ba0d6a93add4d0a2ebfaa67764", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "df25432ca94953b1b9072fe01b705ebbf34478d1", + "revision": "1cf90901f4571f157375f5110b153210f86c49aa", "repo_path": "integration/gaia-central" } From 399d3ae543cffc9053703135a7d110a7d095c261 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 01:32:54 -0700 Subject: [PATCH 07/38] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 599907fd2b24..b3bc1954ced6 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 9e79e5363aba..139f7c899153 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index f39da4c01ed9..4c3613f8b3f9 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index c62fc959bd67..c82cabc38aff 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 8f024a905621..801c5736f077 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 8c07bb592bb5..5db8c42e17f6 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index f39da4c01ed9..4c3613f8b3f9 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index e2d7a8762b78..4b2bd316555e 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index cc6d2d960eaf..f61cced6d36b 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 545df3de3da0..77b436a35289 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From a5123005756631f670574371170546537415d67d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 04:29:29 -0700 Subject: [PATCH 08/38] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c01616d4bd51 Author: Carsten Book Desc: Merge pull request #31677 from sroucheray/add-throttle Bug 1184012 - Add Utils.throttle method. r=steveck ======== https://hg.mozilla.org/integration/gaia-central/rev/360bc948a4aa Author: sroucheray Desc: Bug 1184012 - Add Utils.throttle method, r=steveck --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index a650576bf670..374d41ffa881 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "676caf58c4de93ba0d6a93add4d0a2ebfaa67764", + "git_revision": "e0bd0ec64986fe7b99699434da502404fb6ae128", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "1cf90901f4571f157375f5110b153210f86c49aa", + "revision": "c01616d4bd5173744a52a2af965e9702d52f2979", "repo_path": "integration/gaia-central" } From d7e6b68b27ad5fb99bfea41f75b27f078e8c8f7f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 04:32:52 -0700 Subject: [PATCH 09/38] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 4 ++-- b2g/config/dolphin/sources.xml | 4 ++-- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 8 ++++---- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 4 ++-- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index b3bc1954ced6..ad54d9ecafc3 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -12,10 +12,10 @@ - + - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 139f7c899153..32312cd8ee55 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -12,10 +12,10 @@ - + - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 4c3613f8b3f9..c2911765d93c 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index c82cabc38aff..d61fd431f33b 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 801c5736f077..401ec68ad5a9 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -12,10 +12,10 @@ - + - + @@ -129,10 +129,10 @@ - + - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 5db8c42e17f6..b626520f9731 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 4c3613f8b3f9..c2911765d93c 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 4b2bd316555e..19416477bbe7 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -12,10 +12,10 @@ - + - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index f61cced6d36b..15671809ef90 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 77b436a35289..781bd0620707 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 9b28a9f099f4ecd5470628f70bc469a7dbe03570 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 04:45:10 -0700 Subject: [PATCH 10/38] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a215c9d99375 Author: Johan Lorenzo Desc: Merge pull request #31718 from JohanLorenzo/bug-1202388 Bug 1202388 - Factorize the checkboxes and the swiches into 1 class ======== https://hg.mozilla.org/integration/gaia-central/rev/76cc3ecf64ab Author: Johan Lorenzo Desc: Bug 1202388 - Factorize the checkboxes and the switches into 1 class --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 374d41ffa881..3cb7fe25c3d7 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "e0bd0ec64986fe7b99699434da502404fb6ae128", + "git_revision": "e1fc5d6a83925ed4fac547a7fe4bacd3dd44ede2", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "c01616d4bd5173744a52a2af965e9702d52f2979", + "revision": "a215c9d99375eb8cb2ef1cc2abc3640905c569b8", "repo_path": "integration/gaia-central" } From 22e15bdecf142332123d51103337c70796070517 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 04:48:34 -0700 Subject: [PATCH 11/38] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index ad54d9ecafc3..e14a043223a4 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 32312cd8ee55..fc42054aa4b6 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c2911765d93c..28902e5a33a5 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index d61fd431f33b..4bcb8ec7e688 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 401ec68ad5a9..347606804953 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index b626520f9731..6aca4dc2084e 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index c2911765d93c..28902e5a33a5 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 19416477bbe7..a8a53e920c6f 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 15671809ef90..b4f0333937ca 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 781bd0620707..47239db436d5 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 7ac668eddfacba4af7a64bd6397e3e4f83bc461b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 04:59:53 -0700 Subject: [PATCH 12/38] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/9f5c0b5ff02a Author: gasolin Desc: Merge pull request #31662 from martiansideofthemoon/my-code-fix Bug 1200103 - Adding Bluetooth disabled message. r=gasolin ======== https://hg.mozilla.org/integration/gaia-central/rev/c0880a5ac04c Author: KALPESH KRISHNA Desc: Bug 1200103 - Adding Bluetooth disabled message. r=gasolin --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 3cb7fe25c3d7..e607835ef12e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "e1fc5d6a83925ed4fac547a7fe4bacd3dd44ede2", + "git_revision": "7939280f937e742043e5049e8cc7c566469d86fa", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "a215c9d99375eb8cb2ef1cc2abc3640905c569b8", + "revision": "9f5c0b5ff02a38cb08684b8c4a7a405fbe96b583", "repo_path": "integration/gaia-central" } From dabb6429e04689a6343ffbb1aee354e73f0b529b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 05:03:18 -0700 Subject: [PATCH 13/38] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index e14a043223a4..254e1d9808b2 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index fc42054aa4b6..8feefd5c2536 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 28902e5a33a5..4fb9149bec13 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 4bcb8ec7e688..6c3e6702e3c0 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 347606804953..05b896fad96a 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 6aca4dc2084e..ea6372eda496 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 28902e5a33a5..4fb9149bec13 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index a8a53e920c6f..829a9715f074 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index b4f0333937ca..0df4a0085828 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 47239db436d5..2c05b961e7e2 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 84f822726d5a73398f7c759ee113070022220e59 Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Fri, 11 Sep 2015 14:14:11 +0200 Subject: [PATCH 14/38] Backed out 1 changesets (bug 1198522) for gij20 test failures Backed out changeset b0c1649e39d2 (bug 1198522) --HG-- extra : rebase_source : 2625120b6ec2e36648e64ca39d701c0340d2047b --- .../BrowserElementChildPreload.js | 6 +++--- .../browserElement_ContextmenuEvents.js | 18 ++---------------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/dom/browser-element/BrowserElementChildPreload.js b/dom/browser-element/BrowserElementChildPreload.js index 70fdffc8a675..21b90e49027f 100644 --- a/dom/browser-element/BrowserElementChildPreload.js +++ b/dom/browser-element/BrowserElementChildPreload.js @@ -1258,7 +1258,7 @@ BrowserElementChild.prototype = { }, _buildMenuObj: function(menu, idPrefix, copyableElements) { - var menuObj = {type: 'menu', items: [], sysItems: []}; + var menuObj = {type: 'menu', items: []}; // Customized context menu if (menu) { this._maybeCopyAttribute(menu, menuObj, 'label'); @@ -1280,11 +1280,11 @@ BrowserElementChild.prototype = { // put together with other image options if elem is an image link. // "Copy Link" menu item if (copyableElements.link) { - menuObj.sysItems.push({id: 'copy-link'}); + menuObj.items.push({id: 'copy-link'}); } // "Copy Image" menu item if (copyableElements.image) { - menuObj.sysItems.push({id: 'copy-image'}); + menuObj.items.push({id: 'copy-image'}); } return menuObj; diff --git a/dom/browser-element/mochitest/browserElement_ContextmenuEvents.js b/dom/browser-element/mochitest/browserElement_ContextmenuEvents.js index 954feb144bf4..b55a9334225b 100644 --- a/dom/browser-element/mochitest/browserElement_ContextmenuEvents.js +++ b/dom/browser-element/mochitest/browserElement_ContextmenuEvents.js @@ -24,12 +24,7 @@ function checkEmptyContextMenu() { function checkInnerContextMenu() { sendContextMenuTo('#inner-link', function onContextMenu(detail) { is(detail.systemTargets.length, 1, 'Includes anchor data'); - is(detail.contextmenu.items.length, 2, 'Inner clicks trigger correct customized menu'); - is(detail.contextmenu.items[0].label, 'foo', 'Customized menu has a "foo" menu item'); - is(detail.contextmenu.items[1].label, 'bar', 'Customized menu has a "bar" menu item'); - is(detail.contextmenu.sysItems.length, 1, 'Inner clicks trigger correct sys cmd menu'); - is(detail.contextmenu.sysItems[0].id, 'copy-link', '#inner-link has a copy-link menu item'); - + is(detail.contextmenu.items.length, 3, 'Inner clicks trigger correct menu'); var target = detail.systemTargets[0]; is(target.nodeName, 'A', 'Reports correct nodeName'); is(target.data.uri, 'foo.html', 'Reports correct uri'); @@ -52,16 +47,9 @@ function checkNestedContextMenu() { var innerMenu = detail.contextmenu.items.filter(function(x) { return x.type === 'menu'; }); - is(detail.systemTargets.length, 2, 'Includes two systemTargets'); - is(detail.systemTargets[0].nodeName, 'IMG', 'Includes "IMG" node'); - is(detail.systemTargets[0].data.uri, 'example.png', 'Img data has the correct uri'); - is(detail.systemTargets[1].nodeName, 'A', 'Includes "A" node'); - is(detail.systemTargets[1].data.uri, 'bar.html', 'Anchor has the correct uri'); + is(detail.systemTargets.length, 2, 'Includes anchor and img data'); ok(innerMenu.length > 0, 'Menu contains a nested menu'); - is(detail.contextmenu.sysItems.length, 2, 'Sys cmd menu has the correct # of menu items') - is(detail.contextmenu.sysItems[0].id, 'copy-link', 'Has a copy-link menu item'); - is(detail.contextmenu.sysItems[1].id, 'copy-image', 'Has a copy-image menu item'); checkPreviousContextMenuHandler(); }); } @@ -143,8 +131,6 @@ function checkImageContextMenu() { var target = detail.systemTargets[0]; is(target.nodeName, 'IMG', 'Reports correct nodeName'); is(target.data.uri, 'example.png', 'Reports correct uri'); - is(detail.contextmenu.sysItems.length, 1, 'Reports correct # of sys cmd menu items'); - is(detail.contextmenu.sysItems[0].id, 'copy-image', 'IMG has a copy-image menu item'); checkVideoContextMenu(); }, /* ignorePreventDefault */ true); From 48745e89e1eca5a846b0f0ecbafa993454fb21a6 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 05:20:56 -0700 Subject: [PATCH 15/38] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/0850ede1922f Author: Martijn Desc: Merge pull request #31787 from mwargers/1203269 Bug 1203269 - Workaround fix for failure in test_lockscreen_unlock_to_homescreen_with_passcode.py ======== https://hg.mozilla.org/integration/gaia-central/rev/cc34ae8525d7 Author: Martijn Wargers Desc: Bug 1203269 - Workaround fix for failure in test_lockscreen_unlock_to_homescreen_with_passcode.py ======== https://hg.mozilla.org/integration/gaia-central/rev/a094c4b7caee Author: Martijn Desc: Merge pull request #31790 from mwargers/1203257 Bug 1203257 - Fix failure in test_homescreen_launch_app.py ======== https://hg.mozilla.org/integration/gaia-central/rev/ce85a5a6fc97 Author: Martijn Wargers Desc: Bug 1203257 - Fix failure in test_homescreen_launch_app.py --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index e607835ef12e..b9f66a102a99 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "7939280f937e742043e5049e8cc7c566469d86fa", + "git_revision": "2bd8d1dac1311a9854b75b8ab12f8ada055dce1a", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "9f5c0b5ff02a38cb08684b8c4a7a405fbe96b583", + "revision": "0850ede1922fc2fcb640f1c4940ee312648dde23", "repo_path": "integration/gaia-central" } From de455eb3facfacc1f9e50e110a16178bb4e5cce5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 05:21:20 -0700 Subject: [PATCH 16/38] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 254e1d9808b2..3778a09f54fa 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 8feefd5c2536..38f2baf1b615 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 4fb9149bec13..1156ff108f35 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 6c3e6702e3c0..a5a639d8a5d9 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 05b896fad96a..f9a1f779b55d 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index ea6372eda496..79f0fc48bbd3 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 4fb9149bec13..1156ff108f35 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 829a9715f074..1177bbdb204f 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 0df4a0085828..ba16b667374c 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 2c05b961e7e2..5caa0e8dc31c 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From b90844ba423588e3a1078357f4e9e37a22123bdb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 05:45:12 -0700 Subject: [PATCH 17/38] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8c8c4eee1ac0 Author: BavarianTomcat Desc: Revert "Bug 1198522 - Separate customized and sys cmd menu items" for gij 20 test failures This reverts commit b2c07892d75124eee015ff49ef83a3658206c6fe. --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index b9f66a102a99..66b4faf7f498 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "2bd8d1dac1311a9854b75b8ab12f8ada055dce1a", + "git_revision": "127265d61129b56f142abd6ef6990a0cbb229f8b", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "0850ede1922fc2fcb640f1c4940ee312648dde23", + "revision": "8c8c4eee1ac0ba27447c2e08d45804bd1f1fed23", "repo_path": "integration/gaia-central" } From 6bdcfa1791e82b51e679bca112d5f0113c80c4f2 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 05:48:35 -0700 Subject: [PATCH 18/38] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 3778a09f54fa..553e4e7bcc09 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 38f2baf1b615..1b96d5bb5d05 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 1156ff108f35..1b8275544fef 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index a5a639d8a5d9..80e0eef1f48e 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index f9a1f779b55d..3ad6c595405b 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 79f0fc48bbd3..9c5a2b499169 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 1156ff108f35..1b8275544fef 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 1177bbdb204f..66078c947a39 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index ba16b667374c..588b734c709c 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 5caa0e8dc31c..cd755b0712a8 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 23f8eb0e7d46ae22f40ff80a205348d13bbef782 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 06:10:18 -0700 Subject: [PATCH 19/38] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/3483948f81ab Author: Staś Małolepszy Desc: Merge pull request #31785 from stasm/1202442-l20n-3.0.6-reland Bug 1202442 - Update l20n.js to 3.0.6. r=gandalf r=hub ======== https://hg.mozilla.org/integration/gaia-central/rev/701a57e27f5c Author: Staś Małolepszy Desc: Bug 1202442 - Update l20n.js to 3.0.6. r=gandalf r=hub --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 66b4faf7f498..530d4adce34e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "127265d61129b56f142abd6ef6990a0cbb229f8b", + "git_revision": "bfc77a7b8854484317a781581c87fc26da92809b", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "8c8c4eee1ac0ba27447c2e08d45804bd1f1fed23", + "revision": "3483948f81ab51dbf191325815b29d070f761577", "repo_path": "integration/gaia-central" } From bc6e90a60fa3e5907d93e29049836c2734fe1deb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 06:14:15 -0700 Subject: [PATCH 20/38] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 553e4e7bcc09..0315575aad27 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 1b96d5bb5d05..55428ab7c8c3 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 1b8275544fef..c4c89d5a0932 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 80e0eef1f48e..86638431e66d 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 3ad6c595405b..59f28b9c89dc 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 9c5a2b499169..157a60acc8ea 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 1b8275544fef..c4c89d5a0932 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 66078c947a39..86ee672477a4 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 588b734c709c..c1e6a29526ac 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index cd755b0712a8..7e2e76fd002a 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 07b01266295f8e323763223ac45d448159cae0cd Mon Sep 17 00:00:00 2001 From: Shawn Huang Date: Fri, 11 Sep 2015 21:21:19 +0800 Subject: [PATCH 21/38] Bug 1166679 - Implement GetMessage function, r=btian --- .../bluedroid/BluetoothMapSmsManager.cpp | 43 ++++++++++++++++++- .../bluedroid/BluetoothMapSmsManager.h | 1 + dom/bluetooth/common/BluetoothCommon.h | 6 +++ 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dom/bluetooth/bluedroid/BluetoothMapSmsManager.cpp b/dom/bluetooth/bluedroid/BluetoothMapSmsManager.cpp index ab32eab98dfc..36422c67a48d 100644 --- a/dom/bluetooth/bluedroid/BluetoothMapSmsManager.cpp +++ b/dom/bluetooth/bluedroid/BluetoothMapSmsManager.cpp @@ -350,8 +350,8 @@ BluetoothMapSmsManager::MasDataHandler(UnixSocketBuffer* aMessage) HandleSmsMmsFolderListing(pktHeaders); } else if (type.EqualsLiteral("x-bt/MAP-msg-listing")) { HandleSmsMmsMsgListing(pktHeaders); - } else if (type.EqualsLiteral("x-bt/message")) { - // TODO: Implement this feature in Bug 1166679 + } else if (type.EqualsLiteral("x-bt/message")) { + HandleSmsMmsGetMessage(pktHeaders); } else { BT_LOGR("Unknown MAP request type: %s", NS_ConvertUTF16toUTF8(type).get()); @@ -785,6 +785,22 @@ BluetoothMapSmsManager::AppendBtNamedValueByTagId( AppendNamedValue(aValues, "filterPriority", filterPriority); break; } + case Map::AppParametersTagId::Attachment: { + uint8_t attachment = *((uint8_t *)buf); + // convert big endian to little endian + attachment = (attachment >> 8) | (attachment << 8); + BT_LOGR("msg filter attachment: %d", attachment); + AppendNamedValue(aValues, "attachment", attachment); + break; + } + case Map::AppParametersTagId::Charset: { + uint8_t charset = *((uint8_t *)buf); + // convert big endian to little endian + charset = (charset >> 8) | (charset << 8); + BT_LOGR("msg filter charset: %d", charset); + AppendNamedValue(aValues, "charset", charset); + break; + } default: BT_LOGR("Unsupported AppParameterTag: %x", aTagId); break; @@ -823,6 +839,29 @@ BluetoothMapSmsManager::HandleSmsMmsMsgListing(const ObexHeaderSet& aHeader) data); } +void +BluetoothMapSmsManager::HandleSmsMmsGetMessage(const ObexHeaderSet& aHeader) +{ + MOZ_ASSERT(NS_IsMainThread()); + + BluetoothService* bs = BluetoothService::Get(); + NS_ENSURE_TRUE_VOID(bs); + + InfallibleTArray data; + nsString name; + aHeader.GetName(name); + AppendNamedValue(data, "handle", name); + + AppendBtNamedValueByTagId(aHeader, data, + Map::AppParametersTagId::Attachment); + AppendBtNamedValueByTagId(aHeader, data, + Map::AppParametersTagId::Charset); + + bs->DistributeSignal(NS_LITERAL_STRING(MAP_GET_MESSAGE_REQ_ID), + NS_LITERAL_STRING(KEY_ADAPTER), + data); +} + void BluetoothMapSmsManager::BuildDefaultFolderStructure() { diff --git a/dom/bluetooth/bluedroid/BluetoothMapSmsManager.h b/dom/bluetooth/bluedroid/BluetoothMapSmsManager.h index 221eddb649ca..5be183f77045 100644 --- a/dom/bluetooth/bluedroid/BluetoothMapSmsManager.h +++ b/dom/bluetooth/bluedroid/BluetoothMapSmsManager.h @@ -97,6 +97,7 @@ private: void HandleMessageStatus(const ObexHeaderSet& aHeader); void HandleSmsMmsFolderListing(const ObexHeaderSet& aHeader); void HandleSmsMmsMsgListing(const ObexHeaderSet& aHeader); + void HandleSmsMmsGetMessage(const ObexHeaderSet& aHeader); void AppendBtNamedValueByTagId(const ObexHeaderSet& aHeader, InfallibleTArray& aValues, const Map::AppParametersTagId aTagId); diff --git a/dom/bluetooth/common/BluetoothCommon.h b/dom/bluetooth/common/BluetoothCommon.h index 67cb0f641d1a..9796b0f0c773 100644 --- a/dom/bluetooth/common/BluetoothCommon.h +++ b/dom/bluetooth/common/BluetoothCommon.h @@ -191,6 +191,12 @@ extern bool gBluetoothDebugFlag; */ #define MAP_MESSAGES_LISTING_REQ_ID "mapmessageslistingreq" +/** + * When receiving a MAP request of 'get message' from a remote device, + * we'll dispatch an event. + */ +#define MAP_GET_MESSAGE_REQ_ID "mapgetmessagereq" + /** * When the value of a characteristic of a remote BLE device changes, we'll * dispatch an event From 72803bd36c2edf82ac94da568fe0377595692121 Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Fri, 11 Sep 2015 11:57:53 +0800 Subject: [PATCH 22/38] Bug 1203828 - Let test_mobile_data_ipv6.js really test the v4 or v6 ip addresses. r=jjong --- .../tests/marionette/test_mobile_data_ipv6.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dom/mobileconnection/tests/marionette/test_mobile_data_ipv6.js b/dom/mobileconnection/tests/marionette/test_mobile_data_ipv6.js index 8ec88686e51c..7d49979f244a 100644 --- a/dom/mobileconnection/tests/marionette/test_mobile_data_ipv6.js +++ b/dom/mobileconnection/tests/marionette/test_mobile_data_ipv6.js @@ -43,12 +43,12 @@ function doTest(aApnSettings, aHaveV4Address, aHaveV6Address) { if (aHaveV4Address) { ok(ips.value.reduce(function(aFound, aAddress) { return aFound || aAddress.indexOf(":") < 0; - }), "IPv4 address"); + }, false), "IPv4 address"); } if (aHaveV6Address) { ok(ips.value.reduce(function(aFound, aAddress) { return aFound || aAddress.indexOf(":") > 0; - }), "IPv6 address"); + }, false), "IPv6 address"); } }) .then(() => setDataEnabledAndWait(false)); From 55be2eae109cc1cbfb31421da21d15f2a5a58b44 Mon Sep 17 00:00:00 2001 From: Shawn Huang Date: Fri, 11 Sep 2015 22:45:18 +0800 Subject: [PATCH 23/38] Bug 1186836 - Implement SetMessageStatus function, r=btian --- .../bluedroid/BluetoothMapSmsManager.cpp | 44 +++++++++++++++++-- .../bluedroid/BluetoothMapSmsManager.h | 2 +- dom/bluetooth/common/BluetoothCommon.h | 6 +++ 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dom/bluetooth/bluedroid/BluetoothMapSmsManager.cpp b/dom/bluetooth/bluedroid/BluetoothMapSmsManager.cpp index 36422c67a48d..66db1938bb0f 100644 --- a/dom/bluetooth/bluedroid/BluetoothMapSmsManager.cpp +++ b/dom/bluetooth/bluedroid/BluetoothMapSmsManager.cpp @@ -333,7 +333,7 @@ BluetoothMapSmsManager::MasDataHandler(UnixSocketBuffer* aMessage) } else if (type.EqualsLiteral("x-bt/MAP-event-report")) { HandleEventReport(pktHeaders); } else if (type.EqualsLiteral("x-bt/messageStatus")) { - HandleMessageStatus(pktHeaders); + HandleSetMessageStatus(pktHeaders); } } break; @@ -801,6 +801,24 @@ BluetoothMapSmsManager::AppendBtNamedValueByTagId( AppendNamedValue(aValues, "charset", charset); break; } + case Map::AppParametersTagId::StatusIndicator: { + uint8_t statusIndicator = *((uint8_t *)buf); + // convert big endian to little endian + statusIndicator = (statusIndicator >> 8) | (statusIndicator << 8); + BT_LOGR("msg filter statusIndicator: %d", statusIndicator); + AppendNamedValue(aValues, "statusIndicator", + static_cast(statusIndicator)); + break; + } + case Map::AppParametersTagId::StatusValue: { + uint8_t statusValue = *((uint8_t *)buf); + // convert big endian to little endian + statusValue = (statusValue >> 8) | (statusValue << 8); + BT_LOGR("msg filter statusvalue: %d", statusValue); + AppendNamedValue(aValues, "statusValue", + static_cast(statusValue)); + break; + } default: BT_LOGR("Unsupported AppParameterTag: %x", aTagId); break; @@ -937,9 +955,29 @@ BluetoothMapSmsManager::HandleEventReport(const ObexHeaderSet& aHeader) } void -BluetoothMapSmsManager::HandleMessageStatus(const ObexHeaderSet& aHeader) +BluetoothMapSmsManager::HandleSetMessageStatus(const ObexHeaderSet& aHeader) { - // TODO: Handle MessageStatus update in Bug 1186836 + MOZ_ASSERT(NS_IsMainThread()); + + BluetoothService* bs = BluetoothService::Get(); + NS_ENSURE_TRUE_VOID(bs); + + InfallibleTArray data; + nsString name; + aHeader.GetName(name); + /* The Name header shall contain the handle of the message the status of which + * shall be modified. The handle shall be represented by a null-terminated + * Unicode text string with 16 hexadecimal digits. + */ + AppendNamedValue(data, "handle", name); + + AppendBtNamedValueByTagId(aHeader, data, + Map::AppParametersTagId::StatusIndicator); + AppendBtNamedValueByTagId(aHeader, data, + Map::AppParametersTagId::StatusValue); + + bs->DistributeSignal(NS_LITERAL_STRING(MAP_SET_MESSAGE_STATUS_REQ_ID), + NS_LITERAL_STRING(KEY_ADAPTER), data); } void diff --git a/dom/bluetooth/bluedroid/BluetoothMapSmsManager.h b/dom/bluetooth/bluedroid/BluetoothMapSmsManager.h index 5be183f77045..98c5767a6cda 100644 --- a/dom/bluetooth/bluedroid/BluetoothMapSmsManager.h +++ b/dom/bluetooth/bluedroid/BluetoothMapSmsManager.h @@ -94,7 +94,7 @@ private: void HandleNotificationRegistration(const ObexHeaderSet& aHeader); void HandleEventReport(const ObexHeaderSet& aHeader); - void HandleMessageStatus(const ObexHeaderSet& aHeader); + void HandleSetMessageStatus(const ObexHeaderSet& aHeader); void HandleSmsMmsFolderListing(const ObexHeaderSet& aHeader); void HandleSmsMmsMsgListing(const ObexHeaderSet& aHeader); void HandleSmsMmsGetMessage(const ObexHeaderSet& aHeader); diff --git a/dom/bluetooth/common/BluetoothCommon.h b/dom/bluetooth/common/BluetoothCommon.h index 9796b0f0c773..89ad828c4bac 100644 --- a/dom/bluetooth/common/BluetoothCommon.h +++ b/dom/bluetooth/common/BluetoothCommon.h @@ -197,6 +197,12 @@ extern bool gBluetoothDebugFlag; */ #define MAP_GET_MESSAGE_REQ_ID "mapgetmessagereq" +/** + * When receiving a MAP request of 'set message' from a remote device, + * we'll dispatch an event. + */ +#define MAP_SET_MESSAGE_STATUS_REQ_ID "mapsetmessagestatusreq" + /** * When the value of a characteristic of a remote BLE device changes, we'll * dispatch an event From e3e708534a7419a162ce21f1e0f79b3998936edd Mon Sep 17 00:00:00 2001 From: Reuben Morais Date: Fri, 11 Sep 2015 12:12:52 -0300 Subject: [PATCH 24/38] Bug 1202788 - Upgrade object_data table to new format (follow-up to bug 871846). r=janv --- dom/indexedDB/ActorsParent.cpp | 224 ++++++++++++++++++++++++++++++++- 1 file changed, 219 insertions(+), 5 deletions(-) diff --git a/dom/indexedDB/ActorsParent.cpp b/dom/indexedDB/ActorsParent.cpp index 4c0ec98ccb38..56b67b2a1fd0 100644 --- a/dom/indexedDB/ActorsParent.cpp +++ b/dom/indexedDB/ActorsParent.cpp @@ -150,7 +150,7 @@ static_assert(JS_STRUCTURED_CLONE_VERSION == 5, "Need to update the major schema version."); // Major schema version. Bump for almost everything. -const uint32_t kMajorSchemaVersion = 20; +const uint32_t kMajorSchemaVersion = 21; // Minor schema version. Should almost always be 0 (maybe bump on release // branches if we have to). @@ -3626,8 +3626,9 @@ UpgradeSchemaFrom18_0To19_0(mozIStorageConnection* aConnection) MOZ_ASSERT(aConnection); nsresult rv; - PROFILER_LABEL("IndexedDB", "UpgradeSchemaFrom17_0To18_0", - js::ProfileEntry::Category::STORAGE); + PROFILER_LABEL("IndexedDB", + "UpgradeSchemaFrom18_0To19_0", + js::ProfileEntry::Category::STORAGE); rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING( "ALTER TABLE object_store_index " @@ -3734,7 +3735,7 @@ UpgradeSchemaFrom19_0To20_0(nsIFile* aFMDirectory, MOZ_ASSERT(aConnection); PROFILER_LABEL("IndexedDB", - "UpgradeSchemaFrom18_0To19_0", + "UpgradeSchemaFrom19_0To20_0", js::ProfileEntry::Category::STORAGE); #if defined(MOZ_B2G) @@ -3854,6 +3855,217 @@ UpgradeSchemaFrom19_0To20_0(nsIFile* aFMDirectory, return NS_OK; } +class UpgradeIndexDataValuesFunction final + : public mozIStorageFunction +{ +public: + UpgradeIndexDataValuesFunction() + { + AssertIsOnIOThread(); + } + + NS_DECL_ISUPPORTS + +private: + ~UpgradeIndexDataValuesFunction() + { + AssertIsOnIOThread(); + } + + nsresult + ReadOldCompressedIDVFromBlob(const uint8_t* aBlobData, + uint32_t aBlobDataLength, + FallibleTArray& aIndexValues); + + NS_IMETHOD + OnFunctionCall(mozIStorageValueArray* aArguments, + nsIVariant** aResult) override; +}; + +NS_IMPL_ISUPPORTS(UpgradeIndexDataValuesFunction, mozIStorageFunction) + +nsresult +UpgradeIndexDataValuesFunction::ReadOldCompressedIDVFromBlob( + const uint8_t* aBlobData, + uint32_t aBlobDataLength, + FallibleTArray& aIndexValues) +{ + MOZ_ASSERT(!NS_IsMainThread()); + MOZ_ASSERT(!IsOnBackgroundThread()); + MOZ_ASSERT(aBlobData); + MOZ_ASSERT(aBlobDataLength); + MOZ_ASSERT(aIndexValues.IsEmpty()); + + const uint8_t* blobDataIter = aBlobData; + const uint8_t* blobDataEnd = aBlobData + aBlobDataLength; + + int64_t indexId; + bool unique; + bool nextIndexIdAlreadyRead = false; + + while (blobDataIter < blobDataEnd) { + if (!nextIndexIdAlreadyRead) { + ReadCompressedIndexId(&blobDataIter, blobDataEnd, &indexId, &unique); + } + nextIndexIdAlreadyRead = false; + + if (NS_WARN_IF(blobDataIter == blobDataEnd)) { + IDB_REPORT_INTERNAL_ERR(); + return NS_ERROR_FILE_CORRUPTED; + } + + // Read key buffer length. + const uint64_t keyBufferLength = + ReadCompressedNumber(&blobDataIter, blobDataEnd); + + if (NS_WARN_IF(blobDataIter == blobDataEnd) || + NS_WARN_IF(keyBufferLength > uint64_t(UINT32_MAX)) || + NS_WARN_IF(blobDataIter + keyBufferLength > blobDataEnd)) { + IDB_REPORT_INTERNAL_ERR(); + return NS_ERROR_FILE_CORRUPTED; + } + + nsCString keyBuffer(reinterpret_cast(blobDataIter), + uint32_t(keyBufferLength)); + blobDataIter += keyBufferLength; + + IndexDataValue idv(indexId, unique, Key(keyBuffer)); + + if (blobDataIter < blobDataEnd) { + // Read either a sort key buffer length or an index id. + uint64_t maybeIndexId = ReadCompressedNumber(&blobDataIter, blobDataEnd); + + // Locale-aware indexes haven't been around long enough to have any users, + // we can safely assume all sort key buffer lengths will be zero. + if (maybeIndexId != 0) { + if (maybeIndexId % 2) { + unique = true; + maybeIndexId--; + } else { + unique = false; + } + indexId = maybeIndexId/2; + nextIndexIdAlreadyRead = true; + } + } + + if (NS_WARN_IF(!aIndexValues.InsertElementSorted(idv, fallible))) { + IDB_REPORT_INTERNAL_ERR(); + return NS_ERROR_OUT_OF_MEMORY; + } + } + + MOZ_ASSERT(blobDataIter == blobDataEnd); + + return NS_OK; +} + +NS_IMETHODIMP +UpgradeIndexDataValuesFunction::OnFunctionCall(mozIStorageValueArray* aArguments, + nsIVariant** aResult) +{ + MOZ_ASSERT(aArguments); + MOZ_ASSERT(aResult); + + PROFILER_LABEL("IndexedDB", + "UpgradeIndexDataValuesFunction::OnFunctionCall", + js::ProfileEntry::Category::STORAGE); + + uint32_t argc; + nsresult rv = aArguments->GetNumEntries(&argc); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + + if (argc != 1) { + NS_WARNING("Don't call me with the wrong number of arguments!"); + return NS_ERROR_UNEXPECTED; + } + + int32_t type; + rv = aArguments->GetTypeOfIndex(0, &type); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + + if (type != mozIStorageStatement::VALUE_TYPE_BLOB) { + NS_WARNING("Don't call me with the wrong type of arguments!"); + return NS_ERROR_UNEXPECTED; + } + + const uint8_t* oldBlob; + uint32_t oldBlobLength; + rv = aArguments->GetSharedBlob(0, &oldBlobLength, &oldBlob); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + + AutoFallibleTArray oldIdv; + rv = ReadOldCompressedIDVFromBlob(oldBlob, oldBlobLength, oldIdv); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + + UniqueFreePtr newIdv; + uint32_t newIdvLength; + rv = MakeCompressedIndexDataValues(oldIdv, newIdv, &newIdvLength); + + std::pair data(newIdv.get(), newIdvLength); + + nsCOMPtr result = new storage::AdoptedBlobVariant(data); + + newIdv.release(); + + result.forget(aResult); + return NS_OK; +} + +nsresult +UpgradeSchemaFrom20_0To21_0(mozIStorageConnection* aConnection) +{ + // This should have been part of the 18 to 19 upgrade, where we changed the + // layout of the index_data_values blobs but didn't upgrade the existing data. + // See bug 1202788. + + AssertIsOnIOThread(); + MOZ_ASSERT(aConnection); + + PROFILER_LABEL("IndexedDB", + "UpgradeSchemaFrom20_0To21_0", + js::ProfileEntry::Category::STORAGE); + + nsRefPtr function = + new UpgradeIndexDataValuesFunction(); + + NS_NAMED_LITERAL_CSTRING(functionName, "upgrade_idv"); + + nsresult rv = aConnection->CreateFunction(functionName, 1, function); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + + rv = aConnection->ExecuteSimpleSQL(NS_LITERAL_CSTRING( + "UPDATE object_data " + "SET index_data_values = upgrade_idv(index_data_values) " + "WHERE index_data_values IS NOT NULL;" + )); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + + rv = aConnection->RemoveFunction(functionName); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + + rv = aConnection->SetSchemaVersion(MakeSchemaVersion(21, 0)); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + + return NS_OK; +} + nsresult GetDatabaseFileURL(nsIFile* aDatabaseFile, PersistenceType aPersistenceType, @@ -4346,7 +4558,7 @@ CreateStorageConnection(nsIFile* aDBFile, } } else { // This logic needs to change next time we change the schema! - static_assert(kSQLiteSchemaVersion == int32_t((20 << 4) + 0), + static_assert(kSQLiteSchemaVersion == int32_t((21 << 4) + 0), "Upgrade function needed due to schema version increase."); while (schemaVersion != kSQLiteSchemaVersion) { @@ -4384,6 +4596,8 @@ CreateStorageConnection(nsIFile* aDBFile, rv = UpgradeSchemaFrom18_0To19_0(connection); } else if (schemaVersion == MakeSchemaVersion(19, 0)) { rv = UpgradeSchemaFrom19_0To20_0(aFMDirectory, connection); + } else if (schemaVersion == MakeSchemaVersion(20, 0)) { + rv = UpgradeSchemaFrom20_0To21_0(connection); } else { IDB_WARNING("Unable to open IndexedDB database, no upgrade path is " "available!"); From 95a69fcd818afe754c909667bfcd4741118561da Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 08:16:26 -0700 Subject: [PATCH 25/38] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/3dba1d8c3f85 Author: Hubert Figuière Desc: Merge pull request #31233 from hfiguiere/bug1157782-shuffle-test Bug 1157782 - Fix the shuffle test to make it more robust. r=squib ======== https://hg.mozilla.org/integration/gaia-central/rev/32ac7a531130 Author: Hubert Figuière Desc: Bug 1157782 - Make all the test files a 10sec blank so that we have time to stuff ======== https://hg.mozilla.org/integration/gaia-central/rev/af8ce7bd2295 Author: Hubert Figuière Desc: Bug 1157782 - Fix the shuffle test to make it more robust. --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 530d4adce34e..a5b99aafb199 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "bfc77a7b8854484317a781581c87fc26da92809b", + "git_revision": "13ed13e061bd4f20de47c196469a63706fe866a7", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "3483948f81ab51dbf191325815b29d070f761577", + "revision": "3dba1d8c3f85d4b50b01387a99e8b7f643de2379", "repo_path": "integration/gaia-central" } From 170a6b0ebd8ee7b332b05aabd21bce951742cfc5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 08:16:50 -0700 Subject: [PATCH 26/38] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 0315575aad27..f41796014f85 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 55428ab7c8c3..7c7618398ec0 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c4c89d5a0932..d7402615235a 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 86638431e66d..e58fc6989a3c 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 59f28b9c89dc..8bf8ba9e8b75 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 157a60acc8ea..65bda2b2f919 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index c4c89d5a0932..d7402615235a 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 86ee672477a4..307b58503e52 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index c1e6a29526ac..5b964cc9aebc 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 7e2e76fd002a..c76bdc430544 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 09b74c77b82bddd001142a7b2d7539c7bd6267bf Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 09:45:40 -0700 Subject: [PATCH 27/38] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/55a71ca30475 Author: Fernando Jiménez Moreno Desc: Merge pull request #31567 from michielbdejong/1191776-fxsyncwebcrypto Bug 1191776 - FxSyncWebCrypto component of Sync app r=ferjm ======== https://hg.mozilla.org/integration/gaia-central/rev/d2bd294f75e3 Author: Michiel de Jong Desc: Bug 1191776 - FxSyncWebCrypto component of Sync app r=ferjm --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index a5b99aafb199..58282dfa7622 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "13ed13e061bd4f20de47c196469a63706fe866a7", + "git_revision": "b467811f80e3000ca35e30821bc09f606cf93ee8", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "3dba1d8c3f85d4b50b01387a99e8b7f643de2379", + "revision": "55a71ca304757c19aa085707431578958a45ec14", "repo_path": "integration/gaia-central" } From a888b8914a96faabffd28f30795f2ba55632920b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 09:51:52 -0700 Subject: [PATCH 28/38] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index f41796014f85..7da558619c7d 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 7c7618398ec0..47e88b0dea82 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index d7402615235a..bcb1d499adfb 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index e58fc6989a3c..a7736f4e69fd 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 8bf8ba9e8b75..d54687b14ed6 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 65bda2b2f919..0c6f4529669f 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index d7402615235a..bcb1d499adfb 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 307b58503e52..05396bdb60ec 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 5b964cc9aebc..0afcb286aa96 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index c76bdc430544..524475820b05 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 9e3b76dbd724dc7b056f5dd3150a67d08edc51e8 Mon Sep 17 00:00:00 2001 From: Gregory Arndt Date: Fri, 11 Sep 2015 08:23:01 -0500 Subject: [PATCH 29/38] Bug 1203965 - Update images to use taskcluster-vcs 2.3.12 r=wcosta --HG-- extra : commitid : Et296llVDam extra : rebase_source : 693ded7814b48931465ee259b86440dd408c154e --- testing/docker/builder/Dockerfile | 2 +- testing/docker/builder/VERSION | 2 +- testing/docker/centos6-build/VERSION | 2 +- testing/docker/centos6-build/system-setup.sh | 2 +- testing/docker/tester-device/Dockerfile | 2 +- testing/docker/tester-device/VERSION | 2 +- testing/docker/tester/Dockerfile | 2 +- testing/docker/tester/VERSION | 2 +- testing/docker/ubuntu-build/Dockerfile | 2 +- testing/docker/ubuntu-build/VERSION | 2 +- testing/docker/ubuntu32-build/Dockerfile | 2 +- testing/docker/ubuntu32-build/VERSION | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/testing/docker/builder/Dockerfile b/testing/docker/builder/Dockerfile index c57f06647c6b..35a0a0c4616d 100644 --- a/testing/docker/builder/Dockerfile +++ b/testing/docker/builder/Dockerfile @@ -21,7 +21,7 @@ RUN git config --global user.email "mozilla@example.com" && \ git config --global user.name "mozilla" # VCS Tools -RUN npm install -g taskcluster-vcs@2.3.9 +RUN npm install -g taskcluster-vcs@2.3.12 # TODO enable worker # TODO volume mount permissions will be an issue diff --git a/testing/docker/builder/VERSION b/testing/docker/builder/VERSION index 659914ae9416..416bfb0a2212 100644 --- a/testing/docker/builder/VERSION +++ b/testing/docker/builder/VERSION @@ -1 +1 @@ -0.5.8 +0.5.9 diff --git a/testing/docker/centos6-build/VERSION b/testing/docker/centos6-build/VERSION index 8acdd82b765e..4e379d2bfeab 100644 --- a/testing/docker/centos6-build/VERSION +++ b/testing/docker/centos6-build/VERSION @@ -1 +1 @@ -0.0.1 +0.0.2 diff --git a/testing/docker/centos6-build/system-setup.sh b/testing/docker/centos6-build/system-setup.sh index b390ac1003ab..e6bf06ed3fce 100644 --- a/testing/docker/centos6-build/system-setup.sh +++ b/testing/docker/centos6-build/system-setup.sh @@ -244,7 +244,7 @@ EOF peep install -r requirements.txt # TC-VCS -npm install -g taskcluster-vcs@2.3.8 +npm install -g taskcluster-vcs@2.3.12 # note that TC will replace workspace with a cache mount; there's no sense # creating anything inside there diff --git a/testing/docker/tester-device/Dockerfile b/testing/docker/tester-device/Dockerfile index f9fcde700fdc..d9dc7b7145a9 100644 --- a/testing/docker/tester-device/Dockerfile +++ b/testing/docker/tester-device/Dockerfile @@ -31,7 +31,7 @@ RUN git config --global user.email "mozilla@example.com" && \ # Get node packages -RUN npm install -g taskcluster-vcs@2.3.9 +RUN npm install -g taskcluster-vcs@2.3.12 WORKDIR /home/worker diff --git a/testing/docker/tester-device/VERSION b/testing/docker/tester-device/VERSION index 1750564f270b..5a5831ab6bf6 100644 --- a/testing/docker/tester-device/VERSION +++ b/testing/docker/tester-device/VERSION @@ -1 +1 @@ -0.0.6 +0.0.7 diff --git a/testing/docker/tester/Dockerfile b/testing/docker/tester/Dockerfile index 78c17f6df91c..49d99b81a9e3 100644 --- a/testing/docker/tester/Dockerfile +++ b/testing/docker/tester/Dockerfile @@ -18,7 +18,7 @@ RUN chmod u+x /usr/local/bin/linux64-minidump_stackwalk RUN apt-get install -y python-pip && pip install virtualenv; RUN mkdir Documents; mkdir Pictures; mkdir Music; mkdir Videos; mkdir artifacts RUN npm install -g npm@^2.0.0 -RUN npm install -g taskcluster-vcs@2.3.9 +RUN npm install -g taskcluster-vcs@2.3.12 RUN npm install -g taskcluster-npm-cache@1.1.14 RUN rm -Rf .cache && mkdir -p .cache ENV PATH $PATH:/home/worker/bin diff --git a/testing/docker/tester/VERSION b/testing/docker/tester/VERSION index 0f82685331ef..667843220966 100644 --- a/testing/docker/tester/VERSION +++ b/testing/docker/tester/VERSION @@ -1 +1 @@ -0.3.7 +0.3.8 diff --git a/testing/docker/ubuntu-build/Dockerfile b/testing/docker/ubuntu-build/Dockerfile index 0fedd6cca52e..3fd78b9c28a5 100644 --- a/testing/docker/ubuntu-build/Dockerfile +++ b/testing/docker/ubuntu-build/Dockerfile @@ -11,7 +11,7 @@ RUN bash /tmp/system-setup.sh # configure git and install tc-vcs RUN git config --global user.email "nobody@mozilla.com" && \ git config --global user.name "mozilla" -RUN npm install -g taskcluster-vcs@2.3.9 +RUN npm install -g taskcluster-vcs@2.3.12 # Ensure that build specific dependencies live in a single layer ADD build-setup.sh /tmp/build-setup.sh diff --git a/testing/docker/ubuntu-build/VERSION b/testing/docker/ubuntu-build/VERSION index 1750564f270b..5a5831ab6bf6 100644 --- a/testing/docker/ubuntu-build/VERSION +++ b/testing/docker/ubuntu-build/VERSION @@ -1 +1 @@ -0.0.6 +0.0.7 diff --git a/testing/docker/ubuntu32-build/Dockerfile b/testing/docker/ubuntu32-build/Dockerfile index 7317bc4cd347..2f41c0039e30 100644 --- a/testing/docker/ubuntu32-build/Dockerfile +++ b/testing/docker/ubuntu32-build/Dockerfile @@ -11,7 +11,7 @@ RUN bash /tmp/system-setup.sh # configure git and install tc-vcs RUN git config --global user.email "nobody@mozilla.com" && \ git config --global user.name "mozilla" -RUN npm install -g taskcluster-vcs@2.3.9 +RUN npm install -g taskcluster-vcs@2.3.12 # Ensure that build specific dependencies live in a single layer ADD build-setup.sh /tmp/build-setup.sh diff --git a/testing/docker/ubuntu32-build/VERSION b/testing/docker/ubuntu32-build/VERSION index 1750564f270b..5a5831ab6bf6 100644 --- a/testing/docker/ubuntu32-build/VERSION +++ b/testing/docker/ubuntu32-build/VERSION @@ -1 +1 @@ -0.0.6 +0.0.7 From c57e3a610e33d29b22f88a3ebe45667e5765182a Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Fri, 11 Sep 2015 14:36:36 -0400 Subject: [PATCH 30/38] Bug 1203132 - Add an SVG for the B2G flow of touch events. r=botond DONTBUILD because NPOTB --HG-- extra : commitid : 19NNOhDSDA4 --- gfx/doc/B2GInputFlow.svg | 349 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 349 insertions(+) create mode 100644 gfx/doc/B2GInputFlow.svg diff --git a/gfx/doc/B2GInputFlow.svg b/gfx/doc/B2GInputFlow.svg new file mode 100644 index 000000000000..ee6f4332c28d --- /dev/null +++ b/gfx/doc/B2GInputFlow.svg @@ -0,0 +1,349 @@ + + + Touch input event flow on B2G + + + + From 51f7ee39df0d92e9541b96f6a0dfb2360612e7ee Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 12:05:07 -0700 Subject: [PATCH 31/38] Bumping gaia.json for 8 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/fc6be47c9a6d Author: Sam Foster Desc: Merge pull request #31791 from sfoster/ftu-navigation-bug-1203677 Bug 1203677 - refactor Navigation to expose API for step registration. r=fcampo ======== https://hg.mozilla.org/integration/gaia-central/rev/5ea94c9b6750 Author: Sam Foster Desc: Bug 1203677 - refactor Navigation to expose API for step registration. r=fcampo ======== https://hg.mozilla.org/integration/gaia-central/rev/675b2d4c74ef Author: Martijn Desc: Merge pull request #31795 from mwargers/1203734 Bug 1203734 - test_import_gmail_no_network.py is passing unexpectedly ======== https://hg.mozilla.org/integration/gaia-central/rev/355c695d5238 Author: Martijn Wargers Desc: Bug 1203734 - test_import_gmail_no_network.py is passing unexpectedly ======== https://hg.mozilla.org/integration/gaia-central/rev/318cff8a8b7f Author: Martijn Desc: Merge pull request #31801 from mwargers/1202831 Bug 1202831 - Fix failure in test_findmydevice.py ======== https://hg.mozilla.org/integration/gaia-central/rev/ab6b1c087822 Author: Martijn Wargers Desc: Bug 1202831 - Fix failure in test_findmydevice.py ======== https://hg.mozilla.org/integration/gaia-central/rev/2b06f1d7fcbf Author: Martijn Desc: Merge pull request #31793 from mwargers/1201211 Bug 1201211 - Workaround fix for failure in test_add_new_contact.py ======== https://hg.mozilla.org/integration/gaia-central/rev/250ceda6c870 Author: Martijn Wargers Desc: Bug 1201211 - Workaround fix for failure in test_add_new_contact.py --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 58282dfa7622..6f99c07d2123 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "b467811f80e3000ca35e30821bc09f606cf93ee8", + "git_revision": "93f7ade5d5b1030264ab0ace3a88f125e9e660c7", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "55a71ca304757c19aa085707431578958a45ec14", + "revision": "fc6be47c9a6db566e7dca1e3619aa95901a20528", "repo_path": "integration/gaia-central" } From 72adde8e43162036bf517f50400c4c88260bdd0b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 12:08:29 -0700 Subject: [PATCH 32/38] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 7da558619c7d..5be62fba5aa9 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 47e88b0dea82..9adc76c14cb6 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index bcb1d499adfb..b3aeded99fc7 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index a7736f4e69fd..15e37d2936e2 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index d54687b14ed6..7dffddae74aa 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 0c6f4529669f..0bed0b8410c6 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index bcb1d499adfb..b3aeded99fc7 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 05396bdb60ec..cd56bfce68f1 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 0afcb286aa96..e1fb55e58a99 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 524475820b05..a9c56afc8a8d 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From c7bf7e3634f50212259f8b9ed3e725fb8e787a7a Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Fri, 11 Sep 2015 15:12:29 -0400 Subject: [PATCH 33/38] Bug 1200093 - Don't rely on finding the widget for a document in order to get the css-to-ld scale. r=botond --HG-- extra : commitid : Fu6XjQTqeNx --- dom/base/nsDocument.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp index 8bfd20fbeea4..f83f4931725f 100644 --- a/dom/base/nsDocument.cpp +++ b/dom/base/nsDocument.cpp @@ -7898,9 +7898,9 @@ nsDocument::GetViewportInfo(const ScreenIntSize& aDisplaySize) // pixel an integer, and we want the adjusted value. float fullZoom = context ? context->DeviceContext()->GetFullZoom() : 1.0; fullZoom = (fullZoom == 0.0) ? 1.0 : fullZoom; - nsIWidget *widget = nsContentUtils::WidgetForDocument(this); - float widgetScale = widget ? widget->GetDefaultScale().scale : 1.0f; - CSSToLayoutDeviceScale layoutDeviceScale(widgetScale * fullZoom); + CSSToLayoutDeviceScale layoutDeviceScale( + (float)nsPresContext::AppUnitsPerCSSPixel() / + context->AppUnitsPerDevPixel()); CSSToScreenScale defaultScale = layoutDeviceScale * LayoutDeviceToScreenScale(1.0); From 0658bf785874b8351ed55c94573511ed5840445c Mon Sep 17 00:00:00 2001 From: Wander Lairson Costa Date: Fri, 11 Sep 2015 17:43:20 -0300 Subject: [PATCH 34/38] Bug 1201372: Remove workspace caches for try builds. r=garndt Try build are supposed to always be clobbered, so we remove workspace caches for them. --- testing/taskcluster/mach_commands.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/testing/taskcluster/mach_commands.py b/testing/taskcluster/mach_commands.py index aef69eb5bf6e..e008591f2beb 100644 --- a/testing/taskcluster/mach_commands.py +++ b/testing/taskcluster/mach_commands.py @@ -189,6 +189,19 @@ def set_interactive_task(task, interactive): payload["features"] = {} payload["features"]["interactive"] = True +def remove_caches_from_task(task): + r"""Remove all caches but tc-vcs from the task. + + :param task: task definition. + """ + try: + caches = task["task"]["payload"]["cache"] + for cache in caches.keys(): + if cache != "tc-vcs": + caches.pop(cache) + except KeyError: + pass + @CommandProvider class DecisionTask(object): @Command('taskcluster-decision', category="ci", @@ -365,6 +378,10 @@ class Graph(object): build_task = templates.load(build['task'], build_parameters) set_interactive_task(build_task, interactive) + # try builds don't use cache + if project == "try": + remove_caches_from_task(build_task) + if params['revision_hash']: decorate_task_treeherder_routes(build_task['task'], treeherder_route) From 7eabcdb12338db1e21e5c251df2a986d3981a652 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 14:15:37 -0700 Subject: [PATCH 35/38] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c0f536773eca Author: Jim Porter Desc: Merge pull request #31551 from jimporter/music-pick-search Bug 1191233 - [music] Closing search view from picker breaks the picker ======== https://hg.mozilla.org/integration/gaia-central/rev/63c20306bed6 Author: Jim Desc: Bug 1191233 - [music] Closing search view from picker breaks the picker --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 6f99c07d2123..9412a3a433ed 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "93f7ade5d5b1030264ab0ace3a88f125e9e660c7", + "git_revision": "e938ac2795efeeb2ecec8c47b33c9f7f8183e4eb", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "fc6be47c9a6db566e7dca1e3619aa95901a20528", + "revision": "c0f536773eca24b5eaf30ceffe3bb8d41c51827f", "repo_path": "integration/gaia-central" } From 337577c29c62e662ccdc11d0f25f7f4f1c489405 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 11 Sep 2015 14:19:00 -0700 Subject: [PATCH 36/38] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 5be62fba5aa9..1bc3614c59ca 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 9adc76c14cb6..71afe9b74966 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index b3aeded99fc7..ffedd4e0a4d4 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 15e37d2936e2..dca9ca06afcf 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 7dffddae74aa..73f3937540da 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 0bed0b8410c6..cdf549d284d5 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index b3aeded99fc7..ffedd4e0a4d4 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index cd56bfce68f1..a255fdbc4cbf 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index e1fb55e58a99..a69561dbd330 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index a9c56afc8a8d..3ffa3c7fc922 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From b33a83378a215331a3bdeebfee7aa78e26f2c739 Mon Sep 17 00:00:00 2001 From: Wander Lairson Costa Date: Fri, 11 Sep 2015 18:28:07 -0300 Subject: [PATCH 37/38] Bug 1203970: Upgrade phone-builder image for tc-vcs 2.3.12 r=garndt --- testing/docker/phone-builder/Dockerfile | 2 +- testing/docker/phone-builder/VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/docker/phone-builder/Dockerfile b/testing/docker/phone-builder/Dockerfile index 6cde62fd6a2d..97f0f05deb8f 100644 --- a/testing/docker/phone-builder/Dockerfile +++ b/testing/docker/phone-builder/Dockerfile @@ -1,4 +1,4 @@ -FROM taskcluster/builder:0.5.8 +FROM taskcluster/builder:0.5.9 MAINTAINER Wander Lairson Costa ENV SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE /home/worker/socorro.token diff --git a/testing/docker/phone-builder/VERSION b/testing/docker/phone-builder/VERSION index 44517d5188eb..fe04e7f676f5 100644 --- a/testing/docker/phone-builder/VERSION +++ b/testing/docker/phone-builder/VERSION @@ -1 +1 @@ -0.0.19 +0.0.20 From fa1f3135f2351f7c52004d86a1374358d8648479 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Fri, 11 Sep 2015 20:59:34 -0700 Subject: [PATCH 38/38] Bug 1203895 - disable browser_perf-recording-selected-04.js on debug for leaking, a=permaorange --- browser/devtools/performance/test/browser.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/devtools/performance/test/browser.ini b/browser/devtools/performance/test/browser.ini index cc390347f2e9..5455c52dddda 100644 --- a/browser/devtools/performance/test/browser.ini +++ b/browser/devtools/performance/test/browser.ini @@ -117,7 +117,7 @@ skip-if = os == 'linux' # bug 1186322 [browser_perf-recording-selected-03.js] skip-if = os == 'linux' # bug 1186322 [browser_perf-recording-selected-04.js] -skip-if = os == 'linux' # bug 1186322 +skip-if = os == 'linux' || debug # bug 1186322 for Linux, bug 1203895 for leaks [browser_perf-theme-toggle-01.js] [browser_profiler_tree-abstract-01.js] [browser_profiler_tree-abstract-02.js]