Bug 315562 - non-MOZILLA_INTERNAL_API usage of dom/content headers, r=just

git-svn-id: svn://10.0.0.236/trunk@184778 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bsmedberg%covad.net 2005-11-16 20:29:29 +00:00
parent f3121cae0b
commit 8be3b17c8f
4 changed files with 18 additions and 11 deletions

View File

@ -41,13 +41,16 @@
#include "nsCOMPtr.h"
#include "nsISupports.h"
#include "nsEvent.h"
#include "nsAString.h"
#include "nsStringGlue.h"
#include "nsContentErrors.h"
#include "nsPropertyTable.h"
#include "nsCaseTreatment.h"
#include "nsINodeInfo.h"
#include "nsChangeHint.h"
#ifdef MOZILLA_INTERNAL_API
#include "nsINodeInfo.h"
#endif
// Forward declarations
class nsIAtom;
class nsIDocument;
@ -76,6 +79,10 @@ class nsIContent : public nsISupports {
public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_ICONTENT_IID)
#ifdef MOZILLA_INTERNAL_API
// If you're using the external API, the only thing you can know about
// nsIContent is that it exists with an IID
nsIContent(nsINodeInfo *aNodeInfo)
: mParentPtrBits(0),
mNodeInfo(aNodeInfo)
@ -897,6 +904,8 @@ protected:
PtrBits mParentPtrBits;
nsCOMPtr<nsINodeInfo> mNodeInfo;
#endif // MOZILLA_INTERNAL_API
};
NS_DEFINE_STATIC_IID_ACCESSOR(nsIContent, NS_ICONTENT_IID)

View File

@ -39,7 +39,7 @@
#include "nsISupports.h"
#include "nsEvent.h"
#include "nsString.h"
#include "nsStringGlue.h"
#include "nsCOMArray.h"
#include "nsIDocumentObserver.h"
#include "nsCOMPtr.h"
@ -48,11 +48,9 @@
#include "nsWeakPtr.h"
#include "nsIWeakReferenceUtils.h"
#include "nsILoadGroup.h"
#include "nsReadableUtils.h"
#include "nsCRT.h"
#include "mozFlushType.h"
#include "nsPropertyTable.h"
#include "nsHashSets.h"
#include "nsAutoPtr.h"
#include "nsIAtom.h"
@ -138,7 +136,7 @@ public:
/**
* Return the title of the document. May return null.
*/
const nsAFlatString& GetDocumentTitle() const
const nsString& GetDocumentTitle() const
{
return mDocumentTitle;
}
@ -199,7 +197,7 @@ public:
* will trigger a startDocumentLoad if necessary to answer the
* question.
*/
const nsAFlatCString& GetDocumentCharacterSet() const
const nsCString& GetDocumentCharacterSet() const
{
return mCharacterSet;
}
@ -247,7 +245,7 @@ public:
*/
void GetContentLanguage(nsAString& aContentLanguage) const
{
CopyASCIItoUCS2(mContentLanguage, aContentLanguage);
CopyASCIItoUTF16(mContentLanguage, aContentLanguage);
}
// The state BidiEnabled should persist across multiple views
@ -957,7 +955,7 @@ protected:
// defined in nsBidiUtils.h
PRUint32 mBidiOptions;
nsXPIDLCString mContentLanguage;
nsCString mContentLanguage;
nsCString mContentType;
// The document's security info

View File

@ -39,7 +39,7 @@
#define nsIDocumentEncoder_h__
#include "nsISupports.h"
#include "nsString.h"
#include "nsStringGlue.h"
class nsIDocumentEncoder;
class nsIDocument;

View File

@ -39,7 +39,7 @@
#define nsIScriptContext_h__
#include "nscore.h"
#include "nsString.h"
#include "nsStringGlue.h"
#include "nsISupports.h"
#include "nsCOMPtr.h"
#include "jsapi.h"