Bug 977260, part 1 - Don't implement wrappercache CC stuff for nsDOMCameraControl. r=smaug
authorAndrew McCreight <continuation@gmail.com>
Fri, 28 Feb 2014 09:56:23 -0800
changeset 171591 c9bb7edc607db8e21b304645890521bde45e24f6
parent 171590 39101e03fc13a8b7447b1555881cce5d439ba255
child 171592 e637f7b15f5c8c8c3cbc3edc70a89980383e917c
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewerssmaug
bugs977260
milestone30.0a1
Bug 977260, part 1 - Don't implement wrappercache CC stuff for nsDOMCameraControl. r=smaug
dom/camera/DOMCameraControl.cpp
dom/camera/DOMCameraControl.h
--- a/dom/camera/DOMCameraControl.cpp
+++ b/dom/camera/DOMCameraControl.cpp
@@ -31,17 +31,16 @@
 #include "mozilla/dom/CameraCapabilitiesBinding.h"
 #include "mozilla/dom/BindingUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::idl;
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMCameraControl)
-  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
   NS_INTERFACE_MAP_ENTRY(nsISupports)
   NS_INTERFACE_MAP_ENTRY(nsIDOMMediaStream)
 NS_INTERFACE_MAP_END_INHERITING(DOMMediaStream)
 
 NS_IMPL_ADDREF_INHERITED(nsDOMCameraControl, DOMMediaStream)
 NS_IMPL_RELEASE_INHERITED(nsDOMCameraControl, DOMMediaStream)
 
 NS_IMPL_CYCLE_COLLECTION_CLASS(nsDOMCameraControl)
@@ -60,17 +59,16 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_IN
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mReleaseOnSuccessCb)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mReleaseOnErrorCb)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mSetConfigurationOnSuccessCb)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mSetConfigurationOnErrorCb)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mOnShutterCb)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mOnClosedCb)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mOnRecorderStateChangeCb)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mOnPreviewStateChangeCb)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsDOMCameraControl, DOMMediaStream)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mCapabilities)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mWindow)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mGetCameraOnSuccessCb)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mGetCameraOnErrorCb)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAutoFocusOnSuccessCb)
@@ -82,21 +80,18 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mReleaseOnSuccessCb)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mReleaseOnErrorCb)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mSetConfigurationOnSuccessCb)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mSetConfigurationOnErrorCb)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mOnShutterCb)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mOnClosedCb)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mOnRecorderStateChangeCb)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mOnPreviewStateChangeCb)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
-NS_IMPL_CYCLE_COLLECTION_TRACE_WRAPPERCACHE(nsDOMCameraControl)
-
 class mozilla::StartRecordingHelper : public nsIDOMEventListener
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDOMEVENTLISTENER
 
   StartRecordingHelper(nsDOMCameraControl* aDOMCameraControl)
     : mDOMCameraControl(aDOMCameraControl)
--- a/dom/camera/DOMCameraControl.h
+++ b/dom/camera/DOMCameraControl.h
@@ -32,17 +32,17 @@ namespace dom {
 }
 class ErrorResult;
 class StartRecordingHelper;
 
 // Main camera control.
 class nsDOMCameraControl MOZ_FINAL : public DOMMediaStream
 {
 public:
-  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(nsDOMCameraControl, DOMMediaStream)
+  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsDOMCameraControl, DOMMediaStream)
   NS_DECL_ISUPPORTS_INHERITED
 
   nsDOMCameraControl(uint32_t aCameraId,
                      const dom::CameraConfiguration& aInitialConfig,
                      dom::GetCameraCallback* aOnSuccess,
                      dom::CameraErrorCallback* aOnError,
                      nsPIDOMWindow* aWindow);