Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oops -- I didn't mean to update these -- backing out

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@33225 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rickg%netscape.com
1999-05-29 03:04:16 +00:00
parent 4cf139826e
commit bf2176589a
8 changed files with 198 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp
View File

@@ -445,7 +445,7 @@ nsHTMLContentSinkStream::nsHTMLContentSinkStream(nsIOutputStream* aOutStream,
nsString* aOutString,
const nsString* aCharsetOverride,
PRBool aDoFormat,
PRBool aDoHeader) : mBuffer("",eOneByte) {
PRBool aDoHeader) {
NS_INIT_REFCNT();
mLowerCaseTags = PR_TRUE;
memset(mHTMLTagStack,0,sizeof(mHTMLTagStack));
@@ -454,6 +454,8 @@ nsHTMLContentSinkStream::nsHTMLContentSinkStream(nsIOutputStream* aOutStream,
mIndent = 0;
mDoFormat = aDoFormat;
mDoHeader = aDoHeader;
mBuffer = nsnull;
mBufferSize = 0;
mUnicodeEncoder = nsnull;
mStream = aOutStream;
mString = aOutString;
@@ -503,8 +505,8 @@ nsHTMLContentSinkStream::EndContext(PRInt32 aPosition)
}
void nsHTMLContentSinkStream::EnsureBufferSize(PRInt32 aNewSize) {
/*
void nsHTMLContentSinkStream::EnsureBufferSize(PRInt32 aNewSize)
{
if (mBufferSize < aNewSize)
{
delete [] mBuffer;
@@ -514,7 +516,6 @@ void nsHTMLContentSinkStream::EnsureBufferSize(PRInt32 aNewSize) {
mBuffer[0] = 0;
}
}
*/
}
@@ -531,17 +532,24 @@ void nsHTMLContentSinkStream::EncodeToBuffer(const nsString& aSrc)
PRInt32 length = aSrc.Length();
nsresult result;
if (mUnicodeEncoder != nsnull && length > 0) {
//EnsureBufferSize(length);
if (mUnicodeEncoder != nsnull && length > 0)
{
EnsureBufferSize(length);
mBufferLength = mBufferSize;
mUnicodeEncoder->Reset();
mBuffer.SetCapacity(2*length); //cause that's what greg used to do, but may not be necessary.
PRInt32 theNewLength=mBuffer.mCapacity;
result = mUnicodeEncoder->Convert(aSrc.GetUnicode(), &length, (char*)mBuffer.GetBuffer(), &theNewLength);
mBuffer.Truncate(theNewLength);
result = mUnicodeEncoder->Convert(aSrc.GetUnicode(), &length, mBuffer, &mBufferLength);
mBuffer[mBufferLength] = 0;
PRInt32 temp = mBufferLength;
if (NS_SUCCEEDED(result))
result = mUnicodeEncoder->Finish((char*)mBuffer.GetBuffer(),&theNewLength);
result = mUnicodeEncoder->Finish(mBuffer,&temp);
mBuffer.ReplaceChar(CH_NBSP,' '); //switch all nbsp's to spaces
for (PRInt32 i = 0; i < mBufferLength; i++)
{
if (mBuffer[i] == char(CH_NBSP))
mBuffer[i] = ' ';
}
}
}
@@ -557,15 +565,16 @@ void nsHTMLContentSinkStream::Write(const nsString& aString)
if (mStream != nsnull)
{
nsOutputStream out(mStream);
out.write(mBuffer.GetBuffer(),mBuffer.Length());
out.write(mBuffer,mBufferLength);
}
if (0!=mString) {
if (mString != nsnull)
{
mString->Append(mBuffer);
}
}
else
{
if (0!=mStream)
if (mStream != nsnull)
{
nsOutputStream out(mStream);
const PRUnichar* unicode = aString.GetUnicode();
@@ -636,19 +645,24 @@ void nsHTMLContentSinkStream::WriteAttributes(const nsIParserNode& aNode) {
for(i=0;i<theCount;i++){
const nsString& temp=aNode.GetKeyAt(i);
if (!temp.Equals(nsString("Steve's unbelievable hack attribute"))) {
nsAutoString key(temp,eOneByte);
if (!temp.Equals(nsString("Steve's unbelievable hack attribute")))
{
nsString key = temp;
if (mLowerCaseTags == PR_TRUE)
key.ToLowerCase();
else
key.ToUpperCase();
EnsureBufferSize(key.Length());
key.ToCString(mBuffer,mBufferSize);
// send to ouput " [KEY]="
Write(' ');
Write(key.GetBuffer());
Write(mBuffer);
Write(char(kEqual));
mColPos += 1 + key.Length() + 1;
mColPos += 1 + strlen(mBuffer) + 1;
const nsString& value=aNode.GetValueAt(i);
@@ -657,7 +671,7 @@ void nsHTMLContentSinkStream::WriteAttributes(const nsIParserNode& aNode) {
Write(value);
Write('\"');
mColPos += 1 + key.Length() + 1;
mColPos += 1 + strlen(mBuffer) + 1;
}
}
}
@@ -920,18 +934,25 @@ void nsHTMLContentSinkStream::AddStartTag(const nsIParserNode& aNode)
if (PermitWSBeforeOpen(tag))
AddIndent();
nsAutoString theBuf(tagName,eOneByte);
EnsureBufferSize(tagName.Length());
tagName.ToCString(mBuffer,mBufferSize);
Write(kLessThan);
Write(theBuf.GetBuffer());
Write(mBuffer);
mColPos += 1 + tagName.Length();
if (tag == eHTMLTag_style) {
if (tag == eHTMLTag_style)
{
Write(">\n");
const nsString& data = aNode.GetSkippedContent();
nsAutoString theBuf(data,eOneByte);
Write(theBuf.GetBuffer());
PRInt32 size = data.Length();
char* buffer = new char[size+1];
if(buffer){
data.ToCString(buffer,size+1);
Write(buffer);
delete[] buffer;
}
}
else
{
@@ -986,16 +1007,18 @@ void nsHTMLContentSinkStream::AddEndTag(const nsIParserNode& aNode)
AddIndent();
}
nsAutoString theBuf(tagName,eOneByte);
EnsureBufferSize(tagName.Length());
tagName.ToCString(mBuffer,mBufferSize);
Write(kLessThan);
Write(kForwardSlash);
Write(theBuf.GetBuffer());
Write(mBuffer);
Write(kGreaterThan);
mColPos += 1 + 1 + theBuf.Length() + 1;
mColPos += 1 + 1 + strlen(mBuffer) + 1;
if (BreakAfterClose(tag)) {
if (BreakAfterClose(tag))
{
Write('\n');
mColPos = 0;
}

5
mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.h
View File

@@ -157,7 +157,10 @@ protected:
PRBool mDoFormat;
PRBool mDoHeader;
nsString mBuffer;
char* mBuffer;
PRInt32 mBufferLength; // The length of the data in the buffer
PRInt32 mBufferSize; // The actual size of the buffer, regardless of the data
nsIUnicodeEncoder* mUnicodeEncoder;
nsString mCharsetOverride;
};

51
mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp
View File

@@ -204,12 +204,15 @@ NS_New_HTMLToTXT_SinkStream(nsIHTMLContentSink** aInstancePtrResult,
* @param
* @return
*/
nsHTMLToTXTSinkStream::nsHTMLToTXTSinkStream(nsIOutputStream* aStream, nsString* aString) : mBuffer("",eOneByte) {
nsHTMLToTXTSinkStream::nsHTMLToTXTSinkStream(nsIOutputStream* aStream, nsString* aString) {
NS_INIT_REFCNT();
mStream = aStream;
mColPos = 0;
mIndent = 0;
mDoOutput = PR_FALSE;
mBufferSize = 0;
mBufferLength = 0;
mBuffer = nsnull;
mUnicodeEncoder = nsnull;
mStream = aStream;
mString = aString;
@@ -224,6 +227,7 @@ nsHTMLToTXTSinkStream::nsHTMLToTXTSinkStream(nsIOutputStream* aStream, nsString*
* @return
*/
nsHTMLToTXTSinkStream::~nsHTMLToTXTSinkStream() {
delete [] mBuffer;
NS_IF_RELEASE(mUnicodeEncoder);
}
@@ -451,8 +455,8 @@ nsHTMLToTXTSinkStream::EndContext(PRInt32 aPosition)
return NS_OK;
}
void nsHTMLToTXTSinkStream::EnsureBufferSize(PRInt32 aNewSize) {
/*
void nsHTMLToTXTSinkStream::EnsureBufferSize(PRInt32 aNewSize)
{
if (mBufferSize < aNewSize)
{
delete [] mBuffer;
@@ -463,16 +467,19 @@ void nsHTMLToTXTSinkStream::EnsureBufferSize(PRInt32 aNewSize) {
mBufferLength = 0;
}
}
*/
}
void nsHTMLToTXTSinkStream::EncodeToBuffer(const nsString& aSrc)
{
NS_ASSERTION(0!=mUnicodeEncoder,"The unicode encoder needs to be initialized");
if (0==mUnicodeEncoder) {
mBuffer.Assign(aSrc);
NS_ASSERTION(mUnicodeEncoder != nsnull,"The unicode encoder needs to be initialized");
if (mUnicodeEncoder == nsnull)
{
char* str = aSrc.ToNewCString();
EnsureBufferSize(aSrc.Length()+1);
strcpy(mBuffer, str);
delete[] str;
return;
}
@@ -483,16 +490,22 @@ void nsHTMLToTXTSinkStream::EncodeToBuffer(const nsString& aSrc)
if (mUnicodeEncoder != nsnull && length > 0)
{
EnsureBufferSize(length);
mBufferLength = mBufferSize;
mUnicodeEncoder->Reset();
mBuffer.SetCapacity(2*length); //cause that's what greg used to do, but may not be necessary.
PRInt32 theNewLength=mBuffer.mCapacity;
result = mUnicodeEncoder->Convert(aSrc.GetUnicode(), &length, (char*)mBuffer.GetBuffer(), &theNewLength);
mBuffer.Truncate(theNewLength);
result = mUnicodeEncoder->Convert(aSrc.GetUnicode(), &length, mBuffer, &mBufferLength);
mBuffer[mBufferLength] = 0;
PRInt32 temp = mBufferLength;
if (NS_SUCCEEDED(result))
result = mUnicodeEncoder->Finish((char*)mBuffer.GetBuffer(),&theNewLength);
result = mUnicodeEncoder->Finish(mBuffer,&temp);
mBuffer.ReplaceChar(CH_NBSP,' '); //switch all nbsp's to spaces
for (PRInt32 i = 0; i < mBufferLength; i++)
{
if (mBuffer[i] == char(CH_NBSP))
mBuffer[i] = ' ';
}
}
}
@@ -504,7 +517,7 @@ void nsHTMLToTXTSinkStream::EncodeToBuffer(const nsString& aSrc)
* or the output string.
* When going to the stream, all data is run through the encoder
*
* @updated gess 05/28/99
* @updated gpk02/03/99
* @param
* @return
*/
@@ -515,11 +528,13 @@ void nsHTMLToTXTSinkStream::Write(const nsString& aString)
if (mUnicodeEncoder != nsnull)
{
EncodeToBuffer(aString);
if (0!=mStream) {
if (mStream != nsnull)
{
nsOutputStream out(mStream);
out.write(mBuffer.GetBuffer(),mBuffer.Length());
out.write(mBuffer,mBufferLength);
}
if (0!=mString) {
if (mString != nsnull)
{
mString->Append(mBuffer);
}
}
@@ -659,7 +674,7 @@ nsHTMLToTXTSinkStream::AddLeaf(const nsIParserNode& aNode){
{
text = aNode.GetText();
EncodeToBuffer(text);
PRUnichar entity = NS_EntityToUnicode(mBuffer.GetBuffer());
PRUnichar entity = NS_EntityToUnicode(mBuffer);
nsString temp;
temp.Append(entity);

16
mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.h
View File

@@ -125,12 +125,16 @@ protected:
protected:
nsIOutputStream* mStream;
nsString* mString;
nsString mBuffer;
PRInt32 mIndent;
PRInt32 mColPos;
PRBool mDoOutput;
nsIOutputStream* mStream;
nsString* mString;
PRInt32 mIndent;
PRInt32 mColPos;
PRBool mDoOutput;
char* mBuffer;
PRInt32 mBufferLength; // The length of the data in the buffer
PRInt32 mBufferSize; // The actual size of the buffer, regardless of the data
nsIUnicodeEncoder* mUnicodeEncoder;
nsString mCharsetOverride;