diff --git a/content/media/eme/MediaEncryptedEvent.cpp b/content/media/eme/MediaEncryptedEvent.cpp
index f804b1fd5bec..09770f6eda9d 100644
--- a/content/media/eme/MediaEncryptedEvent.cpp
+++ b/content/media/eme/MediaEncryptedEvent.cpp
@@ -46,7 +46,7 @@ MediaEncryptedEvent::~MediaEncryptedEvent()
 }
 
 JSObject*
-MediaEncryptedEvent::WrapObject(JSContext* aCx)
+MediaEncryptedEvent::WrapObjectInternal(JSContext* aCx)
 {
   return MediaEncryptedEventBinding::Wrap(aCx, this);
 }
diff --git a/content/media/eme/MediaEncryptedEvent.h b/content/media/eme/MediaEncryptedEvent.h
index 1b4d2e9f3835..addd167436b9 100644
--- a/content/media/eme/MediaEncryptedEvent.h
+++ b/content/media/eme/MediaEncryptedEvent.h
@@ -36,7 +36,7 @@ protected:
 
 public:
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE;
 
   static already_AddRefed<MediaEncryptedEvent>
   Constructor(EventTarget* aOwner,
diff --git a/content/media/eme/MediaKeyError.cpp b/content/media/eme/MediaKeyError.cpp
index 20b63f580a14..e39ebb55e508 100644
--- a/content/media/eme/MediaKeyError.cpp
+++ b/content/media/eme/MediaKeyError.cpp
@@ -29,7 +29,7 @@ MediaKeyError::SystemCode() const
 }
 
 JSObject*
-MediaKeyError::WrapObject(JSContext* aCx)
+MediaKeyError::WrapObjectInternal(JSContext* aCx)
 {
   return MediaKeyErrorBinding::Wrap(aCx, this);
 }
diff --git a/content/media/eme/MediaKeyError.h b/content/media/eme/MediaKeyError.h
index a423da942f62..af0b9e0d83e1 100644
--- a/content/media/eme/MediaKeyError.h
+++ b/content/media/eme/MediaKeyError.h
@@ -24,7 +24,7 @@ public:
   MediaKeyError(EventTarget* aOwner, uint32_t aSystemCode);
   ~MediaKeyError();
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE;
 
   uint32_t SystemCode() const;
 
diff --git a/content/media/eme/MediaKeyMessageEvent.cpp b/content/media/eme/MediaKeyMessageEvent.cpp
index fe6fbab3d5d2..cbad683ae959 100644
--- a/content/media/eme/MediaKeyMessageEvent.cpp
+++ b/content/media/eme/MediaKeyMessageEvent.cpp
@@ -56,7 +56,7 @@ MediaKeyMessageEvent::AsMediaKeyMessageEvent()
 }
 
 JSObject*
-MediaKeyMessageEvent::WrapObject(JSContext* aCx)
+MediaKeyMessageEvent::WrapObjectInternal(JSContext* aCx)
 {
   return MediaKeyMessageEventBinding::Wrap(aCx, this);
 }
diff --git a/content/media/eme/MediaKeyMessageEvent.h b/content/media/eme/MediaKeyMessageEvent.h
index b6d2970cd7a5..6a78a05e0bcf 100644
--- a/content/media/eme/MediaKeyMessageEvent.h
+++ b/content/media/eme/MediaKeyMessageEvent.h
@@ -37,7 +37,7 @@ protected:
 public:
   virtual MediaKeyMessageEvent* AsMediaKeyMessageEvent();
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE;
 
   static already_AddRefed<MediaKeyMessageEvent>
     Constructor(EventTarget* aOwner,
diff --git a/content/media/webaudio/AudioProcessingEvent.cpp b/content/media/webaudio/AudioProcessingEvent.cpp
index 5e7c9121d170..5ed5a36b3943 100644
--- a/content/media/webaudio/AudioProcessingEvent.cpp
+++ b/content/media/webaudio/AudioProcessingEvent.cpp
@@ -35,7 +35,7 @@ AudioProcessingEvent::~AudioProcessingEvent()
 }
 
 JSObject*
-AudioProcessingEvent::WrapObject(JSContext* aCx)
+AudioProcessingEvent::WrapObjectInternal(JSContext* aCx)
 {
   return AudioProcessingEventBinding::Wrap(aCx, this);
 }
diff --git a/content/media/webaudio/AudioProcessingEvent.h b/content/media/webaudio/AudioProcessingEvent.h
index a0f9958f18e6..e57824758545 100644
--- a/content/media/webaudio/AudioProcessingEvent.h
+++ b/content/media/webaudio/AudioProcessingEvent.h
@@ -25,7 +25,7 @@ public:
   NS_FORWARD_TO_EVENT
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(AudioProcessingEvent, Event)
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE;
 
   void InitEvent(AudioBuffer* aInputBuffer,
                  uint32_t aNumberOfInputChannels,
diff --git a/content/media/webaudio/OfflineAudioCompletionEvent.cpp b/content/media/webaudio/OfflineAudioCompletionEvent.cpp
index 15a094d7d240..3671899cc2dd 100644
--- a/content/media/webaudio/OfflineAudioCompletionEvent.cpp
+++ b/content/media/webaudio/OfflineAudioCompletionEvent.cpp
@@ -32,7 +32,7 @@ OfflineAudioCompletionEvent::~OfflineAudioCompletionEvent()
 }
 
 JSObject*
-OfflineAudioCompletionEvent::WrapObject(JSContext* aCx)
+OfflineAudioCompletionEvent::WrapObjectInternal(JSContext* aCx)
 {
   return OfflineAudioCompletionEventBinding::Wrap(aCx, this);
 }
diff --git a/content/media/webaudio/OfflineAudioCompletionEvent.h b/content/media/webaudio/OfflineAudioCompletionEvent.h
index 6dea3af651d5..69f74e96f5cc 100644
--- a/content/media/webaudio/OfflineAudioCompletionEvent.h
+++ b/content/media/webaudio/OfflineAudioCompletionEvent.h
@@ -26,7 +26,7 @@ public:
   NS_FORWARD_TO_EVENT
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(OfflineAudioCompletionEvent, Event)
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE;
 
   void InitEvent(AudioBuffer* aRenderedBuffer)
   {
diff --git a/content/svg/content/src/SVGZoomEvent.h b/content/svg/content/src/SVGZoomEvent.h
index 98cb8bfb863b..a71a02b1d7a8 100644
--- a/content/svg/content/src/SVGZoomEvent.h
+++ b/content/svg/content/src/SVGZoomEvent.h
@@ -33,7 +33,7 @@ public:
   // Forward to base class
   NS_FORWARD_TO_UIEVENT
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return SVGZoomEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py
index 1aa5ffa9e541..780d290663f0 100644
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -12865,7 +12865,7 @@ class CGBindingImplClass(CGClass):
     """
     Common codegen for generating a C++ implementation of a WebIDL interface
     """
-    def __init__(self, descriptor, cgMethod, cgGetter, cgSetter, wantGetParent=True):
+    def __init__(self, descriptor, cgMethod, cgGetter, cgSetter, wantGetParent=True, wrapMethodName="WrapObject"):
         """
         cgMethod, cgGetter and cgSetter are classes used to codegen methods,
         getters and setters.
@@ -12988,7 +12988,7 @@ class CGBindingImplClass(CGClass):
 
         wrapArgs = [Argument('JSContext*', 'aCx')]
         self.methodDecls.insert(0,
-                                ClassMethod("WrapObject", "JSObject*",
+                                ClassMethod(wrapMethodName, "JSObject*",
                                             wrapArgs, virtual=descriptor.wrapperCache,
                                             breakAfterReturnDecl=" ",
                                             override=descriptor.wrapperCache,
@@ -14835,7 +14835,7 @@ class CGEventClass(CGBindingImplClass):
     Codegen for the actual Event class implementation for this descriptor
     """
     def __init__(self, descriptor):
-        CGBindingImplClass.__init__(self, descriptor, CGEventMethod, CGEventGetter, CGEventSetter, False)
+        CGBindingImplClass.__init__(self, descriptor, CGEventMethod, CGEventGetter, CGEventSetter, False, "WrapObjectInternal")
         members = []
         for m in descriptor.interface.members:
             if m.isAttr():
diff --git a/dom/events/AnimationEvent.h b/dom/events/AnimationEvent.h
index 02640758c34e..513671d1adc5 100644
--- a/dom/events/AnimationEvent.h
+++ b/dom/events/AnimationEvent.h
@@ -33,7 +33,7 @@ public:
               const AnimationEventInit& aParam,
               ErrorResult& aRv);
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return AnimationEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/BeforeUnloadEvent.h b/dom/events/BeforeUnloadEvent.h
index e90a656e597a..73fe85caee31 100644
--- a/dom/events/BeforeUnloadEvent.h
+++ b/dom/events/BeforeUnloadEvent.h
@@ -24,7 +24,7 @@ public:
   {
   }
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return BeforeUnloadEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/ClipboardEvent.h b/dom/events/ClipboardEvent.h
index d3c14dbebf33..85735812a738 100644
--- a/dom/events/ClipboardEvent.h
+++ b/dom/events/ClipboardEvent.h
@@ -30,7 +30,7 @@ public:
   // Forward to base class
   NS_FORWARD_TO_EVENT
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return ClipboardEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/CommandEvent.h b/dom/events/CommandEvent.h
index ca01171a7927..675ae5a6fe81 100644
--- a/dom/events/CommandEvent.h
+++ b/dom/events/CommandEvent.h
@@ -29,7 +29,7 @@ public:
   // Forward to base class
   NS_FORWARD_TO_EVENT
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return CommandEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/CompositionEvent.h b/dom/events/CompositionEvent.h
index e9d788be558a..0277e7617ada 100644
--- a/dom/events/CompositionEvent.h
+++ b/dom/events/CompositionEvent.h
@@ -27,7 +27,7 @@ public:
   NS_FORWARD_TO_UIEVENT
   NS_DECL_NSIDOMCOMPOSITIONEVENT
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return CompositionEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/CustomEvent.cpp b/dom/events/CustomEvent.cpp
index 2ea96803b1a9..6cce6f01c535 100644
--- a/dom/events/CustomEvent.cpp
+++ b/dom/events/CustomEvent.cpp
@@ -53,7 +53,7 @@ CustomEvent::Constructor(const GlobalObject& aGlobal,
 }
 
 JSObject*
-CustomEvent::WrapObject(JSContext* aCx)
+CustomEvent::WrapObjectInternal(JSContext* aCx)
 {
   return mozilla::dom::CustomEventBinding::Wrap(aCx, this);
 }
diff --git a/dom/events/CustomEvent.h b/dom/events/CustomEvent.h
index 35717a808de0..6971d49d7e0c 100644
--- a/dom/events/CustomEvent.h
+++ b/dom/events/CustomEvent.h
@@ -38,7 +38,7 @@ public:
               ErrorResult& aRv);
 
   virtual JSObject*
-  WrapObject(JSContext* aCx) MOZ_OVERRIDE;
+  WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE;
 
   void
   GetDetail(JSContext* aCx,
diff --git a/dom/events/DataContainerEvent.h b/dom/events/DataContainerEvent.h
index 430ebf87aa59..078ab5cb5b7a 100644
--- a/dom/events/DataContainerEvent.h
+++ b/dom/events/DataContainerEvent.h
@@ -31,7 +31,7 @@ public:
   NS_DECL_NSIDOMDATACONTAINEREVENT
 
   virtual JSObject*
-  WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return DataContainerEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/DeviceMotionEvent.h b/dom/events/DeviceMotionEvent.h
index cfa65532c6ad..d34d8354ffb1 100644
--- a/dom/events/DeviceMotionEvent.h
+++ b/dom/events/DeviceMotionEvent.h
@@ -94,7 +94,7 @@ public:
 
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(DeviceMotionEvent, Event)
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return DeviceMotionEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/DragEvent.h b/dom/events/DragEvent.h
index d31837ce7039..77aad6f653c5 100644
--- a/dom/events/DragEvent.h
+++ b/dom/events/DragEvent.h
@@ -30,7 +30,7 @@ public:
 
   NS_FORWARD_TO_MOUSEEVENT
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return DragEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/Event.cpp b/dom/events/Event.cpp
index d2be9cf83985..cc4b59d4c315 100644
--- a/dom/events/Event.cpp
+++ b/dom/events/Event.cpp
@@ -64,9 +64,6 @@ Event::ConstructorInit(EventTarget* aOwner,
 {
   SetOwner(aOwner);
   mIsMainThreadEvent = mOwner || NS_IsMainThread();
-  if (mIsMainThreadEvent) {
-    nsJSContext::LikelyShortLivingObjectCreated();
-  }
 
   if (mIsMainThreadEvent && !sReturnHighResTimeStampIsSet) {
     Preferences::AddBoolVarCache(&sReturnHighResTimeStamp,
@@ -235,6 +232,22 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Event)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
+
+JSObject*
+Event::WrapObject(JSContext* aCx)
+{
+  if (mIsMainThreadEvent && !GetWrapperPreserveColor()) {
+    nsJSContext::LikelyShortLivingObjectCreated();
+  }
+  return WrapObjectInternal(aCx);
+}
+
+JSObject*
+Event::WrapObjectInternal(JSContext* aCx)
+{
+  return EventBinding::Wrap(aCx, this);
+}
+
 bool
 Event::IsChrome(JSContext* aCx) const
 {
diff --git a/dom/events/Event.h b/dom/events/Event.h
index 1ffd085fe84c..47bf6fcb5b02 100644
--- a/dom/events/Event.h
+++ b/dom/events/Event.h
@@ -91,10 +91,9 @@ public:
     return mOwner;
   }
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
-  {
-    return EventBinding::Wrap(aCx, this);
-  }
+  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE MOZ_FINAL;
+
+  virtual JSObject* WrapObjectInternal(JSContext* aCx);
 
   virtual ErrorEvent* AsErrorEvent()
   {
diff --git a/dom/events/FocusEvent.h b/dom/events/FocusEvent.h
index e9dc910d3b2e..ffadf77b6cbc 100644
--- a/dom/events/FocusEvent.h
+++ b/dom/events/FocusEvent.h
@@ -23,7 +23,7 @@ public:
   // Forward to base class
   NS_FORWARD_TO_UIEVENT
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return FocusEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/InputEvent.h b/dom/events/InputEvent.h
index e9dad114ba93..208d9dd789c9 100644
--- a/dom/events/InputEvent.h
+++ b/dom/events/InputEvent.h
@@ -31,7 +31,7 @@ public:
                                                   const InputEventInit& aParam,
                                                   ErrorResult& aRv);
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return InputEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/KeyboardEvent.h b/dom/events/KeyboardEvent.h
index a5af2d499d5e..75029e120ae4 100644
--- a/dom/events/KeyboardEvent.h
+++ b/dom/events/KeyboardEvent.h
@@ -36,7 +36,7 @@ public:
                                            const KeyboardEventInit& aParam,
                                            ErrorResult& aRv);
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return KeyboardEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/MessageEvent.cpp b/dom/events/MessageEvent.cpp
index 2d06aefb7a24..c72f44d4a46c 100644
--- a/dom/events/MessageEvent.cpp
+++ b/dom/events/MessageEvent.cpp
@@ -57,7 +57,7 @@ MessageEvent::~MessageEvent()
 }
 
 JSObject*
-MessageEvent::WrapObject(JSContext* aCx)
+MessageEvent::WrapObjectInternal(JSContext* aCx)
 {
   return mozilla::dom::MessageEventBinding::Wrap(aCx, this);
 }
diff --git a/dom/events/MessageEvent.h b/dom/events/MessageEvent.h
index 56c145919fbc..c509ba986014 100644
--- a/dom/events/MessageEvent.h
+++ b/dom/events/MessageEvent.h
@@ -43,7 +43,7 @@ public:
   // Forward to base class
   NS_FORWARD_TO_EVENT
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE;
 
   void GetData(JSContext* aCx, JS::MutableHandle<JS::Value> aData,
                ErrorResult& aRv);
diff --git a/dom/events/MouseEvent.h b/dom/events/MouseEvent.h
index 55ebd6feb31d..18e432230534 100644
--- a/dom/events/MouseEvent.h
+++ b/dom/events/MouseEvent.h
@@ -30,7 +30,7 @@ public:
   // Forward to base class
   NS_FORWARD_TO_UIEVENT
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return MouseEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/MouseScrollEvent.h b/dom/events/MouseScrollEvent.h
index 4bebd571e018..c896430f1a1b 100644
--- a/dom/events/MouseScrollEvent.h
+++ b/dom/events/MouseScrollEvent.h
@@ -29,7 +29,7 @@ public:
   // Forward to base class
   NS_FORWARD_TO_MOUSEEVENT
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return MouseScrollEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/MutationEvent.h b/dom/events/MutationEvent.h
index f5fd8d5b2907..bf586a341799 100644
--- a/dom/events/MutationEvent.h
+++ b/dom/events/MutationEvent.h
@@ -30,7 +30,7 @@ public:
   // Forward to base class
   NS_FORWARD_TO_EVENT
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return MutationEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/NotifyPaintEvent.h b/dom/events/NotifyPaintEvent.h
index 51288813506f..0d4b76ea2133 100644
--- a/dom/events/NotifyPaintEvent.h
+++ b/dom/events/NotifyPaintEvent.h
@@ -43,7 +43,7 @@ public:
   NS_IMETHOD_(void) Serialize(IPC::Message* aMsg, bool aSerializeInterfaceType) MOZ_OVERRIDE;
   NS_IMETHOD_(bool) Deserialize(const IPC::Message* aMsg, void** aIter) MOZ_OVERRIDE;
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return NotifyPaintEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/PointerEvent.h b/dom/events/PointerEvent.h
index b13743a44930..41d80a89483f 100644
--- a/dom/events/PointerEvent.h
+++ b/dom/events/PointerEvent.h
@@ -22,7 +22,7 @@ public:
                nsPresContext* aPresContext,
                WidgetPointerEvent* aEvent);
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return PointerEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/ScrollAreaEvent.h b/dom/events/ScrollAreaEvent.h
index 4ecc6c035f2f..75c67ba26e6d 100644
--- a/dom/events/ScrollAreaEvent.h
+++ b/dom/events/ScrollAreaEvent.h
@@ -38,7 +38,7 @@ public:
   NS_IMETHOD_(void) Serialize(IPC::Message* aMsg, bool aSerializeInterfaceType) MOZ_OVERRIDE;
   NS_IMETHOD_(bool) Deserialize(const IPC::Message* aMsg, void** aIter) MOZ_OVERRIDE;
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return ScrollAreaEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/SimpleGestureEvent.h b/dom/events/SimpleGestureEvent.h
index 99440ef44d91..2b3c79c04a7d 100644
--- a/dom/events/SimpleGestureEvent.h
+++ b/dom/events/SimpleGestureEvent.h
@@ -30,7 +30,7 @@ public:
   // Forward to base class
   NS_FORWARD_TO_MOUSEEVENT
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return SimpleGestureEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/SpeechRecognitionError.h b/dom/events/SpeechRecognitionError.h
index 30dab40395b9..b1046f3903f8 100644
--- a/dom/events/SpeechRecognitionError.h
+++ b/dom/events/SpeechRecognitionError.h
@@ -26,7 +26,7 @@ public:
               const SpeechRecognitionErrorInit& aParam,
               ErrorResult& aRv);
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return mozilla::dom::SpeechRecognitionErrorBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/StorageEvent.cpp b/dom/events/StorageEvent.cpp
index c0a53fb7191d..fa6cd2e166aa 100644
--- a/dom/events/StorageEvent.cpp
+++ b/dom/events/StorageEvent.cpp
@@ -45,7 +45,7 @@ StorageEvent::AsStorageEvent()
 }
 
 JSObject*
-StorageEvent::WrapObject(JSContext* aCx)
+StorageEvent::WrapObjectInternal(JSContext* aCx)
 {
   return StorageEventBinding::Wrap(aCx, this);
 }
diff --git a/dom/events/StorageEvent.h b/dom/events/StorageEvent.h
index 447c3c245069..9158b54fe2c9 100644
--- a/dom/events/StorageEvent.h
+++ b/dom/events/StorageEvent.h
@@ -42,7 +42,7 @@ protected:
 public:
   virtual StorageEvent* AsStorageEvent();
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE;
 
   static already_AddRefed<StorageEvent>
   Constructor(EventTarget* aOwner, const nsAString& aType,
diff --git a/dom/events/TouchEvent.h b/dom/events/TouchEvent.h
index 030da9ba418c..0a44ab03ba3d 100644
--- a/dom/events/TouchEvent.h
+++ b/dom/events/TouchEvent.h
@@ -89,7 +89,7 @@ public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(TouchEvent, UIEvent)
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return TouchEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/TransitionEvent.h b/dom/events/TransitionEvent.h
index 80aab0ecd88f..e5d995419533 100644
--- a/dom/events/TransitionEvent.h
+++ b/dom/events/TransitionEvent.h
@@ -33,7 +33,7 @@ public:
               const TransitionEventInit& aParam,
               ErrorResult& aRv);
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return TransitionEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/UIEvent.h b/dom/events/UIEvent.h
index 876d9baecd0d..3a8e5ee4b635 100644
--- a/dom/events/UIEvent.h
+++ b/dom/events/UIEvent.h
@@ -102,7 +102,7 @@ public:
                                                const UIEventInit& aParam,
                                                ErrorResult& aRv);
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return UIEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/WheelEvent.h b/dom/events/WheelEvent.h
index 41f8424aa5ac..96f3c50baeb7 100644
--- a/dom/events/WheelEvent.h
+++ b/dom/events/WheelEvent.h
@@ -37,7 +37,7 @@ public:
                                            const WheelEventInit& aParam,
                                            ErrorResult& aRv);
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return WheelEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/events/XULCommandEvent.h b/dom/events/XULCommandEvent.h
index 2df8559cfce7..d9f746fb665c 100644
--- a/dom/events/XULCommandEvent.h
+++ b/dom/events/XULCommandEvent.h
@@ -31,7 +31,7 @@ public:
   // Forward our inherited virtual methods to the base class
   NS_FORWARD_TO_UIEVENT
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return XULCommandEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/indexedDB/IDBEvents.cpp b/dom/indexedDB/IDBEvents.cpp
index cd9ce79cf1d5..a76fd5f5689b 100644
--- a/dom/indexedDB/IDBEvents.cpp
+++ b/dom/indexedDB/IDBEvents.cpp
@@ -96,7 +96,7 @@ NS_INTERFACE_MAP_BEGIN(IDBVersionChangeEvent)
 NS_INTERFACE_MAP_END_INHERITING(Event)
 
 JSObject*
-IDBVersionChangeEvent::WrapObject(JSContext* aCx)
+IDBVersionChangeEvent::WrapObjectInternal(JSContext* aCx)
 {
   return IDBVersionChangeEventBinding::Wrap(aCx, this);
 }
diff --git a/dom/indexedDB/IDBEvents.h b/dom/indexedDB/IDBEvents.h
index d5fa469605c2..d86dcdf69cbe 100644
--- a/dom/indexedDB/IDBEvents.h
+++ b/dom/indexedDB/IDBEvents.h
@@ -104,7 +104,7 @@ public:
   NS_FORWARD_TO_EVENT
 
   virtual JSObject*
-  WrapObject(JSContext* aCx) MOZ_OVERRIDE;
+  WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE;
 
 private:
   IDBVersionChangeEvent(EventTarget* aOwner, uint64_t aOldVersion)
diff --git a/dom/smil/TimeEvent.h b/dom/smil/TimeEvent.h
index a80102ee3951..81f921670cda 100644
--- a/dom/smil/TimeEvent.h
+++ b/dom/smil/TimeEvent.h
@@ -31,7 +31,7 @@ public:
   // Forward to base class
   NS_FORWARD_TO_EVENT
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return TimeEventBinding::Wrap(aCx, this);
   }
diff --git a/dom/workers/ServiceWorkerEvents.h b/dom/workers/ServiceWorkerEvents.h
index ff366a33e5e0..c22edc4d7990 100644
--- a/dom/workers/ServiceWorkerEvents.h
+++ b/dom/workers/ServiceWorkerEvents.h
@@ -36,7 +36,7 @@ public:
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(InstallPhaseEvent, Event)
   NS_FORWARD_TO_EVENT
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return mozilla::dom::InstallPhaseEventBinding_workers::Wrap(aCx, this);
   }
@@ -88,7 +88,7 @@ public:
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(InstallEvent, InstallPhaseEvent)
   NS_FORWARD_TO_EVENT
 
-  virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE
+  virtual JSObject* WrapObjectInternal(JSContext* aCx) MOZ_OVERRIDE
   {
     return mozilla::dom::InstallEventBinding_workers::Wrap(aCx, this);
   }