Try to fix bustage by backing out.

git-svn-id: svn://10.0.0.236/trunk@156087 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterv%propagandism.org
2004-05-07 13:22:39 +00:00
parent bb9cb83145
commit 39dbe2d452
2 changed files with 424 additions and 444 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -39,7 +39,6 @@
#define NS_EXPAT_DRIVER__
#include "xmlparse.h"
#include "nsCOMPtr.h"
#include "nsString.h"
#include "nsIDTD.h"
#include "nsITokenizer.h"
@@ -59,16 +58,15 @@ public:
nsExpatDriver();
virtual ~nsExpatDriver();
int HandleExternalEntityRef(const PRUnichar *aOpenEntityNames,
const PRUnichar *aBase,
const PRUnichar *aSystemId,
const PRUnichar *aPublicId);
int HandleExternalEntityRef(const PRUnichar *openEntityNames,
const PRUnichar *base,
const PRUnichar *systemId,
const PRUnichar *publicId);
nsresult HandleStartElement(const PRUnichar *aName, const PRUnichar **aAtts);
nsresult HandleEndElement(const PRUnichar *aName);
nsresult HandleCharacterData(const PRUnichar *aCData, const PRUint32 aLength);
nsresult HandleComment(const PRUnichar *aName);
nsresult HandleProcessingInstruction(const PRUnichar *aTarget,
const PRUnichar *aData);
nsresult HandleProcessingInstruction(const PRUnichar *aTarget, const PRUnichar *aData);
nsresult HandleXMLDeclaration(const PRUnichar *aData, const PRUint32 aLength);
nsresult HandleDefault(const PRUnichar *aData, const PRUint32 aLength);
nsresult HandleStartCdataSection();
@@ -76,20 +74,20 @@ public:
nsresult HandleStartDoctypeDecl();
nsresult HandleEndDoctypeDecl();
private:
protected:
// Load up an external stream to get external entity information
nsresult OpenInputStreamFromExternalDTD(const PRUnichar* aFPIStr,
const PRUnichar* aURLStr,
const PRUnichar* aURLStr,
const PRUnichar* aBaseURL,
nsIInputStream** aStream,
nsIInputStream** in,
nsAString& aAbsURL);
nsresult ParseBuffer(const char* aBuffer, PRUint32 aLength, PRBool aIsFinal);
nsresult HandleError(const char *aBuffer, PRUint32 aLength, PRBool aIsFinal);
void GetLine(const char* aSourceBuffer, PRUint32 aLength, PRUint32 aOffset,
nsString& aLine);
void GetLine(const char* aSourceBuffer, PRUint32 aLength, PRUint32 aOffset, nsString& aLine);
XML_Parser mExpatParser;
XML_Parser mExpatParser;
nsString mLastLine;
nsString mCDataText;
nsString mDoctypeText;
@@ -100,10 +98,10 @@ private:
PRInt32 mBytePosition;
nsresult mInternalState;
PRUint32 mBytesParsed;
nsCOMPtr<nsIExpatSink> mSink;
nsIExpatSink* mSink;
const nsCatalogData* mCatalogData; // weak
};
};
nsresult NS_NewExpatDriver(nsIDTD** aDriver);
#endif