Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 05:10:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support entities (bug #3112)

Browse Source
This commit is contained in:
kipp%netscape.com 1999-02-26 17:13:51 +00:00
parent 1f8cfdbaac
commit 2eee855f3b
4 changed files with 60 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
content/xml/document/src/nsXMLContentSink.cpp
View File

@ -51,6 +51,9 @@
#include "prlog.h" #include "prlog.h"
#include "prmem.h" #include "prmem.h"
// XXX misnamed header file, but oh well
#include "nsHTMLTokens.h"
static char kNameSpaceSeparator[] = ":"; static char kNameSpaceSeparator[] = ":";
static char kNameSpaceDef[] = "xmlns"; static char kNameSpaceDef[] = "xmlns";
static char kStyleSheetPI[] = "<?xml-stylesheet"; static char kStyleSheetPI[] = "<?xml-stylesheet";
@ -695,7 +698,24 @@ nsXMLContentSink::AddLeaf(const nsIParserNode& aNode)
{ {
// XXX For now, all leaf content is character data // XXX For now, all leaf content is character data
// XXX make sure to push/pop name spaces here too (for attributes) // XXX make sure to push/pop name spaces here too (for attributes)
AddCharacterData(aNode); switch (aNode.GetTokenType()) {
case eToken_text:
case eToken_whitespace:
case eToken_newline:
AddText(aNode.GetText());
break;
case eToken_entity:
{
nsAutoString tmp;
PRInt32 unicode = aNode.TranslateToUnicodeStr(tmp);
if (unicode < 0) {
return AddText(aNode.GetText());
}
return AddText(tmp);
}
}
return NS_OK; return NS_OK;
} }
@ -1176,9 +1196,13 @@ nsXMLContentSink::FlushText(PRBool aCreateTextNode, PRBool* aDidFlush)
NS_IMETHODIMP NS_IMETHODIMP
nsXMLContentSink::AddCharacterData(const nsIParserNode& aNode) nsXMLContentSink::AddCharacterData(const nsIParserNode& aNode)
{ {
nsAutoString text = aNode.GetText(); return AddText(aNode.GetText());
}
PRInt32 addLen = text.Length(); nsresult
nsXMLContentSink::AddText(const nsString& aString)
{
PRInt32 addLen = aString.Length();
if (0 == addLen) { if (0 == addLen) {
return NS_OK; return NS_OK;
} }
@ -1214,7 +1238,7 @@ nsXMLContentSink::AddCharacterData(const nsIParserNode& aNode)
} }
} }
} }
memcpy(&mText[mTextLength], text.GetUnicode() + offset, memcpy(&mText[mTextLength], aString.GetUnicode() + offset,
sizeof(PRUnichar) * amount); sizeof(PRUnichar) * amount);
mTextLength += amount; mTextLength += amount;
offset += amount; offset += amount;

2
content/xml/document/src/nsXMLContentSink.h
View File

@ -120,6 +120,8 @@ protected:
nsresult LoadXSLStyleSheet(const nsIURL* aUrl); nsresult LoadXSLStyleSheet(const nsIURL* aUrl);
#endif #endif
nsresult AddText(const nsString& aString);
nsIDocument* mDocument; nsIDocument* mDocument;
nsIURL* mDocumentURL; nsIURL* mDocumentURL;
nsIWebShell* mWebShell; nsIWebShell* mWebShell;

32
layout/xml/document/src/nsXMLContentSink.cpp
View File

@ -51,6 +51,9 @@
#include "prlog.h" #include "prlog.h"
#include "prmem.h" #include "prmem.h"
// XXX misnamed header file, but oh well
#include "nsHTMLTokens.h"
static char kNameSpaceSeparator[] = ":"; static char kNameSpaceSeparator[] = ":";
static char kNameSpaceDef[] = "xmlns"; static char kNameSpaceDef[] = "xmlns";
static char kStyleSheetPI[] = "<?xml-stylesheet"; static char kStyleSheetPI[] = "<?xml-stylesheet";
@ -695,7 +698,24 @@ nsXMLContentSink::AddLeaf(const nsIParserNode& aNode)
{ {
// XXX For now, all leaf content is character data // XXX For now, all leaf content is character data
// XXX make sure to push/pop name spaces here too (for attributes) // XXX make sure to push/pop name spaces here too (for attributes)
AddCharacterData(aNode); switch (aNode.GetTokenType()) {
case eToken_text:
case eToken_whitespace:
case eToken_newline:
AddText(aNode.GetText());
break;
case eToken_entity:
{
nsAutoString tmp;
PRInt32 unicode = aNode.TranslateToUnicodeStr(tmp);
if (unicode < 0) {
return AddText(aNode.GetText());
}
return AddText(tmp);
}
}
return NS_OK; return NS_OK;
} }
@ -1176,9 +1196,13 @@ nsXMLContentSink::FlushText(PRBool aCreateTextNode, PRBool* aDidFlush)
NS_IMETHODIMP NS_IMETHODIMP
nsXMLContentSink::AddCharacterData(const nsIParserNode& aNode) nsXMLContentSink::AddCharacterData(const nsIParserNode& aNode)
{ {
nsAutoString text = aNode.GetText(); return AddText(aNode.GetText());
}
PRInt32 addLen = text.Length(); nsresult
nsXMLContentSink::AddText(const nsString& aString)
{
PRInt32 addLen = aString.Length();
if (0 == addLen) { if (0 == addLen) {
return NS_OK; return NS_OK;
} }
@ -1214,7 +1238,7 @@ nsXMLContentSink::AddCharacterData(const nsIParserNode& aNode)
} }
} }
} }
memcpy(&mText[mTextLength], text.GetUnicode() + offset, memcpy(&mText[mTextLength], aString.GetUnicode() + offset,
sizeof(PRUnichar) * amount); sizeof(PRUnichar) * amount);
mTextLength += amount; mTextLength += amount;
offset += amount; offset += amount;

2
layout/xml/document/src/nsXMLContentSink.h
View File

@ -120,6 +120,8 @@ protected:
nsresult LoadXSLStyleSheet(const nsIURL* aUrl); nsresult LoadXSLStyleSheet(const nsIURL* aUrl);
#endif #endif
nsresult AddText(const nsString& aString);
nsIDocument* mDocument; nsIDocument* mDocument;
nsIURL* mDocumentURL; nsIURL* mDocumentURL;
nsIWebShell* mWebShell; nsIWebShell* mWebShell;