wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge mozilla-central and b2g-inbound

Browse Source
This commit is contained in:
Ed Morley 2014-06-11 10:10:59 +01:00
commit b5cbfad97d
45 changed files with 123 additions and 448 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/config/emulator-ics/sources.xml
View File

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="0750f66a0004870773c9a743fa6bdbe124379336"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="b85f072304d7b3eead596100182fd1b1f1adc421"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="dbb66e540194a187326cece28ae0b51cdd500184"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>

2
b2g/config/emulator-jb/sources.xml
View File

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0750f66a0004870773c9a743fa6bdbe124379336"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="b85f072304d7b3eead596100182fd1b1f1adc421"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="dbb66e540194a187326cece28ae0b51cdd500184"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="cabebb87fcd32f8596af08e6b5e80764ee0157dd"/>

2
b2g/config/emulator-kk/sources.xml
View File

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0750f66a0004870773c9a743fa6bdbe124379336"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="b85f072304d7b3eead596100182fd1b1f1adc421"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="dbb66e540194a187326cece28ae0b51cdd500184"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

2
b2g/config/emulator/sources.xml
View File

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="0750f66a0004870773c9a743fa6bdbe124379336"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="b85f072304d7b3eead596100182fd1b1f1adc421"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="dbb66e540194a187326cece28ae0b51cdd500184"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>

5
b2g/config/flame/sources.xml
View File

@ -17,7 +17,7 @@
</project>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0750f66a0004870773c9a743fa6bdbe124379336"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="b85f072304d7b3eead596100182fd1b1f1adc421"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="dbb66e540194a187326cece28ae0b51cdd500184"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="cabebb87fcd32f8596af08e6b5e80764ee0157dd"/>
@ -118,7 +118,7 @@
<!-- Flame specific things -->
<project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="e8a318f7690092e639ba88891606f4183e846d3f"/>
<project name="device/qcom/common" path="device/qcom/common" revision="34ed8345250bb97262d70a052217a92e83444ede"/>
<project name="device-flame" path="device/t2m/flame" remote="b2g" revision="70c66225521828ad568c0c72859c6f17c3182f1b"/>
<project name="device-flame" path="device/t2m/flame" remote="b2g" revision="b8ff7901a20aab3041aaca4eb73abd6d57f4bb8a"/>
<project name="codeaurora_kernel_msm" path="kernel" remote="b2g" revision="6d29b672b039612c08c40e92d8051a4cfbd38162"/>
<project name="kernel_lk" path="bootable/bootloader/lk" remote="b2g" revision="2b1d8b5b7a760230f4c94c02e733e3929f44253a"/>
<project name="platform/bootable/recovery" path="bootable/recovery" revision="f2914eacee9120680a41463708bb6ee8291749fc"/>
@ -144,4 +144,5 @@
<project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="d0aa65b140a45016975ed0ecf35f280dd336e1d3"/>
<project name="platform/system/qcom" path="system/qcom" revision="1cdab258b15258b7f9657da70e6f06ebd5a2fc25"/>
<project name="platform/vendor/qcom/msm8610" path="device/qcom/msm8610" revision="4ae5df252123591d5b941191790e7abed1bce5a4"/>
<project name="platform/vendor/qcom-opensource/wlan/prima" path="vendor/qcom/opensource/wlan/prima" revision="ce18b47b4a4f93a581d672bbd5cb6d12fe796ca9"/>
</manifest>

2
b2g/config/gaia.json
View File

@ -4,6 +4,6 @@
"remote": "",
"branch": ""
},
"revision": "16222b6246385cf793ae5fdced0ea6d548b7b949",
"revision": "bca9de42a1157f1f90bf5a2cd791f17fb725fa7d",
"repo_path": "/integration/gaia-central"
}

2
b2g/config/hamachi/sources.xml
View File

@ -17,7 +17,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="0750f66a0004870773c9a743fa6bdbe124379336"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="b85f072304d7b3eead596100182fd1b1f1adc421"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="dbb66e540194a187326cece28ae0b51cdd500184"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

2
b2g/config/helix/sources.xml
View File

@ -15,7 +15,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="0750f66a0004870773c9a743fa6bdbe124379336"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="b85f072304d7b3eead596100182fd1b1f1adc421"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="dbb66e540194a187326cece28ae0b51cdd500184"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

2
b2g/config/nexus-4/sources.xml
View File

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="0750f66a0004870773c9a743fa6bdbe124379336"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="b85f072304d7b3eead596100182fd1b1f1adc421"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="dbb66e540194a187326cece28ae0b51cdd500184"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="cabebb87fcd32f8596af08e6b5e80764ee0157dd"/>

2
b2g/config/wasabi/sources.xml
View File

@ -17,7 +17,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="0750f66a0004870773c9a743fa6bdbe124379336"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="b85f072304d7b3eead596100182fd1b1f1adc421"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="dbb66e540194a187326cece28ae0b51cdd500184"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

1
dom/cellbroadcast/interfaces/moz.build
View File

@ -6,7 +6,6 @@
XPIDL_SOURCES += [
'nsICellBroadcastProvider.idl',
'nsIDOMMozCellBroadcastEvent.idl',
'nsIDOMMozCellBroadcastMessage.idl',
]

19
dom/cellbroadcast/interfaces/nsIDOMMozCellBroadcastEvent.idl
View File

@ -1,19 +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"
interface nsIDOMMozCellBroadcastMessage;
[scriptable, builtinclass, uuid(f955095f-01e4-4520-b299-7124ec7c63aa)]
interface nsIDOMMozCellBroadcastEvent : nsIDOMEvent
{
//[binaryname(MessageMoz)]
readonly attribute nsIDOMMozCellBroadcastMessage message;
[noscript] void initMozCellBroadcastEvent(in DOMString aType,
in boolean aCanBubble,
in boolean aCancelable,
in nsIDOMMozCellBroadcastMessage aMessage);
};

17
dom/cellbroadcast/src/CellBroadcast.cpp
View File

@ -5,7 +5,7 @@
#include "CellBroadcast.h"
#include "mozilla/dom/MozCellBroadcastBinding.h"
#include "nsIDOMMozCellBroadcastEvent.h"
#include "mozilla/dom/MozCellBroadcastEvent.h"
#include "nsIDOMMozCellBroadcastMessage.h"
#include "nsServiceManagerUtils.h"
#include "GeneratedEvents.h"
@ -94,13 +94,12 @@ CellBroadcast::WrapObject(JSContext* aCx)
NS_IMETHODIMP
CellBroadcast::NotifyMessageReceived(nsIDOMMozCellBroadcastMessage* aMessage)
{
nsCOMPtr<nsIDOMEvent> event;
NS_NewDOMMozCellBroadcastEvent(getter_AddRefs(event), this, nullptr, nullptr);
MozCellBroadcastEventInit init;
init.mBubbles = true;
init.mCancelable = false;
init.mMessage = aMessage;
nsCOMPtr<nsIDOMMozCellBroadcastEvent> ce = do_QueryInterface(event);
nsresult rv = ce->InitMozCellBroadcastEvent(NS_LITERAL_STRING("received"),
true, false, aMessage);
NS_ENSURE_SUCCESS(rv, rv);
return DispatchTrustedEvent(ce);
nsRefPtr<MozCellBroadcastEvent> event =
MozCellBroadcastEvent::Constructor(this, NS_LITERAL_STRING("received"), init);
return DispatchTrustedEvent(event);
}

4
dom/events/EventDispatcher.cpp
View File

@ -831,10 +831,6 @@ EventDispatcher::CreateEvent(EventTarget* aOwner,
return NS_NewDOMHashChangeEvent(aDOMEvent, aOwner, aPresContext, nullptr);
if (aEventType.LowerCaseEqualsLiteral("customevent"))
return NS_NewDOMCustomEvent(aDOMEvent, aOwner, aPresContext, nullptr);
if (aEventType.LowerCaseEqualsLiteral("mozsmsevent"))
return NS_NewDOMMozSmsEvent(aDOMEvent, aOwner, aPresContext, nullptr);
if (aEventType.LowerCaseEqualsLiteral("mozmmsevent"))
return NS_NewDOMMozMmsEvent(aDOMEvent, aOwner, aPresContext, nullptr);
if (aEventType.LowerCaseEqualsLiteral("storageevent")) {
return NS_NewDOMStorageEvent(aDOMEvent, aOwner);
}

2
dom/mobileconnection/tests/marionette/manifest.ini
View File

@ -29,7 +29,9 @@ qemu = true
disabled = Bug 979137
[test_mobile_supported_network_types.js]
[test_mobile_call_forwarding_set.js]
disabled = Bug 861725
[test_mobile_call_forwarding_get.js]
disabled = Bug 861725
[test_mobile_voice_privacy.js]
[test_dsds_mobile_data_connection.js]
[test_mobile_clir.js]

2
dom/mobilemessage/interfaces/moz.build
View File

@ -6,10 +6,8 @@
XPIDL_SOURCES += [
'nsIDOMMobileMessageManager.idl',
'nsIDOMMozMmsEvent.idl',
'nsIDOMMozMmsMessage.idl',
'nsIDOMMozMobileMessageThread.idl',
'nsIDOMMozSmsEvent.idl',
'nsIDOMMozSmsMessage.idl',
'nsIDOMSmsFilter.idl',
'nsIDOMSmsSegmentInfo.idl',

18
dom/mobilemessage/interfaces/nsIDOMMozMmsEvent.idl
View File

@ -1,18 +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"
interface nsIDOMMozMmsMessage;
[builtinclass, uuid(b33cc0f2-8886-11e2-9433-eff9a8af9a70)]
interface nsIDOMMozMmsEvent : nsIDOMEvent
{
readonly attribute nsIDOMMozMmsMessage message;
[noscript] void initMozMmsEvent(in DOMString aType,
in boolean aCanBubble,
in boolean aCancelable,
in nsIDOMMozMmsMessage aMessage);
};

18
dom/mobilemessage/interfaces/nsIDOMMozSmsEvent.idl
View File

@ -1,18 +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"
interface nsIDOMMozSmsMessage;
[builtinclass, uuid(f12f9208-0abd-4d95-9a27-93a74b5e47a2)]
interface nsIDOMMozSmsEvent : nsIDOMEvent
{
readonly attribute nsIDOMMozSmsMessage message;
[noscript] void initMozSmsEvent(in DOMString aType,
in boolean aCanBubble,
in boolean aCancelable,
in nsIDOMMozSmsMessage aMessage);
};

28
dom/mobilemessage/src/MobileMessageManager.cpp
View File

@ -13,9 +13,9 @@
#include "mozilla/Services.h"
#include "mozilla/dom/mobilemessage/Constants.h" // For MessageType
#include "mozilla/dom/MobileMessageManagerBinding.h"
#include "mozilla/dom/MozMmsEvent.h"
#include "mozilla/dom/MozMmsMessageBinding.h"
#include "nsIDOMMozSmsEvent.h"
#include "nsIDOMMozMmsEvent.h"
#include "mozilla/dom/MozSmsEvent.h"
#include "nsIDOMMozSmsMessage.h"
#include "nsIDOMMozMmsMessage.h"
#include "nsJSUtils.h"
@ -476,27 +476,27 @@ MobileMessageManager::DispatchTrustedSmsEventToSelf(const char* aTopic,
const nsAString& aEventName,
nsISupports* aMsg)
{
nsCOMPtr<nsIDOMEvent> event;
nsCOMPtr<nsIDOMMozSmsMessage> sms = do_QueryInterface(aMsg);
if (sms) {
NS_NewDOMMozSmsEvent(getter_AddRefs(event), this, nullptr, nullptr);
NS_ASSERTION(event, "This should never fail!");
MozSmsEventInit init;
init.mBubbles = false;
init.mCancelable = false;
init.mMessage = sms;
nsCOMPtr<nsIDOMMozSmsEvent> se = do_QueryInterface(event);
nsresult rv = se->InitMozSmsEvent(aEventName, false, false, sms);
NS_ENSURE_SUCCESS(rv, rv);
nsRefPtr<MozSmsEvent> event =
MozSmsEvent::Constructor(this, aEventName, init);
return DispatchTrustedEvent(event);
}
nsCOMPtr<nsIDOMMozMmsMessage> mms = do_QueryInterface(aMsg);
if (mms) {
NS_NewDOMMozMmsEvent(getter_AddRefs(event), this, nullptr, nullptr);
NS_ASSERTION(event, "This should never fail!");
MozMmsEventInit init;
init.mBubbles = false;
init.mCancelable = false;
init.mMessage = mms;
nsCOMPtr<nsIDOMMozMmsEvent> se = do_QueryInterface(event);
nsresult rv = se->InitMozMmsEvent(aEventName, false, false, mms);
NS_ENSURE_SUCCESS(rv, rv);
nsRefPtr<MozMmsEvent> event =
MozMmsEvent::Constructor(this, aEventName, init);
return DispatchTrustedEvent(event);
}

73
dom/telephony/CallEvent.cpp
View File

@ -1,73 +0,0 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* 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 "CallEvent.h"
#include "mozilla/dom/CallEventBinding.h"
#include "TelephonyCall.h"
using namespace mozilla::dom;
using mozilla::ErrorResult;
/* static */
already_AddRefed<CallEvent>
CallEvent::Create(EventTarget* aOwner, const nsAString& aType,
TelephonyCall* aCall, bool aCanBubble,
bool aCancelable)
{
nsRefPtr<CallEvent> event = new CallEvent(aOwner, nullptr, nullptr);
event->mCall = aCall;
event->InitEvent(aType, aCanBubble, aCancelable);
return event.forget();
}
JSObject*
CallEvent::WrapObject(JSContext* aCx)
{
return CallEventBinding::Wrap(aCx, this);
}
NS_IMPL_CYCLE_COLLECTION_CLASS(CallEvent)
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(CallEvent, Event)
NS_IMPL_CYCLE_COLLECTION_UNLINK(mCall)
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(CallEvent, Event)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mCall)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_IMPL_ADDREF_INHERITED(CallEvent, Event)
NS_IMPL_RELEASE_INHERITED(CallEvent, Event)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(CallEvent)
NS_INTERFACE_MAP_END_INHERITING(Event)
// WebIDL
/* static */
already_AddRefed<CallEvent>
CallEvent::Constructor(const GlobalObject& aGlobal, const nsAString& aType,
const CallEventInit& aOptions, ErrorResult& aRv)
{
nsCOMPtr<EventTarget> target = do_QueryInterface(aGlobal.GetAsSupports());
if (!target) {
aRv.Throw(NS_ERROR_UNEXPECTED);
return nullptr;
}
nsRefPtr<CallEvent> event = Create(target, aType, aOptions.mCall, false, false);
return event.forget();
}
already_AddRefed<TelephonyCall>
CallEvent::GetCall() const
{
nsRefPtr<TelephonyCall> call = mCall;
return call.forget();
}

58
dom/telephony/CallEvent.h
View File

@ -1,58 +0,0 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* 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 mozilla_dom_telephony_callevent_h
#define mozilla_dom_telephony_callevent_h
#include "mozilla/dom/Event.h"
#include "mozilla/dom/telephony/TelephonyCommon.h"
namespace mozilla {
namespace dom {
struct CallEventInit;
class CallEvent MOZ_FINAL : public Event
{
nsRefPtr<TelephonyCall> mCall;
public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(CallEvent, Event)
NS_FORWARD_TO_EVENT
virtual JSObject*
WrapObject(JSContext* aCx) MOZ_OVERRIDE;
// WebIDL
static already_AddRefed<CallEvent>
Constructor(const GlobalObject& aGlobal, const nsAString& aType,
const CallEventInit& aOptions, ErrorResult& aRv);
already_AddRefed<TelephonyCall>
GetCall() const;
static already_AddRefed<CallEvent>
Create(EventTarget* aOwner, const nsAString& aType, TelephonyCall* aCall,
bool aCanBubble, bool aCancelable);
private:
CallEvent(EventTarget* aOwner,
nsPresContext* aPresContext,
WidgetEvent* aEvent)
: Event(aOwner, aPresContext, aEvent)
{
SetIsDOMBinding();
}
virtual ~CallEvent()
{ }
};
} // namespace dom
} // namespace mozilla
#endif // mozilla_dom_telephony_callevent_h

9
dom/telephony/Telephony.cpp
View File

@ -5,6 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "Telephony.h"
#include "mozilla/dom/CallEvent.h"
#include "mozilla/dom/TelephonyBinding.h"
#include "mozilla/dom/Promise.h"
@ -21,7 +22,6 @@
#include "nsServiceManagerUtils.h"
#include "nsThreadUtils.h"
#include "CallEvent.h"
#include "CallsList.h"
#include "TelephonyCall.h"
#include "TelephonyCallGroup.h"
@ -692,7 +692,12 @@ Telephony::DispatchCallEvent(const nsAString& aType,
aType.EqualsLiteral("remoteheld") ||
aType.EqualsLiteral("remtoeresumed"));
nsRefPtr<CallEvent> event = CallEvent::Create(this, aType, aCall, false, false);
CallEventInit init;
init.mBubbles = false;
init.mCancelable = false;
init.mCall = aCall;
nsRefPtr<CallEvent> event = CallEvent::Constructor(this, aType, init);
return DispatchTrustedEvent(event);
}

9
dom/telephony/TelephonyCall.cpp
View File

@ -5,11 +5,11 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "TelephonyCall.h"
#include "mozilla/dom/CallEvent.h"
#include "mozilla/dom/TelephonyCallBinding.h"
#include "mozilla/dom/DOMError.h"
#include "CallEvent.h"
#include "Telephony.h"
#include "TelephonyCallGroup.h"
@ -145,7 +145,12 @@ TelephonyCall::DispatchCallEvent(const nsAString& aType,
{
MOZ_ASSERT(aCall);
nsRefPtr<CallEvent> event = CallEvent::Create(this, aType, aCall, false, false);
CallEventInit init;
init.mBubbles = false;
init.mCancelable = false;
init.mCall = aCall;
nsRefPtr<CallEvent> event = CallEvent::Constructor(this, aType, init);
return DispatchTrustedEvent(event);
}

9
dom/telephony/TelephonyCallGroup.cpp
View File

@ -7,8 +7,8 @@
#include "TelephonyCallGroup.h"
#include "mozilla/dom/TelephonyCallGroupBinding.h"
#include "CallEvent.h"
#include "CallsList.h"
#include "mozilla/dom/CallEvent.h"
#include "mozilla/dom/CallGroupErrorEvent.h"
#include "Telephony.h"
@ -142,7 +142,12 @@ nsresult
TelephonyCallGroup::DispatchCallEvent(const nsAString& aType,
TelephonyCall* aCall)
{
nsRefPtr<CallEvent> event = CallEvent::Create(this, aType, aCall, false, false);
CallEventInit init;
init.mBubbles = false;
init.mCancelable = false;
init.mCall = aCall;
nsRefPtr<CallEvent> event = CallEvent::Constructor(this, aType, init);
return DispatchTrustedEvent(event);
}

2
dom/telephony/moz.build
View File

@ -11,7 +11,6 @@ XPIDL_SOURCES += [
XPIDL_MODULE = 'dom_telephony'
EXPORTS.mozilla.dom += [
'CallEvent.h',
'CallsList.h',
'Telephony.h',
'TelephonyCall.h',
@ -26,7 +25,6 @@ EXPORTS.mozilla.dom.telephony += [
]
UNIFIED_SOURCES += [
'CallEvent.cpp',
'CallsList.cpp',
'ipc/TelephonyChild.cpp',
'ipc/TelephonyIPCService.cpp',

17
dom/voicemail/Voicemail.cpp
View File

@ -7,8 +7,8 @@
#include "Voicemail.h"
#include "mozilla/dom/MozVoicemailBinding.h"
#include "mozilla/dom/MozVoicemailEvent.h"
#include "nsIDOMMozVoicemailStatus.h"
#include "nsIDOMMozVoicemailEvent.h"
#include "mozilla/Preferences.h"
#include "mozilla/Services.h"
@ -164,15 +164,14 @@ Voicemail::GetDisplayName(const Optional<uint32_t>& aServiceId, nsString& aDispl
NS_IMETHODIMP
Voicemail::NotifyStatusChanged(nsIDOMMozVoicemailStatus* aStatus)
{
nsCOMPtr<nsIDOMEvent> event;
NS_NewDOMMozVoicemailEvent(getter_AddRefs(event), this, nullptr, nullptr);
MozVoicemailEventInit init;
init.mBubbles = false;
init.mCancelable = false;
init.mStatus = aStatus;
nsCOMPtr<nsIDOMMozVoicemailEvent> ce = do_QueryInterface(event);
nsresult rv = ce->InitMozVoicemailEvent(NS_LITERAL_STRING("statuschanged"),
false, false, aStatus);
NS_ENSURE_SUCCESS(rv, rv);
return DispatchTrustedEvent(ce);
nsRefPtr<MozVoicemailEvent> event =
MozVoicemailEvent::Constructor(this, NS_LITERAL_STRING("statuschanged"), init);
return DispatchTrustedEvent(event);
}
nsresult

1
dom/voicemail/moz.build
View File

@ -5,7 +5,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
XPIDL_SOURCES += [
'nsIDOMMozVoicemailEvent.idl',
'nsIDOMMozVoicemailStatus.idl',
'nsIVoicemailProvider.idl',
]

23
dom/voicemail/nsIDOMMozVoicemailEvent.idl
View File

@ -1,23 +0,0 @@
/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
/* vim: set ts=2 et sw=2 tw=40: */
/* 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"
interface nsIDOMMozVoicemailStatus;
[builtinclass, uuid(63e42e5f-0742-4c8f-bd52-938a7e03d2c9)]
interface nsIDOMMozVoicemailEvent : nsIDOMEvent
{
/**
* The voicemail status that caused this event to fire
*/
readonly attribute nsIDOMMozVoicemailStatus status;
[noscript] void initMozVoicemailEvent(in DOMString aType,
in boolean aCanBubble,
in boolean aCancelable,
in nsIDOMMozVoicemailStatus aStatus);
};

2
dom/webidl/MozCellBroadcastEvent.webidl
View File

@ -5,7 +5,7 @@
*/
interface MozCellBroadcastMessage;
[Constructor(DOMString type, optional MozCellBroadcastEventInit eventInitDict), HeaderFile="GeneratedEventClasses.h", Pref="dom.cellbroadcast.enabled"]
[Constructor(DOMString type, optional MozCellBroadcastEventInit eventInitDict), Pref="dom.cellbroadcast.enabled"]
interface MozCellBroadcastEvent : Event
{
readonly attribute MozCellBroadcastMessage? message;

2
dom/webidl/MozMmsEvent.webidl
View File

@ -5,7 +5,7 @@
*/
interface MozMmsMessage;
[Constructor(DOMString type, optional MozMmsEventInit eventInitDict), HeaderFile="GeneratedEventClasses.h"]
[Constructor(DOMString type, optional MozMmsEventInit eventInitDict)]
interface MozMmsEvent : Event
{
readonly attribute MozMmsMessage? message;

2
dom/webidl/MozSmsEvent.webidl
View File

@ -5,7 +5,7 @@
*/
interface MozSmsMessage;
[Constructor(DOMString type, optional MozSmsEventInit eventInitDict), HeaderFile="GeneratedEventClasses.h"]
[Constructor(DOMString type, optional MozSmsEventInit eventInitDict)]
interface MozSmsEvent : Event
{
readonly attribute MozSmsMessage? message;

2
dom/webidl/MozVoicemailEvent.webidl
View File

@ -5,7 +5,7 @@
*/
interface MozVoicemailStatus;
[Constructor(DOMString type, optional MozVoicemailEventInit eventInitDict), HeaderFile="GeneratedEventClasses.h", Pref="dom.voicemail.enabled"]
[Constructor(DOMString type, optional MozVoicemailEventInit eventInitDict), Pref="dom.voicemail.enabled"]
interface MozVoicemailEvent : Event
{
readonly attribute MozVoicemailStatus? status;

22
dom/webidl/MozWifiConnectionInfoEvent.webidl
View File

@ -4,14 +4,32 @@
* You can obtain one at http://mozilla.org/MPL/2.0/.
*/
[Constructor(DOMString type, optional MozWifiConnectionInfoEventInit eventInitDict), HeaderFile="GeneratedEventClasses.h"]
[Constructor(DOMString type, optional MozWifiConnectionInfoEventInit eventInitDict)]
interface MozWifiConnectionInfoEvent : Event
{
[Throws]
/**
* Network object with an SSID field.
*/
readonly attribute any network;
/**
* Strength of the signal to network, in dBm between -55 and -100 dBm.
*/
readonly attribute short signalStrength;
/**
* Relative signal strength between 0 and 100.
*/
readonly attribute short relSignalStrength;
/**
* Link speed in Mb/s.
*/
readonly attribute long linkSpeed;
/**
* IP address in the dotted quad format.
*/
readonly attribute DOMString? ipAddress;
};

6
dom/webidl/MozWifiManager.webidl
View File

@ -281,7 +281,7 @@ interface MozWifiManager : EventTarget {
/**
* A connectionInformation object with the same information found in an
* nsIDOMMozWifiConnectionInfoEvent (but without the network).
* MozWifiConnectionInfoEvent (but without the network).
* If we are not currently connected to a network, this will be null.
*/
readonly attribute MozWifiConnectionInfo? connectionInformation;
@ -293,8 +293,8 @@ interface MozWifiManager : EventTarget {
/**
* State notification listeners. These all take an
* nsIDOMMozWifiStatusChangeEvent with the new status and a network (which
* may be null).
* MozWifiStatusChangeEvent with the new status and a network (which may be
* null).
*
* The possible statuses are:
* - connecting: Fires when we start the process of connecting to a

4
dom/webidl/MozWifiP2pStatusChangeEvent.webidl
View File

@ -5,10 +5,12 @@
*/
[Constructor(DOMString type, optional MozWifiP2pStatusChangeEventInit eventInitDict),
HeaderFile="GeneratedEventClasses.h",
Func="Navigator::HasWifiManagerSupport"]
interface MozWifiP2pStatusChangeEvent : Event
{
/**
* The mac address of the peer whose status has just changed.
*/
readonly attribute DOMString peerAddress;
};

2
dom/webidl/MozWifiStationInfoEvent.webidl
View File

@ -4,7 +4,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/.
*/
[Constructor(DOMString type, optional MozWifiStationInfoEventInit eventInitDict), HeaderFile="GeneratedEventClasses.h"]
[Constructor(DOMString type, optional MozWifiStationInfoEventInit eventInitDict)]
interface MozWifiStationInfoEvent : Event
{
/**

12
dom/webidl/MozWifiStatusChangeEvent.webidl
View File

@ -4,11 +4,19 @@
* You can obtain one at http://mozilla.org/MPL/2.0/.
*/
[Constructor(DOMString type, optional MozWifiStatusChangeEventInit eventInitDict), HeaderFile="GeneratedEventClasses.h"]
[Constructor(DOMString type, optional MozWifiStatusChangeEventInit eventInitDict)]
interface MozWifiStatusChangeEvent : Event
{
[Throws]
/**
* Network object with a SSID field describing the network affected by
* this change. This might be null.
*/
readonly attribute any network;
/**
* String describing the current status of the wifi manager. See above for
* the possible values.
*/
readonly attribute DOMString? status;
};

26
dom/webidl/moz.build
View File

@ -42,7 +42,6 @@ WEBIDL_FILES = [
'BiquadFilterNode.webidl',
'Blob.webidl',
'BrowserElementDictionaries.webidl',
'CallEvent.webidl',
'CallsList.webidl',
'CameraCapabilities.webidl',
'CameraControl.webidl',
@ -533,9 +532,7 @@ WEBIDL_FILES += [
'ElementReplaceEvent.webidl',
'HashChangeEvent.webidl',
'MozApplicationEvent.webidl',
'MozMmsEvent.webidl',
'MozSettingsEvent.webidl',
'MozSmsEvent.webidl',
'PageTransitionEvent.webidl',
'PopStateEvent.webidl',
'PopupBlockedEvent.webidl',
@ -571,7 +568,6 @@ if CONFIG['MOZ_B2G_RIL']:
'DOMMMIError.webidl',
'IccCardLockError.webidl',
'MozCellBroadcast.webidl',
'MozCellBroadcastEvent.webidl',
'MozIcc.webidl',
'MozIccManager.webidl',
'MozMobileCellInfo.webidl',
@ -580,7 +576,6 @@ if CONFIG['MOZ_B2G_RIL']:
'MozMobileConnectionInfo.webidl',
'MozMobileNetworkInfo.webidl',
'MozVoicemail.webidl',
'MozVoicemailEvent.webidl',
]
if CONFIG['MOZ_NFC']:
@ -599,12 +594,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
'MozNetworkStatsInterface.webidl',
'MozSpeakerManager.webidl',
'MozWifiCapabilities.webidl',
'MozWifiConnectionInfoEvent.webidl',
'MozWifiManager.webidl',
'MozWifiP2pManager.webidl',
'MozWifiP2pStatusChangeEvent.webidl',
'MozWifiStationInfoEvent.webidl',
'MozWifiStatusChangeEvent.webidl',
]
else:
WEBIDL_FILES += [
@ -630,6 +621,7 @@ if not CONFIG['MOZ_DISABLE_CRYPTOLEGACY']:
GENERATED_EVENTS_WEBIDL_FILES = [
'AutocompleteErrorEvent.webidl',
'BlobEvent.webidl',
'CallEvent.webidl',
'CallGroupErrorEvent.webidl',
'CFStateChangeEvent.webidl',
'DataErrorEvent.webidl',
@ -644,7 +636,9 @@ GENERATED_EVENTS_WEBIDL_FILES = [
'MozContactChangeEvent.webidl',
'MozEmergencyCbModeEvent.webidl',
'MozInterAppMessageEvent.webidl',
'MozMmsEvent.webidl',
'MozOtaStatusEvent.webidl',
'MozSmsEvent.webidl',
'MozStkCommandEvent.webidl',
'ProgressEvent.webidl',
'RTCDataChannelEvent.webidl',
@ -679,6 +673,20 @@ if CONFIG['MOZ_B2G_BT']:
'BluetoothStatusChangedEvent.webidl',
]
if CONFIG['MOZ_B2G_RIL']:
GENERATED_EVENTS_WEBIDL_FILES += [
'MozCellBroadcastEvent.webidl',
'MozVoicemailEvent.webidl',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
GENERATED_EVENTS_WEBIDL_FILES += [
'MozWifiConnectionInfoEvent.webidl',
'MozWifiP2pStatusChangeEvent.webidl',
'MozWifiStationInfoEvent.webidl',
'MozWifiStatusChangeEvent.webidl',
]
if CONFIG['MOZ_BUILD_APP'] in ['browser', 'xulrunner']:
WEBIDL_FILES += [
'BrowserFeedWriter.webidl',

4
dom/wifi/moz.build
View File

@ -5,10 +5,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
XPIDL_SOURCES += [
'nsIDOMMozWifiConnectionInfoEvent.idl',
'nsIDOMMozWifiP2pStatusChangeEvent.idl',
'nsIDOMMozWifiStationInfoEvent.idl',
'nsIDOMMozWifiStatusChangeEvent.idl',
'nsIWifi.idl',
'nsIWifiCertService.idl',
'nsIWifiService.idl',

45
dom/wifi/nsIDOMMozWifiConnectionInfoEvent.idl
View File

@ -1,45 +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"
interface nsIVariant;
[builtinclass, uuid(627b2102-9605-40e0-a5bf-6d3ac672b328)]
interface nsIDOMMozWifiConnectionInfoEvent : nsIDOMEvent
{
/**
* Network object with an SSID field.
*/
readonly attribute nsIVariant network;
/**
* Strength of the signal to network, in dBm between -55 and -100 dBm.
*/
readonly attribute short signalStrength;
/**
* Relative signal strength between 0 and 100.
*/
readonly attribute short relSignalStrength;
/**
* Link speed in Mb/s.
*/
readonly attribute long linkSpeed;
/**
* IP address in the dotted quad format.
*/
readonly attribute DOMString ipAddress;
[noscript] void initMozWifiConnectionInfoEvent(in DOMString aType,
in boolean aCanBubble,
in boolean aCancelable,
in nsIVariant aNetwork,
in short signalStrength,
in short relSignalStrength,
in long linkSpeed,
in DOMString ipAddress);
};

19
dom/wifi/nsIDOMMozWifiP2pStatusChangeEvent.idl
View File

@ -1,19 +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"
[builtinclass, uuid(82cad910-2019-11e3-8224-0800200c9a66)]
interface nsIDOMMozWifiP2pStatusChangeEvent : nsIDOMEvent
{
/**
* The mac address of the peer whose status has just changed.
*/
readonly attribute DOMString peerAddress;
[noscript] void initMozWifiP2pStatusChangeEvent(in DOMString aType,
in boolean aCanBubble,
in boolean aCancelable,
in DOMString aPeerAddress);
};

19
dom/wifi/nsIDOMMozWifiStationInfoEvent.idl
View File

@ -1,19 +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(97dc8040-d5c9-11e3-9c1a-0800200c9a66)]
interface nsIDOMMozWifiStationInfoEvent : nsIDOMEvent
{
/**
* The number of wifi stations connected to wifi hotspot.
*/
readonly attribute short station;
[noscript] void initMozWifiStationInfoEvent(in DOMString aType,
in boolean aCanBubble,
in boolean aCancelable,
in short station);
};

29
dom/wifi/nsIDOMMozWifiStatusChangeEvent.idl
View File

@ -1,29 +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"
interface nsIVariant;
[builtinclass, uuid(251252ba-ed8c-47a0-8979-f7652b4d558a)]
interface nsIDOMMozWifiStatusChangeEvent : nsIDOMEvent
{
/**
* Network object with a SSID field describing the network affected by
* this change. This might be null.
*/
readonly attribute nsIVariant network;
/**
* String describing the current status of the wifi manager. See above for
* the possible values.
*/
readonly attribute DOMString status;
[noscript] void initMozWifiStatusChangeEvent(in DOMString aType,
in boolean aCanBubble,
in boolean aCancelable,
in nsIVariant aNetwork,
in DOMString aStatus);
};

12
js/xpconnect/src/event_impl_gen.conf.in
View File

@ -21,19 +21,7 @@ simple_events = [
'StyleRuleChangeEvent',
'StyleSheetChangeEvent',
'StyleSheetApplicableStateChangeEvent',
#ifdef MOZ_WIDGET_GONK
'MozWifiP2pStatusChangeEvent',
'MozWifiStatusChangeEvent',
'MozWifiConnectionInfoEvent',
'MozWifiStationInfoEvent',
#endif
#ifdef MOZ_B2G_RIL
'MozCellBroadcastEvent',
'MozVoicemailEvent',
#endif
'ElementReplaceEvent',
'MozSmsEvent',
'MozMmsEvent',
#ifdef MOZ_WEBSPEECH
'SpeechSynthesisEvent',
#endif

30
xpcom/reflect/xptinfo/src/ShimInterfaceInfo.cpp
View File

@ -116,18 +116,8 @@
#include "nsIDOMMouseScrollEvent.h"
#include "nsIDOMMutationEvent.h"
#include "nsIDOMMozApplicationEvent.h"
#include "nsIDOMMozMmsEvent.h"
#include "nsIDOMMozNamedAttrMap.h"
#include "nsIDOMMozSettingsEvent.h"
#include "nsIDOMMozSmsEvent.h"
#ifdef MOZ_B2G_RIL
#include "nsIDOMMozVoicemailEvent.h"
#endif
#ifdef MOZ_WIDGET_GONK
#include "nsIDOMMozWifiConnectionInfoEvent.h"
#include "nsIDOMMozWifiStatusChangeEvent.h"
#include "nsIDOMMozWifiP2pStatusChangeEvent.h"
#endif
#include "nsIDOMNode.h"
#include "nsIDOMNodeIterator.h"
#include "nsIDOMNotifyPaintEvent.h"
@ -285,18 +275,8 @@
#include "mozilla/dom/MouseScrollEventBinding.h"
#include "mozilla/dom/MutationEventBinding.h"
#include "mozilla/dom/MozApplicationEventBinding.h"
#include "mozilla/dom/MozMmsEventBinding.h"
#include "mozilla/dom/MozNamedAttrMapBinding.h"
#include "mozilla/dom/MozSettingsEventBinding.h"
#include "mozilla/dom/MozSmsEventBinding.h"
#ifdef MOZ_B2G_RIL
#include "mozilla/dom/MozVoicemailEventBinding.h"
#endif
#ifdef MOZ_WIDGET_GONK
#include "mozilla/dom/MozWifiConnectionInfoEventBinding.h"
#include "mozilla/dom/MozWifiStatusChangeEventBinding.h"
#include "mozilla/dom/MozWifiP2pStatusChangeEventBinding.h"
#endif
#include "mozilla/dom/NodeIteratorBinding.h"
#include "mozilla/dom/NodeBinding.h"
#include "mozilla/dom/NotifyPaintEventBinding.h"
@ -505,18 +485,8 @@ const ComponentsInterfaceShimEntry kComponentsInterfaceShimMap[] =
DEFINE_SHIM(MouseScrollEvent),
DEFINE_SHIM(MutationEvent),
DEFINE_SHIM(MozApplicationEvent),
DEFINE_SHIM(MozMmsEvent),
DEFINE_SHIM(MozNamedAttrMap),
DEFINE_SHIM(MozSettingsEvent),
DEFINE_SHIM(MozSmsEvent),
#ifdef MOZ_B2G_RIL
DEFINE_SHIM(MozVoicemailEvent),
#endif
#ifdef MOZ_WIDGET_GONK
DEFINE_SHIM(MozWifiConnectionInfoEvent),
DEFINE_SHIM(MozWifiP2pStatusChangeEvent),
DEFINE_SHIM(MozWifiStatusChangeEvent),
#endif
DEFINE_SHIM(NodeIterator),
DEFINE_SHIM(Node),
DEFINE_SHIM(NotifyPaintEvent),