From 4f54fd70130fadc70d96613c2ce29df6dcf9cb63 Mon Sep 17 00:00:00 2001 From: Marty Rosenberg Date: Thu, 28 Mar 2013 03:22:18 -0400 Subject: [PATCH 01/61] Bug 843015: Don't optimize a function that arm-linux-gnueabi-gcc-4.7.2 seems to miscompile. (r=dvander) --- js/src/methodjit/BaseAssembler.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/src/methodjit/BaseAssembler.h b/js/src/methodjit/BaseAssembler.h index a29158f31d0d..7b84a48e532f 100644 --- a/js/src/methodjit/BaseAssembler.h +++ b/js/src/methodjit/BaseAssembler.h @@ -1147,6 +1147,9 @@ static const JSC::MacroAssembler::RegisterID JSParamReg_Argc = JSC::MIPSRegiste } template +#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 7 && defined(JS_CPU_ARM) + __attribute__((optimize("-O1"))) +#endif void storeToTypedArray(int atype, ValueRemat vr, T address) { if (atype == js::TypedArray::TYPE_FLOAT32 || atype == js::TypedArray::TYPE_FLOAT64) { From 82bd16ae82720b0fdcf8bf886e4b8489064449f7 Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Mon, 18 Feb 2013 16:59:02 +0800 Subject: [PATCH 02/61] Bug 843614 - Part 1: Enable test_outgoing_badNumber. r=hsinyi --- dom/telephony/test/marionette/manifest.ini | 1 - .../test/marionette/test_outgoing_badNumber.js | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dom/telephony/test/marionette/manifest.ini b/dom/telephony/test/marionette/manifest.ini index 1fb3ead21b39..bd4efe6ab0dd 100644 --- a/dom/telephony/test/marionette/manifest.ini +++ b/dom/telephony/test/marionette/manifest.ini @@ -12,7 +12,6 @@ qemu = true [test_outgoing_hangup_alerting.js] [test_outgoing_hangup_held.js] [test_outgoing_badNumber.js] -disabled = Bug 761533 [test_outgoing_busy.js] disabled = Bug 761533 [test_outgoing_reject.js] diff --git a/dom/telephony/test/marionette/test_outgoing_badNumber.js b/dom/telephony/test/marionette/test_outgoing_badNumber.js index 2d7cf7b91cf5..e9132363d5e0 100644 --- a/dom/telephony/test/marionette/test_outgoing_badNumber.js +++ b/dom/telephony/test/marionette/test_outgoing_badNumber.js @@ -6,7 +6,7 @@ MARIONETTE_TIMEOUT = 10000; SpecialPowers.addPermission("telephony", true, document); let telephony = window.navigator.mozTelephony; -let number = "not a valid phone number"; +let number = "****5555552368****"; let outgoing; let calls; @@ -38,16 +38,16 @@ function dial() { is(outgoing.number, number); is(outgoing.state, "dialing"); - //is(outgoing, telephony.active); // bug 757587 - //ok(telephony.calls === calls); // bug 757587 - //is(calls.length, 1); // bug 757587 - //is(calls[0], outgoing); // bug 757587 + is(outgoing, telephony.active); + //ok(telephony.calls === calls); // bug 717414 + is(telephony.calls.length, 1); + is(telephony.calls[0], outgoing); outgoing.onerror = function onerror(event) { log("Received 'error' event."); is(event.call, outgoing); - ok(call.error); - is(call.error.name, "BadNumberError"); + ok(event.call.error); + is(event.call.error.name, "BadNumberError"); runEmulatorCmd("gsm list", function(result) { log("Initial call list: " + result); From be3d6b2a05af1196955999ba15b81b6122b7b5ac Mon Sep 17 00:00:00 2001 From: Edgar Chen Date: Fri, 22 Feb 2013 13:17:00 +0800 Subject: [PATCH 03/61] Bug 843614 - Part 2: Enable test_outgoing_busy. r=hsinyi --- dom/telephony/test/marionette/manifest.ini | 1 - .../test/marionette/test_outgoing_busy.js | 30 +++++++++---------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dom/telephony/test/marionette/manifest.ini b/dom/telephony/test/marionette/manifest.ini index bd4efe6ab0dd..bf35e268d1ea 100644 --- a/dom/telephony/test/marionette/manifest.ini +++ b/dom/telephony/test/marionette/manifest.ini @@ -13,7 +13,6 @@ qemu = true [test_outgoing_hangup_held.js] [test_outgoing_badNumber.js] [test_outgoing_busy.js] -disabled = Bug 761533 [test_outgoing_reject.js] [test_incoming_hold_resume.js] [test_outgoing_hold_resume.js] diff --git a/dom/telephony/test/marionette/test_outgoing_busy.js b/dom/telephony/test/marionette/test_outgoing_busy.js index f6207e97883c..a505a58abec5 100644 --- a/dom/telephony/test/marionette/test_outgoing_busy.js +++ b/dom/telephony/test/marionette/test_outgoing_busy.js @@ -38,21 +38,23 @@ function dial() { is(outgoing.number, number); is(outgoing.state, "dialing"); - //is(outgoing, telephony.active); // bug 757587 - //ok(telephony.calls === calls); // bug 757587 - //is(calls.length, 1); // bug 757587 - //is(calls[0], outgoing); // bug 757587 + is(outgoing, telephony.active); + //ok(telephony.calls === calls); // bug 717414 + is(telephony.calls.length, 1); + is(telephony.calls[0], outgoing); -outgoing.onstatechange = function onstatechange(event) { - log("outgoing call state: " + outgoing.state); -}; + outgoing.onalerting = function onalerting(event) { + log("Received 'onalerting' call event."); + is(outgoing, event.call); + is(outgoing.state, "alerting"); - runEmulatorCmd("gsm list", function(result) { - log("Call list is now: " + result); - is(result[0], "outbound to " + number + " : unknown"); - is(result[1], "OK"); - busy(); - }); + runEmulatorCmd("gsm list", function(result) { + log("Call list is now: " + result); + is(result[0], "outbound to " + number + " : ringing"); + is(result[1], "OK"); + busy(); + }); + }; } function busy() { @@ -63,8 +65,6 @@ function busy() { is(outgoing, event.call); is(outgoing.state, "busy"); - //is(outgoing, telephony.active); // bug 757587 - runEmulatorCmd("gsm list", function(result) { log("Call list is now: " + result); is(result[0], "OK"); From f9b3c00f605dda63e51da17cbc2dc12f6bd89a71 Mon Sep 17 00:00:00 2001 From: Nicholas Cameron Date: Thu, 28 Mar 2013 21:33:26 +1300 Subject: [PATCH 04/61] Bug 853710. Optimise use of general purpose regs stm/ldm. r=mjrosenb --- js/src/ion/IonMacroAssembler.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/js/src/ion/IonMacroAssembler.cpp b/js/src/ion/IonMacroAssembler.cpp index a433a9d54f7b..df94c54348cc 100644 --- a/js/src/ion/IonMacroAssembler.cpp +++ b/js/src/ion/IonMacroAssembler.cpp @@ -131,10 +131,10 @@ MacroAssembler::PushRegsInMask(RegisterSet set) int32_t diffF = set.fpus().size() * sizeof(double); int32_t diffG = set.gprs().size() * STACK_SLOT_SIZE; - reserveStack(diffG); #ifdef JS_CPU_ARM if (set.gprs().size() > 1) { - startDataTransferM(IsStore, StackPointer, IA, NoWriteBack); + adjustFrame(diffG); + startDataTransferM(IsStore, StackPointer, DB, WriteBack); for (GeneralRegisterIterator iter(set.gprs()); iter.more(); iter++) { diffG -= STACK_SLOT_SIZE; transferReg(*iter); @@ -143,6 +143,7 @@ MacroAssembler::PushRegsInMask(RegisterSet set) } else #endif { + reserveStack(diffG); for (GeneralRegisterIterator iter(set.gprs()); iter.more(); iter++) { diffG -= STACK_SLOT_SIZE; storePtr(*iter, Address(StackPointer, diffG)); @@ -191,12 +192,13 @@ MacroAssembler::PopRegsInMaskIgnore(RegisterSet set, RegisterSet ignore) #ifdef JS_CPU_ARM if (set.gprs().size() > 1 && ignore.empty(false)) { - startDataTransferM(IsLoad, StackPointer, IA, NoWriteBack); + startDataTransferM(IsLoad, StackPointer, IA, WriteBack); for (GeneralRegisterIterator iter(set.gprs()); iter.more(); iter++) { diffG -= STACK_SLOT_SIZE; transferReg(*iter); } finishDataTransfer(); + adjustFrame(-reservedG); } else #endif { @@ -205,8 +207,8 @@ MacroAssembler::PopRegsInMaskIgnore(RegisterSet set, RegisterSet ignore) if (!ignore.has(*iter)) loadPtr(Address(StackPointer, diffG), *iter); } + freeStack(reservedG); } - freeStack(reservedG); JS_ASSERT(diffG == 0); } From 264013b5df7aa306fd41ede5c3e9c9a7fd047d9e Mon Sep 17 00:00:00 2001 From: Daniel Holbert Date: Thu, 28 Mar 2013 01:50:21 -0700 Subject: [PATCH 05/61] Bug 854263: Add special-case for flex items that are instances of nsFrame, whose trivial reflow impl doesn't request enough space for its border/padding. r=dbaron --- layout/generic/crashtests/854263-1.html | 27 +++++++++++++++++++ layout/generic/crashtests/crashtests.list | 1 + layout/generic/nsFlexContainerFrame.cpp | 32 ++++++++++++++++------- 3 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 layout/generic/crashtests/854263-1.html diff --git a/layout/generic/crashtests/854263-1.html b/layout/generic/crashtests/854263-1.html new file mode 100644 index 000000000000..f7048c31b819 --- /dev/null +++ b/layout/generic/crashtests/854263-1.html @@ -0,0 +1,27 @@ + + + + + + + +
+ +
+ + diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list index 8a251f498022..17672e77b6f3 100644 --- a/layout/generic/crashtests/crashtests.list +++ b/layout/generic/crashtests/crashtests.list @@ -455,3 +455,4 @@ load 847208.html asserts(4) load 847209.html # bug 847368 load 849603.html test-pref(layout.css.flexbox.enabled,true) load 851396-1.html +test-pref(layout.css.flexbox.enabled,true) load 854263-1.html diff --git a/layout/generic/nsFlexContainerFrame.cpp b/layout/generic/nsFlexContainerFrame.cpp index 23eacbba9ca4..7d0afc141b61 100644 --- a/layout/generic/nsFlexContainerFrame.cpp +++ b/layout/generic/nsFlexContainerFrame.cpp @@ -309,6 +309,8 @@ public: // Getters for border/padding // ========================== + const nsMargin& GetBorderPadding() const { return mBorderPadding; } + // Returns the border+padding component for a given mozilla::css::Side nscoord GetBorderPaddingComponentForSide(Side aSide) const { return MarginComponentForSide(mBorderPadding, aSide); } @@ -1990,15 +1992,27 @@ nsFlexContainerFrame::SizeItemInCrossAxis( // Save the sizing info that we learned from this reflow // ----------------------------------------------------- - // Tentatively accept the child's desired size, minus border/padding, as its - // cross-size: - MOZ_ASSERT(childDesiredSize.height >= - aItem.GetBorderPaddingSizeInAxis(aAxisTracker.GetCrossAxis()), - "Child should ask for at least enough space for border/padding"); - nscoord crossSize = - aAxisTracker.GetCrossComponent(childDesiredSize) - - aItem.GetBorderPaddingSizeInAxis(aAxisTracker.GetCrossAxis()); - aItem.SetCrossSize(crossSize); + // Tentatively store the child's desired content-box cross-size. + // Note that childDesiredSize is the border-box size, so we have to + // subtract border & padding to get the content-box size. + // (Note that at this point in the code, we know our cross axis is vertical, + // so we don't bother with making aAxisTracker pick the cross-axis component + // for us.) + nscoord crossAxisBorderPadding = aItem.GetBorderPadding().TopBottom(); + if (childDesiredSize.height < crossAxisBorderPadding) { + // Child's requested size isn't large enough for its border/padding! + // This is OK for the trivial nsFrame::Reflow() impl, but other frame + // classes should know better. So, if we get here, the child had better be + // an instance of nsFrame (i.e. it should return null from GetType()). + // XXXdholbert Once we've fixed bug 765861, we should upgrade this to an + // assertion that trivially passes if bug 765861's flag has been flipped. + NS_WARN_IF_FALSE(!aItem.Frame()->GetType(), + "Child should at least request space for border/padding"); + aItem.SetCrossSize(0); + } else { + // (normal case) + aItem.SetCrossSize(childDesiredSize.height - crossAxisBorderPadding); + } // If we need to do baseline-alignment, store the child's ascent. if (aItem.GetAlignSelf() == NS_STYLE_ALIGN_ITEMS_BASELINE) { From 02673ae0ed808c9350195dff30e4616dbe2a4428 Mon Sep 17 00:00:00 2001 From: Daniel Holbert Date: Thu, 28 Mar 2013 01:50:22 -0700 Subject: [PATCH 06/61] Bug 801268: Add crashtest for this bug. (test only, no review) --- layout/generic/crashtests/801268-1.html | 6 ++++++ layout/generic/crashtests/crashtests.list | 1 + 2 files changed, 7 insertions(+) create mode 100644 layout/generic/crashtests/801268-1.html diff --git a/layout/generic/crashtests/801268-1.html b/layout/generic/crashtests/801268-1.html new file mode 100644 index 000000000000..d707391b3b2a --- /dev/null +++ b/layout/generic/crashtests/801268-1.html @@ -0,0 +1,6 @@ + + + +
+ + diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list index 17672e77b6f3..6f103bf6d249 100644 --- a/layout/generic/crashtests/crashtests.list +++ b/layout/generic/crashtests/crashtests.list @@ -440,6 +440,7 @@ asserts(12) test-pref(layout.css.flexbox.enabled,true) load 798020-1.html test-pref(layout.css.flexbox.enabled,true) load 798235-1.html test-pref(layout.css.flexbox.enabled,true) load 799207-1.html asserts(12) test-pref(layout.css.flexbox.enabled,true) load 799207-2.html +test-pref(layout.css.flexbox.enabled,true) load 801268-1.html test-pref(layout.css.flexbox.enabled,true) load 804089-1.xhtml load 810726.html load 840818.html From 9b0a35d895f677b4129d539801ecf97ab5f1f195 Mon Sep 17 00:00:00 2001 From: Gina Yeh Date: Thu, 28 Mar 2013 18:05:58 +0800 Subject: [PATCH 07/61] Bug 853200 - Remove unused event handlers from idl, r=echou, sr=mrbkap --- content/base/src/nsGkAtomList.h | 8 ---- dom/bluetooth/BluetoothAdapter.cpp | 39 ------------------- dom/bluetooth/BluetoothAdapter.h | 1 - dom/bluetooth/BluetoothDevice.cpp | 3 -- dom/bluetooth/moz.build | 3 +- dom/bluetooth/nsIDOMBluetoothAdapter.idl | 15 +------ dom/bluetooth/nsIDOMBluetoothDevice.idl | 5 +-- .../nsIDOMBluetoothDeviceAddressEvent.idl | 21 ---------- js/xpconnect/src/event_impl_gen.conf.in | 1 - 9 files changed, 3 insertions(+), 93 deletions(-) delete mode 100644 dom/bluetooth/nsIDOMBluetoothDeviceAddressEvent.idl diff --git a/content/base/src/nsGkAtomList.h b/content/base/src/nsGkAtomList.h index a8a2b3bd4317..aebc0d4a0c22 100644 --- a/content/base/src/nsGkAtomList.h +++ b/content/base/src/nsGkAtomList.h @@ -637,7 +637,6 @@ GK_ATOM(onalerting, "onalerting") GK_ATOM(onanimationend, "onanimationend") GK_ATOM(onanimationiteration, "onanimationiteration") GK_ATOM(onanimationstart, "onanimationstart") -GK_ATOM(onauthorize, "onauthorize") GK_ATOM(onAppCommand, "onAppCommand") GK_ATOM(onbeforecopy, "onbeforecopy") GK_ATOM(onbeforecut, "onbeforecut") @@ -651,7 +650,6 @@ GK_ATOM(onbroadcast, "onbroadcast") GK_ATOM(onbusy, "onbusy") GK_ATOM(oncached, "oncached") GK_ATOM(oncallschanged, "oncallschanged") -GK_ATOM(oncancel, "oncancel") GK_ATOM(oncardstatechange, "oncardstatechange") GK_ATOM(oncfstatechange, "oncfstatechange") GK_ATOM(onchange, "onchange") @@ -676,8 +674,6 @@ GK_ATOM(ondataerror, "ondataerror") GK_ATOM(ondblclick, "ondblclick") GK_ATOM(ondeliverysuccess, "ondeliverysuccess") GK_ATOM(ondeliveryerror, "ondeliveryerror") -GK_ATOM(ondevicecreated, "ondevicecreated") -GK_ATOM(ondevicedisappeared, "ondevicedisappeared") GK_ATOM(ondevicefound, "ondevicefound") GK_ATOM(ondialing, "ondialing") GK_ATOM(ondisabled, "ondisabled") @@ -762,12 +758,8 @@ GK_ATOM(onpopuphidden, "onpopuphidden") GK_ATOM(onpopuphiding, "onpopuphiding") GK_ATOM(onpopupshowing, "onpopupshowing") GK_ATOM(onpopupshown, "onpopupshown") -GK_ATOM(onpropertychanged, "onpropertychanged") GK_ATOM(onreadystatechange, "onreadystatechange") GK_ATOM(onreceived, "onreceived") -GK_ATOM(onrequestconfirmation, "onrequestconfirmation") -GK_ATOM(onrequestpasskey, "onrequestpasskey") -GK_ATOM(onrequestpincode, "onrequestpincode") GK_ATOM(onRequest, "onRequest") GK_ATOM(onreset, "onreset") GK_ATOM(onresuming, "onresuming") diff --git a/dom/bluetooth/BluetoothAdapter.cpp b/dom/bluetooth/BluetoothAdapter.cpp index 4180a0cde3b9..3ecf268cea38 100644 --- a/dom/bluetooth/BluetoothAdapter.cpp +++ b/dom/bluetooth/BluetoothAdapter.cpp @@ -14,7 +14,6 @@ #include "nsContentUtils.h" #include "nsDOMClassInfo.h" -#include "nsIDOMBluetoothDeviceAddressEvent.h" #include "nsIDOMBluetoothDeviceEvent.h" #include "nsTArrayHelpers.h" #include "DOMRequest.h" @@ -287,29 +286,6 @@ BluetoothAdapter::Notify(const BluetoothSignal& aData) e->InitBluetoothDeviceEvent(NS_LITERAL_STRING("devicefound"), false, false, device); DispatchTrustedEvent(event); - } else if (aData.name().EqualsLiteral("DeviceDisappeared")) { - const nsAString& deviceAddress = aData.value().get_nsString(); - - nsCOMPtr event; - NS_NewDOMBluetoothDeviceAddressEvent(getter_AddRefs(event), this, nullptr, nullptr); - - nsCOMPtr e = do_QueryInterface(event); - e->InitBluetoothDeviceAddressEvent(NS_LITERAL_STRING("devicedisappeared"), - false, false, deviceAddress); - DispatchTrustedEvent(e); - } else if (aData.name().EqualsLiteral("DeviceCreated")) { - NS_ASSERTION(aData.value().type() == BluetoothValue::TArrayOfBluetoothNamedValue, - "DeviceCreated: Invalid value type"); - - nsRefPtr device = - BluetoothDevice::Create(GetOwner(), GetPath(), aData.value()); - nsCOMPtr event; - NS_NewDOMBluetoothDeviceEvent(getter_AddRefs(event), this, nullptr, nullptr); - - nsCOMPtr e = do_QueryInterface(event); - e->InitBluetoothDeviceEvent(NS_LITERAL_STRING("devicecreated"), - false, false, device); - DispatchTrustedEvent(e); } else if (aData.name().EqualsLiteral("PropertyChanged")) { NS_ASSERTION(v.type() == BluetoothValue::TArrayOfBluetoothNamedValue, "PropertyChanged: Invalid value type"); @@ -371,13 +347,6 @@ BluetoothAdapter::StopDiscovery(nsIDOMDOMRequest** aRequest) return StartStopDiscovery(false, aRequest); } -NS_IMETHODIMP -BluetoothAdapter::GetEnabled(bool* aEnabled) -{ - *aEnabled = mEnabled; - return NS_OK; -} - NS_IMETHODIMP BluetoothAdapter::GetAddress(nsAString& aAddress) { @@ -761,12 +730,4 @@ BluetoothAdapter::ConfirmReceivingFile(const nsAString& aDeviceAddress, return NS_OK; } -NS_IMPL_EVENT_HANDLER(BluetoothAdapter, propertychanged) NS_IMPL_EVENT_HANDLER(BluetoothAdapter, devicefound) -NS_IMPL_EVENT_HANDLER(BluetoothAdapter, devicedisappeared) -NS_IMPL_EVENT_HANDLER(BluetoothAdapter, devicecreated) -NS_IMPL_EVENT_HANDLER(BluetoothAdapter, requestconfirmation) -NS_IMPL_EVENT_HANDLER(BluetoothAdapter, requestpincode) -NS_IMPL_EVENT_HANDLER(BluetoothAdapter, requestpasskey) -NS_IMPL_EVENT_HANDLER(BluetoothAdapter, authorize) -NS_IMPL_EVENT_HANDLER(BluetoothAdapter, cancel) diff --git a/dom/bluetooth/BluetoothAdapter.h b/dom/bluetooth/BluetoothAdapter.h index f07a86a23b2f..d52b89d47c31 100644 --- a/dom/bluetooth/BluetoothAdapter.h +++ b/dom/bluetooth/BluetoothAdapter.h @@ -69,7 +69,6 @@ private: nsString mAddress; nsString mName; - bool mEnabled; bool mDiscoverable; bool mDiscovering; bool mPairable; diff --git a/dom/bluetooth/BluetoothDevice.cpp b/dom/bluetooth/BluetoothDevice.cpp index a966f79c1901..99c03a839eb1 100644 --- a/dom/bluetooth/BluetoothDevice.cpp +++ b/dom/bluetooth/BluetoothDevice.cpp @@ -254,6 +254,3 @@ BluetoothDevice::GetServices(JSContext* aCx, jsval* aServices) return NS_OK; } -NS_IMPL_EVENT_HANDLER(BluetoothDevice, propertychanged) -NS_IMPL_EVENT_HANDLER(BluetoothDevice, connected) -NS_IMPL_EVENT_HANDLER(BluetoothDevice, disconnected) diff --git a/dom/bluetooth/moz.build b/dom/bluetooth/moz.build index 6d542ac349a7..cd07d7d378c7 100644 --- a/dom/bluetooth/moz.build +++ b/dom/bluetooth/moz.build @@ -21,7 +21,6 @@ if CONFIG['MOZ_B2G_BT']: 'nsIDOMBluetoothManager.idl', 'nsIDOMBluetoothAdapter.idl', 'nsIDOMBluetoothDevice.idl', - 'nsIDOMBluetoothDeviceEvent.idl', - 'nsIDOMBluetoothDeviceAddressEvent.idl', + 'nsIDOMBluetoothDeviceEvent.idl' ] diff --git a/dom/bluetooth/nsIDOMBluetoothAdapter.idl b/dom/bluetooth/nsIDOMBluetoothAdapter.idl index 0bff59a99331..20d40cf028ab 100644 --- a/dom/bluetooth/nsIDOMBluetoothAdapter.idl +++ b/dom/bluetooth/nsIDOMBluetoothAdapter.idl @@ -10,12 +10,11 @@ interface nsIDOMDOMRequest; interface nsIDOMBlob; interface nsIDOMBluetoothDevice; -[scriptable, builtinclass, uuid(6a4a9415-cda3-4a19-b79e-05d9bc2c2700)] +[scriptable, builtinclass, uuid(b0e7117a-25e3-4ea0-9cf4-3f8cd85f9e7a)] interface nsIDOMBluetoothAdapter : nsIDOMEventTarget { readonly attribute DOMString address; [binaryname(AdapterClass)] readonly attribute unsigned long class; - readonly attribute bool enabled; readonly attribute bool discovering; [implicit_jscontext] @@ -60,16 +59,4 @@ interface nsIDOMBluetoothAdapter : nsIDOMEventTarget // Fired when discoverying and any device is discovered. [implicit_jscontext] attribute jsval ondevicefound; - // Fired when any device is out of discoverable range. - [implicit_jscontext] attribute jsval ondevicedisappeared; - // Fired when any device is created. - [implicit_jscontext] attribute jsval ondevicecreated; - // Fired when a property of the adapter is changed - [implicit_jscontext] attribute jsval onpropertychanged; - // Pairing related events - [implicit_jscontext] attribute jsval onrequestconfirmation; - [implicit_jscontext] attribute jsval onrequestpincode; - [implicit_jscontext] attribute jsval onrequestpasskey; - [implicit_jscontext] attribute jsval onauthorize; - [implicit_jscontext] attribute jsval oncancel; }; diff --git a/dom/bluetooth/nsIDOMBluetoothDevice.idl b/dom/bluetooth/nsIDOMBluetoothDevice.idl index 95991bee4b1a..80c660cea3bc 100644 --- a/dom/bluetooth/nsIDOMBluetoothDevice.idl +++ b/dom/bluetooth/nsIDOMBluetoothDevice.idl @@ -6,7 +6,7 @@ #include "nsIDOMEventTarget.idl" -[scriptable, builtinclass, uuid(4a679fc6-572a-4ddc-8e93-cfbddb9f2d6a)] +[scriptable, builtinclass, uuid(4ca7697a-9d0c-492e-a6be-ccc5c3ec503c)] interface nsIDOMBluetoothDevice : nsIDOMEventTarget { readonly attribute DOMString address; @@ -17,7 +17,4 @@ interface nsIDOMBluetoothDevice : nsIDOMEventTarget [implicit_jscontext] readonly attribute jsval services; readonly attribute bool connected; readonly attribute bool paired; - [implicit_jscontext] attribute jsval onpropertychanged; - [implicit_jscontext] attribute jsval onconnected; - [implicit_jscontext] attribute jsval ondisconnected; }; diff --git a/dom/bluetooth/nsIDOMBluetoothDeviceAddressEvent.idl b/dom/bluetooth/nsIDOMBluetoothDeviceAddressEvent.idl deleted file mode 100644 index d607bd1c4b8c..000000000000 --- a/dom/bluetooth/nsIDOMBluetoothDeviceAddressEvent.idl +++ /dev/null @@ -1,21 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "nsIDOMEvent.idl" - -[scriptable, builtinclass, uuid(90c55b1c-2da5-4a30-bf09-0c70369a8d89)] -interface nsIDOMBluetoothDeviceAddressEvent : nsIDOMEvent -{ - readonly attribute DOMString deviceAddress; - - [noscript] void initBluetoothDeviceAddressEvent(in DOMString aType, - in boolean aCanBubble, - in boolean aCancelable, - in DOMString aDeviceAddress); -}; - -dictionary BluetoothDeviceAddressEventInit : EventInit -{ - DOMString deviceAddress; -}; diff --git a/js/xpconnect/src/event_impl_gen.conf.in b/js/xpconnect/src/event_impl_gen.conf.in index a1006e6b5361..ffb139a62380 100644 --- a/js/xpconnect/src/event_impl_gen.conf.in +++ b/js/xpconnect/src/event_impl_gen.conf.in @@ -26,7 +26,6 @@ simple_events = [ 'SmartCardEvent', #ifdef MOZ_B2G_BT 'BluetoothDeviceEvent', - 'BluetoothDeviceAddressEvent', #endif #ifdef MOZ_B2G_RIL 'CallEvent', From 0f0fef30424acdfa65d363a281f50ed486bfdc9f Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Thu, 28 Mar 2013 11:30:34 +0100 Subject: [PATCH 08/61] Bug 855012 - local_debug_info_symbolizer.cc,h and shim_mac_dump_syms.mm,h have no license information (& probably need MPL boilerplate), r=dholbert --- tools/profiler/local_debug_info_symbolizer.cc | 4 ++++ tools/profiler/local_debug_info_symbolizer.h | 5 +++++ tools/profiler/shim_mac_dump_syms.h | 4 ++++ tools/profiler/shim_mac_dump_syms.mm | 5 ++++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/tools/profiler/local_debug_info_symbolizer.cc b/tools/profiler/local_debug_info_symbolizer.cc index f968129f0be1..bf535d3d89da 100644 --- a/tools/profiler/local_debug_info_symbolizer.cc +++ b/tools/profiler/local_debug_info_symbolizer.cc @@ -1,3 +1,7 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "PlatformMacros.h" #include "nsAutoPtr.h" diff --git a/tools/profiler/local_debug_info_symbolizer.h b/tools/profiler/local_debug_info_symbolizer.h index 311cc49768ee..1c367a6f9afb 100644 --- a/tools/profiler/local_debug_info_symbolizer.h +++ b/tools/profiler/local_debug_info_symbolizer.h @@ -1,3 +1,8 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + #ifndef PROCESSOR_LOCAL_DEBUG_INFO_SYMBOLIZER_H_ #define PROCESSOR_LOCAL_DEBUG_INFO_SYMBOLIZER_H_ diff --git a/tools/profiler/shim_mac_dump_syms.h b/tools/profiler/shim_mac_dump_syms.h index 5820daf1c972..6d3055ad804c 100644 --- a/tools/profiler/shim_mac_dump_syms.h +++ b/tools/profiler/shim_mac_dump_syms.h @@ -1,3 +1,7 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // Read debug info from |obj_file| and park it in a Module, returned // via |module|. Caller owns the Module and is responsible for diff --git a/tools/profiler/shim_mac_dump_syms.mm b/tools/profiler/shim_mac_dump_syms.mm index 4eab6b9debf8..d959b164ba10 100644 --- a/tools/profiler/shim_mac_dump_syms.mm +++ b/tools/profiler/shim_mac_dump_syms.mm @@ -1,4 +1,7 @@ -// -*- mode: c++ -*- +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "common/mac/dump_syms.h" #include "shim_mac_dump_syms.h" From 5e687786fd496fe2629d02762c736b5ada296075 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Thu, 28 Mar 2013 11:43:23 +0100 Subject: [PATCH 09/61] Bug 855286 - Fix gamepad compilation on mingw. r=ted --- configure.in | 2 +- toolkit/library/Makefile.in | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 2a27996be565..730a3c68d6bf 100644 --- a/configure.in +++ b/configure.in @@ -6004,7 +6004,7 @@ if test "$MOZ_GAMEPAD"; then if ! test -f "$MOZ_DIRECTX_SDK_PATH"/lib/$MOZ_DIRECTX_SDK_CPU_SUFFIX/dxguid.lib ; then MOZ_GAMEPAD= fi - else + elif test "$GCC" != "yes"; then MOZ_GAMEPAD= fi if test -z "$MOZ_GAMEPAD"; then diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in index ecbacabca4ea..bef3c62deb68 100644 --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in @@ -617,11 +617,15 @@ EXTRA_DSO_LDOPTS += -DELAYLOAD:msdmo.dll endif endif ifdef MOZ_GAMEPAD +ifndef GNU_CC DXSDK := $(subst \,/,$(MOZ_DIRECTX_SDK_PATH))/Lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX) OS_LIBS += \ "$(DXSDK)/dxguid.lib" \ "$(DXSDK)/dinput8.lib" \ $(NULL) +else +OS_LIBS += $(call EXPAND_LIBNAME,dxguid dinput8) +endif endif endif # WINNT From f839c903930a95dde7e5fa5ab6f9e17d3ca68cfd Mon Sep 17 00:00:00 2001 From: Mounir Lamouri Date: Thu, 28 Mar 2013 11:24:14 +0000 Subject: [PATCH 10/61] Bug 839788 - Switch Browse button from an to a