From dbad6e68d0ae8e7a7fff61fa0a02acc718730165 Mon Sep 17 00:00:00 2001 From: Andrew McCreight Date: Tue, 10 Sep 2013 08:29:43 -0700 Subject: [PATCH] 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 | 2 +- content/events/src/nsDOMMessageEvent.cpp | 2 +- content/events/src/nsDOMNotifyAudioAvailableEvent.cpp | 5 +++-- content/html/document/src/HTMLAllCollection.cpp | 2 +- dom/base/DOMException.cpp | 2 +- dom/base/nsWrapperCache.cpp | 2 +- dom/bindings/CallbackObject.h | 2 +- .../{nsCycleCollectionHoldDrop.h => HoldDropJSObjects.h} | 6 +++--- xpcom/glue/moz.build | 2 +- 9 files changed, 13 insertions(+), 12 deletions(-) rename xpcom/glue/{nsCycleCollectionHoldDrop.h => HoldDropJSObjects.h} (93%) diff --git a/content/canvas/src/ImageData.cpp b/content/canvas/src/ImageData.cpp index 58c0f0b734f..b211d416a4b 100644 --- a/content/canvas/src/ImageData.cpp +++ b/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" diff --git a/content/events/src/nsDOMMessageEvent.cpp b/content/events/src/nsDOMMessageEvent.cpp index ec4acd9dc11..2c2dc428547 100644 --- a/content/events/src/nsDOMMessageEvent.cpp +++ b/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; diff --git a/content/events/src/nsDOMNotifyAudioAvailableEvent.cpp b/content/events/src/nsDOMNotifyAudioAvailableEvent.cpp index 0c62d744b53..e3ab79a436c 100644 --- a/content/events/src/nsDOMNotifyAudioAvailableEvent.cpp +++ b/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; diff --git a/content/html/document/src/HTMLAllCollection.cpp b/content/html/document/src/HTMLAllCollection.cpp index 11dcfce4e95..12dac8d811e 100644 --- a/content/html/document/src/HTMLAllCollection.cpp +++ b/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" diff --git a/dom/base/DOMException.cpp b/dom/base/DOMException.cpp index 9ee89d852db..aa22ac0b278 100644 --- a/dom/base/DOMException.cpp +++ b/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" diff --git a/dom/base/nsWrapperCache.cpp b/dom/base/nsWrapperCache.cpp index ccdcd08a614..49efa8c54ca 100644 --- a/dom/base/nsWrapperCache.cpp +++ b/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" diff --git a/dom/bindings/CallbackObject.h b/dom/bindings/CallbackObject.h index ab82e5332b7..6447586fdab 100644 --- a/dom/bindings/CallbackObject.h +++ b/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" diff --git a/xpcom/glue/nsCycleCollectionHoldDrop.h b/xpcom/glue/HoldDropJSObjects.h similarity index 93% rename from xpcom/glue/nsCycleCollectionHoldDrop.h rename to xpcom/glue/HoldDropJSObjects.h index 1cc0f53fb0a..620b80a64c3 100644 --- a/xpcom/glue/nsCycleCollectionHoldDrop.h +++ b/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 diff --git a/xpcom/glue/moz.build b/xpcom/glue/moz.build index f651f67c90a..551c9dc3b1f 100644 --- a/xpcom/glue/moz.build +++ b/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',