Bug 833009 - Remove "nsContentUtils.h" inclusions from headers in content/xbl/. r=Ms2ger

This commit is contained in:
Mounir Lamouri 2013-02-01 10:56:02 +00:00
parent 9565607ae2
commit 3570a22696
3 changed files with 23 additions and 20 deletions

View File

@ -11,7 +11,7 @@
#include "jsapi.h"
#include "nsString.h"
#include "nsIServiceManager.h"
#include "nsContentUtils.h"
#include "nsContentUtils.h" // For NS_CONTENT_DELETE_LIST_MEMBER.
#include "nsCycleCollectionParticipant.h"
class nsIContent;

View File

@ -39,6 +39,27 @@ NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsXBLResourceLoader)
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsXBLResourceLoader)
struct nsXBLResource
{
nsXBLResource* mNext;
nsIAtom* mType;
nsString mSrc;
nsXBLResource(nsIAtom* aType, const nsAString& aSrc)
{
MOZ_COUNT_CTOR(nsXBLResource);
mNext = nullptr;
mType = aType;
mSrc = aSrc;
}
~nsXBLResource()
{
MOZ_COUNT_DTOR(nsXBLResource);
NS_CONTENT_DELETE_LIST_MEMBER(nsXBLResource, this, mNext);
}
};
nsXBLResourceLoader::nsXBLResourceLoader(nsXBLPrototypeBinding* aBinding,
nsXBLPrototypeResources* aResources)
:mBinding(aBinding),

View File

@ -6,7 +6,6 @@
#include "nsCOMPtr.h"
#include "nsICSSLoaderObserver.h"
#include "nsCOMArray.h"
#include "nsContentUtils.h"
#include "nsCycleCollectionParticipant.h"
class nsIContent;
@ -15,28 +14,11 @@ class nsIScriptContext;
class nsSupportsHashtable;
class nsXBLPrototypeResources;
class nsXBLPrototypeBinding;
struct nsXBLResource;
// *********************************************************************/
// The XBLResourceLoader class
struct nsXBLResource {
nsXBLResource* mNext;
nsIAtom* mType;
nsString mSrc;
nsXBLResource(nsIAtom* aType, const nsAString& aSrc) {
MOZ_COUNT_CTOR(nsXBLResource);
mNext = nullptr;
mType = aType;
mSrc = aSrc;
}
~nsXBLResource() {
MOZ_COUNT_DTOR(nsXBLResource);
NS_CONTENT_DELETE_LIST_MEMBER(nsXBLResource, this, mNext);
}
};
class nsXBLResourceLoader : public nsICSSLoaderObserver
{
public: