Bug 912747 - Change nsCycleCollectionHoldDrop.h to mozilla/HoldDropJSObjects.h. r=khuey

--HG--
rename : xpcom/glue/nsCycleCollectionHoldDrop.h => xpcom/glue/HoldDropJSObjects.h

content/canvas/src/ImageData.cpp

@@ -6,8 +6,8 @@
 
 #include "mozilla/dom/ImageData.h"
 
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/dom/ImageDataBinding.h"
-#include "nsCycleCollectionHoldDrop.h"
 
 #include "jsapi.h"
 

content/events/src/nsDOMMessageEvent.cpp

@@ -5,7 +5,7 @@
 
 #include "nsDOMMessageEvent.h"
 
-#include "nsCycleCollectionHoldDrop.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "jsapi.h"
 
 using namespace mozilla;

content/events/src/nsDOMNotifyAudioAvailableEvent.cpp

@@ -4,9 +4,10 @@
  * 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 "nsError.h"
 #include "nsDOMNotifyAudioAvailableEvent.h"
-#include "nsCycleCollectionHoldDrop.h"
+
+#include "nsError.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "jsfriendapi.h"
 
 using namespace mozilla;

content/html/document/src/HTMLAllCollection.cpp

@@ -6,7 +6,7 @@
 
 #include "mozilla/dom/HTMLAllCollection.h"
 
-#include "nsCycleCollectionHoldDrop.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "nsDOMClassInfo.h"
 #include "nsHTMLDocument.h"
 

dom/base/DOMException.cpp

@@ -8,11 +8,11 @@
 #include "jsapi.h"
 #include "jsprf.h"
 #include "js/OldDebugAPI.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/Util.h"
 #include "mozilla/dom/Exceptions.h"
 #include "nsContentUtils.h"
 #include "nsCOMPtr.h"
-#include "nsCycleCollectionHoldDrop.h"
 #include "nsIClassInfoImpl.h"
 #include "nsIDocument.h"
 #include "nsIDOMDOMException.h"

dom/base/nsWrapperCache.cpp

@@ -8,7 +8,7 @@
 
 #include "jsproxy.h"
 #include "mozilla/dom/DOMJSProxyHandler.h"
-#include "nsCycleCollectionHoldDrop.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "nsCycleCollectionTraversalCallback.h"
 #include "nsCycleCollector.h"
 

dom/bindings/CallbackObject.h

@@ -19,11 +19,11 @@
 
 #include "nsISupports.h"
 #include "nsISupportsImpl.h"
-#include "nsCycleCollectionHoldDrop.h"
 #include "nsCycleCollectionParticipant.h"
 #include "jswrapper.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/ErrorResult.h"
+#include "mozilla/HoldDropJSObjects.h"
 #include "mozilla/Util.h"
 #include "nsContentUtils.h"
 #include "nsCxPusher.h"

xpcom/glue/HoldDropJSObjects.h

@@ -4,8 +4,8 @@
  * 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 nsCycleCollectionHoldDrop_h_
-#define nsCycleCollectionHoldDrop_h_
+#ifndef mozilla_HoldDropJSObjects_h
+#define mozilla_HoldDropJSObjects_h
 
 #include "mozilla/TypeTraits.h"
 #include "nsCycleCollectionParticipant.h"
@@ -68,4 +68,4 @@ void DropJSObjects(T* aHolder)
 
 } // namespace mozilla
 
-#endif // nsCycleCollectionHoldDrop_h_
+#endif // mozilla_HoldDropJSObjects_h

xpcom/glue/moz.build

@@ -23,7 +23,6 @@ EXPORTS += [
     'nsCategoryCache.h',
     'nsClassHashtable.h',
     'nsComponentManagerUtils.h',
-    'nsCycleCollectionHoldDrop.h',
     'nsCycleCollectionNoteChild.h',
     'nsCycleCollectionNoteRootCallback.h',
     'nsCycleCollectionParticipant.h',
@@ -74,6 +73,7 @@ EXPORTS.mozilla += [
     'DeadlockDetector.h',
     'FileUtils.h',
     'GenericFactory.h',
+    'HoldDropJSObjects.h',
     'IntentionalCrash.h',
     'Monitor.h',
     'Mutex.h',