Bug 823107 - Make nsIDOMEvent::SetTrusted return void; r=smaug

2012-12-22 09:18:08 +01:00 · 2012-12-22 09:18:08 +01:00 · f96f32cdf5
--- a/content/base/src/WebSocket.cpp
+++ b/content/base/src/WebSocket.cpp
@ -860,8 +860,7 @@ WebSocket::CreateAndDispatchSimpleEvent(const nsString& aName)
  rv = event->InitEvent(aName, false, false);
  NS_ENSURE_SUCCESS(rv, rv);

-  rv = event->SetTrusted(true);
-  NS_ENSURE_SUCCESS(rv, rv);
+  event->SetTrusted(true);

  return DispatchDOMEvent(nullptr, event, nullptr, nullptr);
 }
@ -929,8 +928,7 @@ WebSocket::CreateAndDispatchMessageEvent(const nsACString& aData,
                                      EmptyString(), nullptr);
  NS_ENSURE_SUCCESS(rv, rv);

-  rv = event->SetTrusted(true);
-  NS_ENSURE_SUCCESS(rv, rv);
+  event->SetTrusted(true);

  return DispatchDOMEvent(nullptr, event, nullptr, nullptr);
 }
@ -960,8 +958,7 @@ WebSocket::CreateAndDispatchCloseEvent(bool aWasClean,
                                  aWasClean, aCode, aReason);
  NS_ENSURE_SUCCESS(rv, rv);

-  rv = event->SetTrusted(true);
-  NS_ENSURE_SUCCESS(rv, rv);
+  event->SetTrusted(true);

  return DispatchDOMEvent(nullptr, event, nullptr, nullptr);
 }
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@ -3440,8 +3440,7 @@ nsresult GetEventAndTarget(nsIDocument* aDoc, nsISupports* aTarget,
  rv = event->InitEvent(aEventName, aCanBubble, aCancelable);
  NS_ENSURE_SUCCESS(rv, rv);

-  rv = event->SetTrusted(aTrusted);
-  NS_ENSURE_SUCCESS(rv, rv);
+  event->SetTrusted(aTrusted);

  rv = event->SetTarget(target);
  NS_ENSURE_SUCCESS(rv, rv);
--- a/content/events/src/nsDOMEvent.cpp
+++ b/content/events/src/nsDOMEvent.cpp
@ -264,11 +264,10 @@ nsDOMEvent::GetOriginalTarget(nsIDOMEventTarget** aOriginalTarget)
  return GetTarget(aOriginalTarget);
 }

-NS_IMETHODIMP
+NS_IMETHODIMP_(void)
 nsDOMEvent::SetTrusted(bool aTrusted)
 {
  mEvent->mFlags.mIsTrusted = aTrusted;
-  return NS_OK;
 }

 NS_IMETHODIMP
--- a/content/events/src/nsDOMEvent.h
+++ b/content/events/src/nsDOMEvent.h
@ -102,7 +102,7 @@ protected:
  NS_IMETHOD SetTarget(nsIDOMEventTarget *aTarget) { return _to SetTarget(aTarget); } \
  NS_IMETHOD_(bool) IsDispatchStopped(void) { return _to IsDispatchStopped(); } \
  NS_IMETHOD_(nsEvent *) GetInternalNSEvent(void) { return _to GetInternalNSEvent(); } \
-  NS_IMETHOD SetTrusted(bool aTrusted) { return _to SetTrusted(aTrusted); }
+  NS_IMETHOD_(void) SetTrusted(bool aTrusted) { _to SetTrusted(aTrusted); }

 #define NS_FORWARD_TO_NSDOMEVENT_NO_SERIALIZATION_NO_DUPLICATION \
  NS_FORWARD_NSIDOMEVENT_NO_SERIALIZATION_NO_DUPLICATION(nsDOMEvent::)
--- a/content/events/src/nsDOMEventTargetHelper.cpp
+++ b/content/events/src/nsDOMEventTargetHelper.cpp
@ -221,8 +221,7 @@ nsDOMEventTargetHelper::DispatchTrustedEvent(const nsAString& aEventName)
 nsresult
 nsDOMEventTargetHelper::DispatchTrustedEvent(nsIDOMEvent* event)
 {
-  nsresult rv = event->SetTrusted(true);
-  NS_ENSURE_SUCCESS(rv, rv);
+  event->SetTrusted(true);

  bool dummy;
  return DispatchEvent(event, &dummy);
--- a/dom/base/DOMRequest.cpp
+++ b/dom/base/DOMRequest.cpp
@ -162,10 +162,7 @@ DOMRequest::FireEvent(const nsAString& aType, bool aBubble, bool aCancelable)
    return;
  }

-  rv = event->SetTrusted(true);
-  if (NS_FAILED(rv)) {
-    return;
-  }
+  event->SetTrusted(true);

  bool dummy;
  DispatchEvent(event, &dummy);
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@ -8103,8 +8103,7 @@ nsGlobalWindow::FireHashchange(const nsAString &aOldURL,
                                            aOldURL, aNewURL);
  NS_ENSURE_SUCCESS(rv, rv);

-  rv = domEvent->SetTrusted(true);
-  NS_ENSURE_SUCCESS(rv, rv);
+  domEvent->SetTrusted(true);

  bool dummy;
  return DispatchEvent(hashchangeEvent, &dummy);
@ -8158,8 +8157,7 @@ nsGlobalWindow::DispatchSyncPopState()
                                        stateObj);
  NS_ENSURE_SUCCESS(rv, rv);

-  rv = domEvent->SetTrusted(true);
-  NS_ENSURE_SUCCESS(rv, rv);
+  domEvent->SetTrusted(true);

  nsCOMPtr<nsIDOMEventTarget> outerWindow =
    do_QueryInterface(GetOuterWindow());
@ -9142,8 +9140,7 @@ nsGlobalWindow::Observe(nsISupports* aSubject, const char* aTopic,
      false, false);
    NS_ENSURE_SUCCESS(rv, rv);

-    rv = event->SetTrusted(true);
-    NS_ENSURE_SUCCESS(rv, rv);
+    event->SetTrusted(true);

    bool dummy;
    return DispatchEvent(event, &dummy);
--- a/dom/bluetooth/BluetoothPropertyEvent.h
+++ b/dom/bluetooth/BluetoothPropertyEvent.h
@ -37,11 +37,9 @@ public:
    nsresult rv = InitEvent(aEventType, false, false);
    NS_ENSURE_SUCCESS(rv, rv);

-    rv = SetTrusted(true);
-    NS_ENSURE_SUCCESS(rv, rv);
+    SetTrusted(true);

-    nsIDOMEvent* thisEvent =
-      static_cast<nsDOMEvent*>(const_cast<BluetoothPropertyEvent*>(this));
+    nsDOMEvent* thisEvent = this;

    bool dummy;
    rv = aTarget->DispatchEvent(thisEvent, &dummy);
--- a/dom/bluetooth/nsIDOMBluetoothDeviceAddressEvent.idl
+++ b/dom/bluetooth/nsIDOMBluetoothDeviceAddressEvent.idl
@ -4,7 +4,7 @@

 #include "nsIDOMEvent.idl"

-[scriptable, builtinclass, uuid(afcb832f-bbb5-45fa-b703-f8185bd2d26d)]
+[scriptable, builtinclass, uuid(90c55b1c-2da5-4a30-bf09-0c70369a8d89)]
 interface nsIDOMBluetoothDeviceAddressEvent : nsIDOMEvent
 {
  readonly attribute DOMString  deviceAddress;
--- a/dom/bluetooth/nsIDOMBluetoothDeviceEvent.idl
+++ b/dom/bluetooth/nsIDOMBluetoothDeviceEvent.idl
@ -8,7 +8,7 @@

 interface nsIDOMBluetoothDevice;

-[scriptable, builtinclass, uuid(819b4683-23a9-4af9-96b9-2c40a14ecb0b)]
+[scriptable, builtinclass, uuid(e53dd06e-acd7-444a-914a-5fb60df0ad5b)]
 interface nsIDOMBluetoothDeviceEvent : nsIDOMEvent
 {
  readonly attribute nsIDOMBluetoothDevice device;
--- a/dom/bluetooth/nsIDOMBluetoothPropertyEvent.idl
+++ b/dom/bluetooth/nsIDOMBluetoothPropertyEvent.idl
@ -6,7 +6,7 @@

 #include "nsIDOMEvent.idl"

-[scriptable, builtinclass, uuid(5927bb1f-e8eb-4b40-ae20-cd02f34412ce)]
+[scriptable, builtinclass, uuid(ce268e66-2d1a-491a-833c-fb27dc50dc46)]
 interface nsIDOMBluetoothPropertyEvent : nsIDOMEvent
 {
  readonly attribute DOMString property;
--- a/dom/cellbroadcast/interfaces/nsIDOMMozCellBroadcastEvent.idl
+++ b/dom/cellbroadcast/interfaces/nsIDOMMozCellBroadcastEvent.idl
@ -6,7 +6,7 @@

 interface nsIDOMMozCellBroadcastMessage;

-[scriptable, builtinclass, uuid(0be33bb9-930f-410b-8d61-a0fc5f4dcf7d)]
+[scriptable, builtinclass, uuid(f955095f-01e4-4520-b299-7124ec7c63aa)]
 interface nsIDOMMozCellBroadcastEvent : nsIDOMEvent
 {
  //[binaryname(MessageMoz)]
--- a/dom/file/LockedFile.cpp
+++ b/dom/file/LockedFile.cpp
@ -204,8 +204,7 @@ CreateGenericEvent(const nsAString& aType, bool aBubbles, bool aCancelable)
  nsresult rv = event->InitEvent(aType, aBubbles, aCancelable);
  NS_ENSURE_SUCCESS(rv, nullptr);

-  rv = event->SetTrusted(true);
-  NS_ENSURE_SUCCESS(rv, nullptr);
+  event->SetTrusted(true);

  return event.forget();
 }
--- a/dom/icc/interfaces/SimToolKit.idl
+++ b/dom/icc/interfaces/SimToolKit.idl
@ -457,7 +457,7 @@ dictionary MozStkCommand
  jsval options;
 };

-[scriptable, builtinclass, uuid(06bbc6fa-9b59-4db6-b66b-3b26f9c379df)]
+[scriptable, builtinclass, uuid(21cd2f25-ebea-43f8-8255-eaa4e1182858)]
 interface nsIDOMMozStkCommandEvent : nsIDOMEvent
 {
  /**
--- a/dom/icc/interfaces/nsIDOMICCCardLockErrorEvent.idl
+++ b/dom/icc/interfaces/nsIDOMICCCardLockErrorEvent.idl
@ -4,7 +4,7 @@

 #include "nsIDOMEvent.idl"

-[scriptable, builtinclass, uuid(109c1117-1199-47aa-aad2-ea9f456220fa)]
+[scriptable, builtinclass, uuid(05d269bc-7049-4df8-b72f-4318aaee54de)]
 interface nsIDOMICCCardLockErrorEvent : nsIDOMEvent
 {
  readonly attribute DOMString lockType;
--- a/dom/icc/src/StkCommandEvent.h
+++ b/dom/icc/src/StkCommandEvent.h
@ -35,11 +35,9 @@ public:
    nsresult rv = InitEvent(aEventType, false, false);
    NS_ENSURE_SUCCESS(rv, rv);

-    rv = SetTrusted(true);
-    NS_ENSURE_SUCCESS(rv, rv);
+    SetTrusted(true);

-    nsIDOMEvent* thisEvent =
-      static_cast<nsDOMEvent*>(const_cast<StkCommandEvent*>(this));
+    nsDOMEvent* thisEvent = this;

    bool dummy;
    rv = aTarget->DispatchEvent(thisEvent, &dummy);
--- a/dom/indexedDB/IDBEvents.cpp
+++ b/dom/indexedDB/IDBEvents.cpp
@ -49,8 +49,7 @@ mozilla::dom::indexedDB::CreateGenericEvent(const nsAString& aType,
                                 aCancelable == eCancelable ? true : false);
  NS_ENSURE_SUCCESS(rv, nullptr);

-  rv = event->SetTrusted(true);
-  NS_ENSURE_SUCCESS(rv, nullptr);
+  event->SetTrusted(true);

  return event.forget();
 }
@ -66,15 +65,12 @@ IDBVersionChangeEvent::CreateInternal(const nsAString& aType,
  nsresult rv = event->InitEvent(aType, false, false);
  NS_ENSURE_SUCCESS(rv, nullptr);

-  rv = event->SetTrusted(true);
-  NS_ENSURE_SUCCESS(rv, nullptr);
+  event->SetTrusted(true);

  event->mOldVersion = aOldVersion;
  event->mNewVersion = aNewVersion;

-  nsDOMEvent* result;
-  event.forget(&result);
-  return result;
+  return event.forget();
 }

 // static
--- a/dom/indexedDB/nsIIDBVersionChangeEvent.idl
+++ b/dom/indexedDB/nsIIDBVersionChangeEvent.idl
@ -6,7 +6,7 @@

 #include "nsIDOMEvent.idl"

-[scriptable, builtinclass, uuid(bb9797ae-6959-47cb-893e-73d3a7018d6d)]
+[scriptable, builtinclass, uuid(08a6b8b1-92fa-4f80-98cc-370143b11ff3)]
 interface nsIIDBVersionChangeEvent : nsIDOMEvent
 {
  readonly attribute unsigned long long oldVersion;
--- a/dom/interfaces/apps/nsIDOMMozApplicationEvent.idl
+++ b/dom/interfaces/apps/nsIDOMMozApplicationEvent.idl
@ -6,7 +6,7 @@

 interface mozIDOMApplication;

-[scriptable, builtinclass, uuid(dae640fb-0a14-42d8-88d3-541c6f077820)]
+[scriptable, builtinclass, uuid(453ae38a-8d8d-465f-a718-3f01240f8f75)]
 interface nsIDOMMozApplicationEvent : nsIDOMEvent
 {
  readonly attribute mozIDOMApplication application;
--- a/dom/interfaces/contacts/nsIDOMMozContactChangeEvent.idl
+++ b/dom/interfaces/contacts/nsIDOMMozContactChangeEvent.idl
@ -4,7 +4,7 @@

 #include "nsIDOMEvent.idl"

-[scriptable, builtinclass, uuid(b05dd60a-bfb8-4428-982e-c7f20e77b673)]
+[scriptable, builtinclass, uuid(7ee758eb-9353-4ade-8715-9953ea512ee2)]
 interface nsIDOMMozContactChangeEvent : nsIDOMEvent
 {
  readonly attribute DOMString contactID;
--- a/dom/interfaces/devicestorage/nsIDOMDeviceStorageChangeEvent.idl
+++ b/dom/interfaces/devicestorage/nsIDOMDeviceStorageChangeEvent.idl
@ -5,7 +5,7 @@
 #include "domstubs.idl"
 #include "nsIDOMEvent.idl"

-[scriptable, uuid(49bdda6f-430a-4cf8-b535-b97b5b1ed575), builtinclass]
+[scriptable, uuid(30eaf0b9-8f3f-49fe-818e-7b7d9fbf8f95), builtinclass]
 interface nsIDOMDeviceStorageChangeEvent : nsIDOMEvent
 {

--- a/dom/interfaces/events/nsIDOMAnimationEvent.idl
+++ b/dom/interfaces/events/nsIDOMAnimationEvent.idl
@ -11,7 +11,7 @@
 * http://dev.w3.org/csswg/css3-animations/#animation-events-
 */

-[scriptable, builtinclass, uuid(ecb06edb-8e90-43ce-8f4b-3d1021222e3a)]
+[scriptable, builtinclass, uuid(778a701a-e8f2-4cfd-b431-79d6fb3889d8)]
 interface nsIDOMAnimationEvent : nsIDOMEvent {
  readonly attribute DOMString          animationName;
  readonly attribute float              elapsedTime;
--- a/dom/interfaces/events/nsIDOMBeforeUnloadEvent.idl
+++ b/dom/interfaces/events/nsIDOMBeforeUnloadEvent.idl
@ -15,7 +15,7 @@
 *
 */

-[scriptable, builtinclass, uuid(e5c281d9-ce73-4f95-bc4d-e00d537b63cb)]
+[scriptable, builtinclass, uuid(ee7b8943-440e-4cc3-b25e-c17c8a821d8b)]
 interface nsIDOMBeforeUnloadEvent : nsIDOMEvent
 {
  /**
--- a/dom/interfaces/events/nsIDOMCloseEvent.idl
+++ b/dom/interfaces/events/nsIDOMCloseEvent.idl
@ -12,7 +12,7 @@
 * For more information on this interface, please see
 * http://dev.w3.org/html5/websockets/#closeevent
 */
-[scriptable, builtinclass, uuid(028a92e8-54ab-42ba-938a-9118d339164f)]
+[scriptable, builtinclass, uuid(0b85dc61-2436-4786-b153-097f5c3a33b6)]
 interface nsIDOMCloseEvent : nsIDOMEvent
 {
  readonly attribute boolean wasClean;
--- a/dom/interfaces/events/nsIDOMCommandEvent.idl
+++ b/dom/interfaces/events/nsIDOMCommandEvent.idl
@ -5,7 +5,7 @@

 #include "nsIDOMEvent.idl"

-[scriptable, builtinclass, uuid(e2516013-4552-4638-b47b-9f0c24609e02)]
+[scriptable, builtinclass, uuid(3fdc07cb-3b2e-4c6e-a054-008a4f302202)]
 interface nsIDOMCommandEvent : nsIDOMEvent
 {
  readonly attribute DOMString command;
--- a/dom/interfaces/events/nsIDOMCompositionEvent.idl
+++ b/dom/interfaces/events/nsIDOMCompositionEvent.idl
@ -6,7 +6,7 @@

 #include "nsIDOMUIEvent.idl"

-[scriptable, builtinclass, uuid(858d898a-33a8-4c0b-a9ff-fa9a81a5ce09)]
+[scriptable, builtinclass, uuid(ef545b90-a5f4-471c-b4f8-03b5e0f6fda2)]
 interface nsIDOMCompositionEvent : nsIDOMUIEvent
 {
  readonly attribute DOMString data;
--- a/dom/interfaces/events/nsIDOMCustomEvent.idl
+++ b/dom/interfaces/events/nsIDOMCustomEvent.idl
@ -6,7 +6,7 @@
 #include "nsIDOMEvent.idl"
 interface nsIVariant;

-[scriptable, builtinclass, uuid(86e1b9ee-8080-4217-b3fa-025556d83597)]
+[scriptable, builtinclass, uuid(b56ae6ca-c822-489e-be71-2a9f3c56082e)]
 interface nsIDOMCustomEvent : nsIDOMEvent
 {

--- a/dom/interfaces/events/nsIDOMDataContainerEvent.idl
+++ b/dom/interfaces/events/nsIDOMDataContainerEvent.idl
@ -6,7 +6,7 @@
 #include "nsIDOMEvent.idl"
 #include "nsIVariant.idl"

-[scriptable, builtinclass, uuid(8d70345a-144d-48d8-a64d-7a61a15b453c)]
+[scriptable, builtinclass, uuid(dc6b39da-87ff-4b6f-b065-b52602602e06)]
 interface nsIDOMDataContainerEvent : nsIDOMEvent
 {
  /**
--- a/dom/interfaces/events/nsIDOMDeviceLightEvent.idl
+++ b/dom/interfaces/events/nsIDOMDeviceLightEvent.idl
@ -4,7 +4,7 @@

 #include "nsIDOMEvent.idl"

-[scriptable, builtinclass, uuid(9cc7684c-a239-428c-b4f1-34c510c98a1c)]
+[scriptable, builtinclass, uuid(0e4d1751-fdcd-4ee6-b82d-d3f5d992370d)]
 interface nsIDOMDeviceLightEvent : nsIDOMEvent
 {
  [noscript] void initDeviceLightEvent(in DOMString eventTypeArg,
--- a/dom/interfaces/events/nsIDOMDeviceMotionEvent.idl
+++ b/dom/interfaces/events/nsIDOMDeviceMotionEvent.idl
@ -21,7 +21,7 @@ interface nsIDOMDeviceRotationRate : nsISupports
 };


-[scriptable, builtinclass, uuid(1b3d39f2-8f8b-454f-83ad-acbdd32fa2c3)]
+[scriptable, builtinclass, uuid(64c300f8-4bf9-47d0-86bc-2fafd7de38c7)]
 interface nsIDOMDeviceMotionEvent : nsIDOMEvent
 {
  void initDeviceMotionEvent(in DOMString eventTypeArg,
--- a/dom/interfaces/events/nsIDOMDeviceOrientationEvent.idl
+++ b/dom/interfaces/events/nsIDOMDeviceOrientationEvent.idl
@ -4,7 +4,7 @@

 #include "nsIDOMEvent.idl"

-[scriptable, builtinclass, uuid(8e37040a-dbbb-41d8-a019-eb687e5e8ec7)]
+[scriptable, builtinclass, uuid(f5921a77-3ac5-4374-bc0c-1ed52fe83123)]
 interface nsIDOMDeviceOrientationEvent : nsIDOMEvent
 {
  void initDeviceOrientationEvent(in DOMString eventTypeArg,
--- a/dom/interfaces/events/nsIDOMDeviceProximityEvent.idl
+++ b/dom/interfaces/events/nsIDOMDeviceProximityEvent.idl
@ -4,7 +4,7 @@

 #include "nsIDOMEvent.idl"

-[scriptable, builtinclass, uuid(c33bec2d-5a0b-44ae-b035-d74cd519ec16)]
+[scriptable, builtinclass, uuid(86c7c396-9c2b-4d45-9c7c-b0dcda024105)]
 interface nsIDOMDeviceProximityEvent : nsIDOMEvent
 {
  [noscript] void initDeviceProximityEvent(in DOMString eventTypeArg,
--- a/dom/interfaces/events/nsIDOMDragEvent.idl
+++ b/dom/interfaces/events/nsIDOMDragEvent.idl
@ -8,7 +8,7 @@

 interface nsIDOMDataTransfer;

-[scriptable, builtinclass, uuid(2b3b587d-6426-415f-a6f0-4f86eaa562f1)]
+[scriptable, builtinclass, uuid(4d0fe952-7ca7-4730-a163-4454e39ed187)]
 interface nsIDOMDragEvent : nsIDOMMouseEvent
 {
  readonly attribute nsIDOMDataTransfer dataTransfer;
--- a/dom/interfaces/events/nsIDOMEvent.idl
+++ b/dom/interfaces/events/nsIDOMEvent.idl
@ -38,7 +38,7 @@ class WheelEvent;
 * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html
 */

-[scriptable, builtinclass, uuid(270c945b-8a65-4170-bc0b-4ec1443cd39f)]
+[scriptable, builtinclass, uuid(c939eab8-1345-4344-875b-e0f2d8d89171)]
 interface nsIDOMEvent : nsISupports
 {
  // PhaseType
@ -247,7 +247,7 @@ interface nsIDOMEvent : nsISupports
  [noscript] void setTarget(in nsIDOMEventTarget aTarget);
  [notxpcom] boolean IsDispatchStopped();
  [notxpcom] nsEventPtr GetInternalNSEvent();
-  [noscript] void SetTrusted(in boolean aTrusted);
+  [noscript,notxpcom] void SetTrusted(in boolean aTrusted);
  [notxpcom] void Serialize(in IPCMessagePtr aMsg,
                            in boolean aSerializeInterfaceType);
  [notxpcom] boolean Deserialize(in ConstIPCMessagePtr aMsg, out voidPtr aIter);
--- a/dom/interfaces/events/nsIDOMHashChangeEvent.idl
+++ b/dom/interfaces/events/nsIDOMHashChangeEvent.idl
@ -5,7 +5,7 @@

 #include "nsIDOMEvent.idl"

-[scriptable, builtinclass, uuid(bf5ce408-971a-4e74-bc57-178f0f8781f3)]
+[scriptable, builtinclass, uuid(d83f3cb2-1fa4-4ee0-8eb1-8181f6d3e214)]
 interface nsIDOMHashChangeEvent : nsIDOMEvent
 {
  readonly attribute DOMString oldURL;
--- a/dom/interfaces/events/nsIDOMKeyEvent.idl
+++ b/dom/interfaces/events/nsIDOMKeyEvent.idl
@ -5,7 +5,7 @@

 #include "nsIDOMUIEvent.idl"

-[scriptable, builtinclass, uuid(5d116380-8432-48cb-a717-200f04c39d2f)]
+[scriptable, builtinclass, uuid(ffbe684c-ca90-4b58-aa8c-9727f997f86d)]
 interface nsIDOMKeyEvent : nsIDOMUIEvent
 {
  const unsigned long DOM_VK_CANCEL         = 0x03;
--- a/dom/interfaces/events/nsIDOMMessageEvent.idl
+++ b/dom/interfaces/events/nsIDOMMessageEvent.idl
@ -12,7 +12,7 @@
 * For more information on this interface, please see
 * http://www.whatwg.org/specs/web-apps/current-work/#messageevent
 */
-[scriptable, builtinclass, uuid(ba747c2b-ec12-4e0d-8de4-d749a6b572e6)]
+[scriptable, builtinclass, uuid(bb869a03-5fc0-4a1b-838a-342e5025fc05)]
 interface nsIDOMMessageEvent : nsIDOMEvent
 {
  /**
--- a/dom/interfaces/events/nsIDOMMouseEvent.idl
+++ b/dom/interfaces/events/nsIDOMMouseEvent.idl
@ -13,7 +13,7 @@
 * http://www.w3.org/TR/DOM-Level-2-Events/
 */

-[scriptable, builtinclass, uuid(796c3436-5f89-4145-be3a-49808c09fdc6)]
+[scriptable, builtinclass, uuid(afb2e57b-2822-4969-b2a9-0cada6859534)]
 interface nsIDOMMouseEvent : nsIDOMUIEvent
 {
  readonly attribute long               screenX;
--- a/dom/interfaces/events/nsIDOMMouseScrollEvent.idl
+++ b/dom/interfaces/events/nsIDOMMouseScrollEvent.idl
@ -5,7 +5,7 @@

 #include "nsIDOMMouseEvent.idl"

-[scriptable, builtinclass, uuid(bd3ab39d-eca0-4e2f-889d-4641a2e5d87d)]
+[scriptable, builtinclass, uuid(2bce5c03-5bed-4c22-8a6a-a3ac8f5563d7)]
 interface nsIDOMMouseScrollEvent : nsIDOMMouseEvent
 {
  const long HORIZONTAL_AXIS = 1;
--- a/dom/interfaces/events/nsIDOMMutationEvent.idl
+++ b/dom/interfaces/events/nsIDOMMutationEvent.idl
@ -5,7 +5,7 @@

 #include "nsIDOMEvent.idl"

-[scriptable, builtinclass, uuid(85e7c0c0-4dbd-40f4-9f58-8050071dcaae)]
+[scriptable, builtinclass, uuid(982d9800-1402-46e5-8ad2-56fb0f4905ef)]
 interface nsIDOMMutationEvent : nsIDOMEvent
 {
  const unsigned short      MODIFICATION       = 1;
--- a/dom/interfaces/events/nsIDOMNotifyAudioAvailableEvent.idl
+++ b/dom/interfaces/events/nsIDOMNotifyAudioAvailableEvent.idl
@ -7,7 +7,7 @@
 #include "nsIDOMEvent.idl"
 #include "nsIVariant.idl"

-[scriptable, builtinclass, uuid(34139b4f-ac78-4372-98d3-12d6dcf478ef)]
+[scriptable, builtinclass, uuid(2345d43d-197a-4589-a4b7-983b41b76c25)]
 interface nsIDOMNotifyAudioAvailableEvent : nsIDOMEvent
 {
  [implicit_jscontext]
--- a/dom/interfaces/events/nsIDOMNotifyPaintEvent.idl
+++ b/dom/interfaces/events/nsIDOMNotifyPaintEvent.idl
@ -12,7 +12,7 @@ interface nsIDOMPaintRequestList;
 * event, which fires at a window when painting has happened in
 * that window.
 */
-[scriptable, builtinclass, uuid(a61dc375-6631-4404-8205-b551afe826c3)]
+[scriptable, builtinclass, uuid(e3560df8-0926-48da-b13a-36d3938c95af)]
 interface nsIDOMNotifyPaintEvent : nsIDOMEvent
 {
  /**
--- a/dom/interfaces/events/nsIDOMPageTransitionEvent.idl
+++ b/dom/interfaces/events/nsIDOMPageTransitionEvent.idl
@ -11,7 +11,7 @@
 * load/unload and saving/restoring a document from session history.
 */

-[scriptable, builtinclass, uuid(9f3ffe42-bbd2-428d-97f1-6c158c6eb2f9)]
+[scriptable, builtinclass, uuid(8a69a3d6-c7da-4caa-993c-7f9583d9f896)]
 interface nsIDOMPageTransitionEvent : nsIDOMEvent
 {
  /**
--- a/dom/interfaces/events/nsIDOMPopStateEvent.idl
+++ b/dom/interfaces/events/nsIDOMPopStateEvent.idl
@ -7,7 +7,7 @@

 interface nsIVariant;

-[scriptable, builtinclass, uuid(17ab1333-6fc7-46f9-8513-a82dc6548642)]
+[scriptable, builtinclass, uuid(f0def4a3-0eb3-4c08-b476-582e37b8564b)]
 interface nsIDOMPopStateEvent : nsIDOMEvent
 {
  /**
--- a/dom/interfaces/events/nsIDOMPopupBlockedEvent.idl
+++ b/dom/interfaces/events/nsIDOMPopupBlockedEvent.idl
@ -12,7 +12,7 @@ interface nsIURI;
 * posted when a popup window is blocked.
 */

-[scriptable, builtinclass, uuid(80eb7f77-7f87-4559-9229-60ba5e05135f)]
+[scriptable, builtinclass, uuid(f6e77f79-d178-419d-8177-dfae4392d318)]
 interface nsIDOMPopupBlockedEvent : nsIDOMEvent
 {
  /**
--- a/dom/interfaces/events/nsIDOMProgressEvent.idl
+++ b/dom/interfaces/events/nsIDOMProgressEvent.idl
@ -10,7 +10,7 @@
 * ProgressEvent can be used for measuring progress.
 */

-[scriptable, builtinclass, uuid(c5b7ec31-b846-4a9f-b81e-859e76a74f6b)]
+[scriptable, builtinclass, uuid(e0682338-4c3f-4d3a-9487-d7492ea76335)]
 interface nsIDOMProgressEvent : nsIDOMEvent
 {
  readonly attribute boolean lengthComputable;
--- a/dom/interfaces/events/nsIDOMScrollAreaEvent.idl
+++ b/dom/interfaces/events/nsIDOMScrollAreaEvent.idl
@ -5,7 +5,7 @@

 #include "nsIDOMUIEvent.idl"

-[scriptable, builtinclass, uuid(d38655dd-3be4-4c91-a3b1-0818d396ddf0)]
+[scriptable, builtinclass, uuid(49ab3d1d-f549-4cdb-904c-f6b6d3a0ec9e)]
 interface nsIDOMScrollAreaEvent : nsIDOMUIEvent
 {
  // Scroll area client rect
--- a/dom/interfaces/events/nsIDOMSimpleGestureEvent.idl
+++ b/dom/interfaces/events/nsIDOMSimpleGestureEvent.idl
@ -69,7 +69,7 @@
 * consuming events.
 */

-[scriptable, builtinclass, uuid(0748e618-6612-45d7-8d34-1f56d546e04a)]
+[scriptable, builtinclass, uuid(0cd3fde1-0c99-49cc-a74e-9a9348864307)]
 interface nsIDOMSimpleGestureEvent : nsIDOMMouseEvent
 {
  /* Swipe direction constants */
--- a/dom/interfaces/events/nsIDOMSmartCardEvent.idl
+++ b/dom/interfaces/events/nsIDOMSmartCardEvent.idl
@ -5,7 +5,7 @@

 #include "nsIDOMEvent.idl"

-[scriptable, builtinclass, uuid(88ae203d-12b8-4a85-a69f-6f83a8b5c226)]
+[scriptable, builtinclass, uuid(3747df70-e31a-4399-a394-0f5f969874b5)]
 interface nsIDOMSmartCardEvent : nsIDOMEvent
 {
  readonly attribute DOMString   tokenName;
--- a/dom/interfaces/events/nsIDOMTouchEvent.idl
+++ b/dom/interfaces/events/nsIDOMTouchEvent.idl
@ -45,7 +45,7 @@ interface nsIDOMTouchList : nsISupports {
  nsIDOMTouch identifiedTouch(in long identifier);
 };

-[scriptable, builtinclass, uuid(dfaac0c6-9c4a-4a95-8872-1d58f19d5768)]
+[scriptable, builtinclass, uuid(9a043d55-f59e-4790-8fc7-1fab1c727732)]
 interface nsIDOMTouchEvent : nsIDOMUIEvent {
  readonly attribute nsIDOMTouchList touches;
  readonly attribute nsIDOMTouchList targetTouches;
--- a/dom/interfaces/events/nsIDOMTransitionEvent.idl
+++ b/dom/interfaces/events/nsIDOMTransitionEvent.idl
@ -11,7 +11,7 @@
 * http://dev.w3.org/csswg/css3-transitions/#transition-events-
 */

-[scriptable, builtinclass, uuid(dd6b6318-a69b-4daf-99ad-617876782dfd)]
+[scriptable, builtinclass, uuid(9013310a-e376-40bc-b141-9b9ae3085daa)]
 interface nsIDOMTransitionEvent : nsIDOMEvent {
  readonly attribute DOMString           propertyName;
  readonly attribute float               elapsedTime;
--- a/dom/interfaces/events/nsIDOMUIEvent.idl
+++ b/dom/interfaces/events/nsIDOMUIEvent.idl
@ -13,7 +13,7 @@
 * http://www.w3.org/TR/DOM-Level-2-Events/
 */

-[scriptable, builtinclass, uuid(415453e6-132a-4902-9a99-cc480f0311b6)]
+[scriptable, builtinclass, uuid(d73852f8-7bd6-477d-8233-117dbf83860b)]
 interface nsIDOMUIEvent : nsIDOMEvent
 {
  readonly attribute nsIDOMWindow       view;
--- a/dom/interfaces/events/nsIDOMUserProximityEvent.idl
+++ b/dom/interfaces/events/nsIDOMUserProximityEvent.idl
@ -4,7 +4,7 @@

 #include "nsIDOMEvent.idl"

-[scriptable, builtinclass, uuid(ae59b379-1c58-4baa-bef4-21fca57fc4c2)]
+[scriptable, builtinclass, uuid(5f1a4c25-e65d-4b50-a883-7498ab88c677)]
 interface nsIDOMUserProximityEvent : nsIDOMEvent
 {
  [noscript] void initUserProximityEvent(in DOMString eventTypeArg,
--- a/dom/interfaces/events/nsIDOMWheelEvent.idl
+++ b/dom/interfaces/events/nsIDOMWheelEvent.idl
@ -6,7 +6,7 @@

 #include "nsIDOMMouseEvent.idl"

-[scriptable, builtinclass, uuid(5b689c9c-ce82-4836-bb7b-f2fa0c3d2f32)]
+[scriptable, builtinclass, uuid(86e2b577-7e61-4ed5-8ddd-c1533bf07137)]
 interface nsIDOMWheelEvent : nsIDOMMouseEvent
 {
  const unsigned long DOM_DELTA_PIXEL = 0x00;
--- a/dom/interfaces/load-save/nsIDOMLSProgressEvent.idl
+++ b/dom/interfaces/load-save/nsIDOMLSProgressEvent.idl
@ -7,7 +7,7 @@

 interface nsIDOMLSInput;

-[scriptable, builtinclass, uuid(522fb528-f550-4e0c-8745-f784bba7cfbe)]
+[scriptable, builtinclass, uuid(5343c259-78c1-4f20-a81f-5ddce4f0188e)]
 interface nsIDOMLSProgressEvent : nsIDOMEvent
 {
  readonly attribute nsIDOMLSInput   input;
--- a/dom/interfaces/settings/nsIDOMMozSettingsEvent.idl
+++ b/dom/interfaces/settings/nsIDOMMozSettingsEvent.idl
@ -5,7 +5,7 @@
 #include "nsIDOMEvent.idl"
 interface nsIVariant;

-[scriptable, builtinclass, uuid(109d5b5c-48b2-4d10-a881-72dcf4c27969)]
+[scriptable, builtinclass, uuid(d5081bf4-6a63-4ee6-8ce6-f488082dc08f)]
 interface nsIDOMMozSettingsEvent : nsIDOMEvent
 {
  readonly attribute DOMString  settingName;
--- a/dom/interfaces/smil/nsIDOMTimeEvent.idl
+++ b/dom/interfaces/smil/nsIDOMTimeEvent.idl
@ -13,7 +13,7 @@
 * http://www.w3.org/TR/SVG/animate.html#InterfaceTimeEvent
 */

-[scriptable, builtinclass, uuid(a7ddd388-5fdf-4af8-b3ee-7e1baa636b66)]
+[scriptable, builtinclass, uuid(4a5a5fa6-2783-4171-b8bb-cae4ab06e6ff)]
 interface nsIDOMTimeEvent : nsIDOMEvent
 {
  readonly attribute long detail;
--- a/dom/interfaces/storage/nsIDOMStorageEvent.idl
+++ b/dom/interfaces/storage/nsIDOMStorageEvent.idl
@ -16,7 +16,7 @@

 interface nsIDOMStorage;

-[scriptable, builtinclass, uuid(0929c378-2ad6-4fde-a0db-8cd61bbb080c)]
+[scriptable, builtinclass, uuid(85f04275-4679-4e89-b43f-142bbbab1e89)]
 interface nsIDOMStorageEvent : nsIDOMEvent
 {
  /**
--- a/dom/interfaces/svg/nsIDOMSVGEvent.idl
+++ b/dom/interfaces/svg/nsIDOMSVGEvent.idl
@ -10,7 +10,7 @@
 * http://www.w3.org/TR/SVG11/script.html#InterfaceSVGEvent
 */

-[scriptable, builtinclass, uuid(85c1aba6-6ab1-4b7d-b200-2c8ef39267ad)]
+[scriptable, builtinclass, uuid(d6a2c07c-8a67-4a6e-adde-f668edb4a852)]
 interface nsIDOMSVGEvent : nsIDOMEvent
 {
 };
--- a/dom/interfaces/svg/nsIDOMSVGZoomEvent.idl
+++ b/dom/interfaces/svg/nsIDOMSVGZoomEvent.idl
@ -13,7 +13,7 @@
 interface nsIDOMSVGRect;
 interface nsIDOMSVGPoint;

-[scriptable, builtinclass, uuid(77a0b46e-54cf-4e6e-a962-a2f52389da34)]
+[scriptable, builtinclass, uuid(9cf032c6-8485-4bde-90d4-0c8bbff27a12)]
 interface nsIDOMSVGZoomEvent : nsIDOMUIEvent
 {
  readonly attribute nsIDOMSVGRect  zoomRectScreen;
--- a/dom/interfaces/xul/nsIDOMXULCommandEvent.idl
+++ b/dom/interfaces/xul/nsIDOMXULCommandEvent.idl
@ -11,7 +11,7 @@

 #include "nsIDOMUIEvent.idl"

-[scriptable, builtinclass, uuid(bb7f2758-9a71-4701-984f-eb66f08c4356)]
+[scriptable, builtinclass, uuid(2d5b6e19-74bb-40af-9aac-59a1e53e3fcc)]
 interface nsIDOMXULCommandEvent : nsIDOMUIEvent
 {
  /**
--- a/dom/network/interfaces/nsIDOMDataErrorEvent.idl
+++ b/dom/network/interfaces/nsIDOMDataErrorEvent.idl
@ -4,7 +4,7 @@

 #include "nsIDOMEvent.idl"

-[scriptable, builtinclass, uuid(1cfc45ba-c5d4-11e1-b4c3-00265511db39)]
+[scriptable, builtinclass, uuid(494cf68f-0ca8-4cf9-924b-84cf379c9631)]
 interface nsIDOMDataErrorEvent : nsIDOMEvent
 {
  readonly attribute DOMString message;
--- a/dom/network/interfaces/nsIDOMUSSDReceivedEvent.idl
+++ b/dom/network/interfaces/nsIDOMUSSDReceivedEvent.idl
@ -4,7 +4,7 @@

 #include "nsIDOMEvent.idl"

-[scriptable, builtinclass, uuid(c0de7fba-725f-4180-b1f1-83163014d1e2)]
+[scriptable, builtinclass, uuid(56e18850-96f1-4898-a0de-47e0c994c4ab)]
 interface nsIDOMUSSDReceivedEvent : nsIDOMEvent
 {
  readonly attribute DOMString message;
--- a/dom/network/src/DataErrorEvent.h
+++ b/dom/network/src/DataErrorEvent.h
@ -34,11 +34,9 @@ public:
    nsresult rv = InitEvent(aEventType, false, false);
    NS_ENSURE_SUCCESS(rv, rv);

-    rv = SetTrusted(true);
-    NS_ENSURE_SUCCESS(rv, rv);
+    SetTrusted(true);

-    nsIDOMEvent* thisEvent =
-      static_cast<nsDOMEvent*>(const_cast<DataErrorEvent*>(this));
+    nsDOMEvent* thisEvent = this;

    bool dummy;
    rv = aTarget->DispatchEvent(thisEvent, &dummy);
--- a/dom/network/src/USSDReceivedEvent.h
+++ b/dom/network/src/USSDReceivedEvent.h
@ -35,11 +35,9 @@ public:
    nsresult rv = InitEvent(aEventType, false, false);
    NS_ENSURE_SUCCESS(rv, rv);

-    rv = SetTrusted(true);
-    NS_ENSURE_SUCCESS(rv, rv);
+    SetTrusted(true);

-    nsIDOMEvent* thisEvent =
-      static_cast<nsDOMEvent*>(const_cast<USSDReceivedEvent*>(this));
+    nsDOMEvent* thisEvent = this;

    bool dummy;
    rv = aTarget->DispatchEvent(thisEvent, &dummy);
--- a/dom/sms/interfaces/nsIDOMSmsEvent.idl
+++ b/dom/sms/interfaces/nsIDOMSmsEvent.idl
@ -7,7 +7,7 @@

 interface nsIDOMMozSmsMessage;

-[scriptable, builtinclass, uuid(3bde920e-6552-479c-919a-d66589a85a28)]
+[scriptable, builtinclass, uuid(89a5cdbc-5e43-4f9a-8d2c-64a582d64416)]
 interface nsIDOMMozSmsEvent : nsIDOMEvent
 {
  [binaryname(MessageMoz)]
--- a/dom/sms/src/SmsRequest.cpp
+++ b/dom/sms/src/SmsRequest.cpp
@ -290,8 +290,7 @@ SmsRequest::DispatchTrustedEvent(const nsAString& aEventName)
  nsresult rv = event->InitEvent(aEventName, false, false);
  NS_ENSURE_SUCCESS(rv, rv);

-  rv = event->SetTrusted(true);
-  NS_ENSURE_SUCCESS(rv, rv);
+  event->SetTrusted(true);

  bool dummy;
  return DispatchEvent(event, &dummy);
--- a/dom/telephony/CallEvent.h
+++ b/dom/telephony/CallEvent.h
@ -39,11 +39,9 @@ public:
    nsresult rv = InitEvent(aEventType, false, false);
    NS_ENSURE_SUCCESS(rv, rv);

-    rv = SetTrusted(true);
-    NS_ENSURE_SUCCESS(rv, rv);
+    SetTrusted(true);

-    nsIDOMEvent* thisEvent =
-      static_cast<nsDOMEvent*>(const_cast<CallEvent*>(this));
+    nsDOMEvent* thisEvent = this;

    bool dummy;
    rv = aTarget->DispatchEvent(thisEvent, &dummy);
--- a/dom/telephony/nsIDOMCallEvent.idl
+++ b/dom/telephony/nsIDOMCallEvent.idl
@ -8,7 +8,7 @@

 interface nsIDOMTelephonyCall;

-[scriptable, builtinclass, uuid(d836f0e6-7305-4fdd-966e-ee261fa44001)]
+[scriptable, builtinclass, uuid(21c233f9-721b-4985-bb2b-585f978ceee5)]
 interface nsIDOMCallEvent : nsIDOMEvent
 {
  readonly attribute nsIDOMTelephonyCall call;
--- a/dom/telephony/nsIDOMVoicemailEvent.idl
+++ b/dom/telephony/nsIDOMVoicemailEvent.idl
@ -8,7 +8,7 @@

 interface nsIDOMMozVoicemailStatus;

-[scriptable, builtinclass, uuid(b2208967-2231-45e4-9a40-57b97908adf8)]
+[scriptable, builtinclass, uuid(8fd09b8e-1572-48ff-8719-f8f179afef4b)]
 interface nsIDOMMozVoicemailEvent : nsIDOMEvent
 {
  /**
--- a/dom/wifi/nsIDOMMozWifiConnectionInfoEvent.idl
+++ b/dom/wifi/nsIDOMMozWifiConnectionInfoEvent.idl
@ -6,7 +6,7 @@

 interface nsIVariant;

-[scriptable, builtinclass, uuid(1717f9d9-5fd8-43d8-a098-55924c6d37de)]
+[scriptable, builtinclass, uuid(627b2102-9605-40e0-a5bf-6d3ac672b328)]
 interface nsIDOMMozWifiConnectionInfoEvent : nsIDOMEvent
 {
    /**
--- a/dom/wifi/nsIDOMMozWifiStatusChangeEvent.idl
+++ b/dom/wifi/nsIDOMMozWifiStatusChangeEvent.idl
@ -6,7 +6,7 @@

 interface nsIVariant;

-[scriptable, builtinclass, uuid(f3ef70b0-b2d3-4eb5-8ea4-008f8d330cd6)]
+[scriptable, builtinclass, uuid(251252ba-ed8c-47a0-8979-f7652b4d558a)]
 interface nsIDOMMozWifiStatusChangeEvent : nsIDOMEvent
 {
    /**
--- a/security/manager/ssl/src/nsSmartCardEvent.cpp
+++ b/security/manager/ssl/src/nsSmartCardEvent.cpp
@ -36,7 +36,8 @@ NS_IMETHODIMP nsSmartCardEvent::Init(nsIDOMEvent * aInner)
 {
  NS_ASSERTION(aInner, "SmartCardEvent initialized with a null Event");
  mInner = aInner;
-  return mInner->SetTrusted(true);
+  mInner->SetTrusted(true);
+  return NS_OK;
 }

 // nsSmartCard Specific methods
@ -71,10 +72,10 @@ NS_IMETHODIMP_(nsEvent*) nsSmartCardEvent::GetInternalNSEvent()
  return mInner->GetInternalNSEvent();
 }

-NS_IMETHODIMP nsSmartCardEvent::SetTrusted(bool aResult)
+NS_IMETHODIMP_(void) nsSmartCardEvent::SetTrusted(bool aResult)
 {
  NS_ASSERTION(mInner, "SmartCardEvent called without Init");
-  return mInner->SetTrusted(aResult);
+  mInner->SetTrusted(aResult);
 }

 void