diff --git a/htmlparser/public/nsHTMLTokens.h b/htmlparser/public/nsHTMLTokens.h
index 7ab8d566229..b8c7f3becb0 100644
--- a/htmlparser/public/nsHTMLTokens.h
+++ b/htmlparser/public/nsHTMLTokens.h
@@ -210,10 +210,14 @@ class CCommentToken: public CHTMLToken {
virtual const char* GetClassName(void);
virtual PRInt32 GetTokenType(void);
virtual const nsAString& GetStringValue(void);
- char mLeadingChar;
+ virtual void AppendSourceTo(nsAString& anOutputString);
+
+ nsresult ConsumeStrictComment(nsScanner& aScanner);
+ nsresult ConsumeQuirksComment(nsScanner& aScanner);
protected:
- nsString mTextValue;
+ nsSlidingSubstring mComment; // does not include MDO & MDC
+ nsSlidingSubstring mCommentDecl; // includes MDO & MDC
};
diff --git a/htmlparser/src/nsHTMLTokens.cpp b/htmlparser/src/nsHTMLTokens.cpp
index 2658e6bcf1d..8fb9147310f 100644
--- a/htmlparser/src/nsHTMLTokens.cpp
+++ b/htmlparser/src/nsHTMLTokens.cpp
@@ -991,7 +991,11 @@ CCommentToken::CCommentToken() : CHTMLToken(eHTMLTag_comment) {
* @return
*/
CCommentToken::CCommentToken(const nsAString& aName) : CHTMLToken(eHTMLTag_comment) {
- mTextValue.Assign(aName);
+ mComment.Rebind(aName);
+}
+
+void CCommentToken::AppendSourceTo(nsAString& anOutputString){
+ anOutputString.Append(mCommentDecl);
}
static PRBool IsCommentEnd(
@@ -1018,22 +1022,23 @@ static PRBool IsCommentEnd(
return PR_FALSE;
}
-static
-nsresult ConsumeStrictComment(nsScanner& aScanner, nsString& aString) {
- aString.Truncate();
-
+nsresult CCommentToken::ConsumeStrictComment(nsScanner& aScanner)
+{
//
/*********************************************************
NOTE: This algorithm does a fine job of handling comments
when they're formatted per spec, but if they're not
we don't handle them well.
*********************************************************/
- nsReadingIterator end, current, gt;
+ nsReadingIterator end, current, gt, lt;
aScanner.EndReading(end);
aScanner.CurrentPosition(current);
nsReadingIterator beginData = end;
+ lt = current;
+ lt.advance(-2); //
-#if 0
- // XXX We should do this, but it HANGS until bug 112943 is fixed:
- aString = Substring(beginData, current);
-#else
- // XXX Instead we can do this EVIL HACK (from jag):
- PRUint32 len = Distance(beginData, current);
- aString.SetLength(len);
- PRUnichar* dest = NS_CONST_CAST(PRUnichar*, aString.get());
- copy_string(beginData, current, dest);
-#endif
+ aScanner.BindSubstring(mComment, beginData, current);
}
- aScanner.SetPosition(++gt);
+ aScanner.BindSubstring(mCommentDecl, lt, ++gt);
+ aScanner.SetPosition(gt);
return NS_OK;
} else {
// Continue after the last '--'
@@ -1080,17 +1077,9 @@ nsresult ConsumeStrictComment(nsScanner& aScanner, nsString& aString) {
aScanner.CurrentPosition(current);
beginData = current;
if (FindCharInReadable('>', current, end)) {
-#if 0
- // XXX We should do this, but it HANGS until bug 112943 is fixed:
- aString = Substring(beginData, current);
-#else
- // XXX Instead we can do this EVIL HACK (from jag):
- PRUint32 len = Distance(beginData, current);
- aString.SetLength(len);
- PRUnichar* dest = NS_CONST_CAST(PRUnichar*, aString.get());
- copy_string(beginData, current, dest);
-#endif
- aScanner.SetPosition(++current);
+ aScanner.BindSubstring(mComment, beginData, current);
+ aScanner.BindSubstring(mCommentDecl, lt, ++current);
+ aScanner.SetPosition(current);
return NS_OK;
}
}
@@ -1111,10 +1100,8 @@ nsresult ConsumeStrictComment(nsScanner& aScanner, nsString& aString) {
return NS_OK;
}
-static
-nsresult ConsumeComment(nsScanner& aScanner, nsString& aString) {
- aString.Truncate();
-
+nsresult CCommentToken::ConsumeQuirksComment(nsScanner& aScanner)
+{
//
/*********************************************************
NOTE: This algorithm does a fine job of handling comments
@@ -1126,7 +1113,9 @@ nsresult ConsumeComment(nsScanner& aScanner, nsString& aString) {
aScanner.CurrentPosition(current);
nsReadingIterator beginData = current,
beginLastMinus = end,
- bestAltCommentEnd = end;
+ bestAltCommentEnd = end,
+ lt = current;
+ lt.advance(-2); //
-#if 0
- // XXX We should do this, but it HANGS until bug 112943 is fixed:
- aString = Substring(beginData, ++current);
-#else
- // XXX Instead we can do this EVIL HACK (from jag):
- PRUint32 len = Distance(beginData, ++current);
- aString.SetLength(len);
- PRUnichar* dest = NS_CONST_CAST(PRUnichar*, aString.get());
- copy_string(beginData, current, dest);
-#endif
+ aScanner.BindSubstring(mComment, beginData, ++current);
}
- aScanner.SetPosition(++gt);
+ aScanner.BindSubstring(mCommentDecl, lt, ++gt);
+ aScanner.SetPosition(gt);
return NS_OK;
} else {
// try again starting after the last '>'
@@ -1209,20 +1190,12 @@ nsresult ConsumeComment(nsScanner& aScanner, nsString& aString) {
// If not, the document has no end comment and should be treated as one big comment.
gt = bestAltCommentEnd;
if (beginData != gt) { // protects from
-#if 0
- // XXX We should do this, but it HANGS until bug 112943 is fixed:
- aString = Substring(beginData, gt);
-#else
- // XXX Instead we can do this EVIL HACK (from jag):
- PRUint32 len = Distance(beginData, gt);
- aString.SetLength(len);
- PRUnichar* dest = NS_CONST_CAST(PRUnichar*, aString.get());
- copy_string(beginData, gt, dest);
-#endif
+ aScanner.BindSubstring(mComment, beginData, gt);
}
if (gt != end) {
++gt;
}
+ aScanner.BindSubstring(mCommentDecl, lt, gt);
aScanner.SetPosition(gt);
return NS_OK;
}
@@ -1252,18 +1225,10 @@ nsresult ConsumeComment(nsScanner& aScanner, nsString& aString) {
}
if (current != gt) {
-#if 0
- // XXX We should do this, but it HANGS until bug 112943 is fixed:
- aString = Substring(beginData, ++current);
-#else
- // XXX Instead we can do this EVIL HACK (from jag):
- PRUint32 len = Distance(beginData, ++current);
- aString.SetLength(len);
- PRUnichar* dest = NS_CONST_CAST(PRUnichar*, aString.get());
- copy_string(beginData, current, dest);
-#endif
+ aScanner.BindSubstring(mComment, beginData, ++current);
}
- aScanner.SetPosition(++gt);
+ aScanner.BindSubstring(mCommentDecl, lt, ++gt);
+ aScanner.SetPosition(gt);
return NS_OK;
}
@@ -1284,14 +1249,14 @@ nsresult CCommentToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aFl
if (aFlag & NS_IPARSER_FLAG_STRICT_MODE) {
//Enabling strict comment parsing for Bug 53011 and 2749 contradicts!!!!
- result=ConsumeStrictComment(aScanner,mTextValue);
+ result = ConsumeStrictComment(aScanner);
}
else {
- result=ConsumeComment(aScanner,mTextValue);
+ result = ConsumeQuirksComment(aScanner);
}
if (NS_SUCCEEDED(result)) {
- mNewlineCount = !(aFlag & NS_IPARSER_FLAG_VIEW_SOURCE) ? mTextValue.CountChar(kNewLine) : -1;
+ mNewlineCount = !(aFlag & NS_IPARSER_FLAG_VIEW_SOURCE) ? mCommentDecl.CountChar(kNewLine) : -1;
}
return result;
@@ -1299,7 +1264,7 @@ nsresult CCommentToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aFl
const nsAString& CCommentToken::GetStringValue(void)
{
- return mTextValue;
+ return mComment;
}
/*
diff --git a/htmlparser/src/nsViewSourceHTML.cpp b/htmlparser/src/nsViewSourceHTML.cpp
index 936cdb4532d..b40f9fbcaa8 100644
--- a/htmlparser/src/nsViewSourceHTML.cpp
+++ b/htmlparser/src/nsViewSourceHTML.cpp
@@ -1084,9 +1084,7 @@ NS_IMETHODIMP CViewSourceHTML::HandleToken(CToken* aToken,nsIParser* aParser) {
case eToken_comment:
{
nsAutoString theStr;
- theStr.Assign(NS_LITERAL_STRING("") );
+ aToken->AppendSourceTo(theStr);
result=WriteTag(mCommentTag,theStr,0,PR_TRUE);
}
break;
diff --git a/parser/htmlparser/public/nsHTMLTokens.h b/parser/htmlparser/public/nsHTMLTokens.h
index 7ab8d566229..b8c7f3becb0 100644
--- a/parser/htmlparser/public/nsHTMLTokens.h
+++ b/parser/htmlparser/public/nsHTMLTokens.h
@@ -210,10 +210,14 @@ class CCommentToken: public CHTMLToken {
virtual const char* GetClassName(void);
virtual PRInt32 GetTokenType(void);
virtual const nsAString& GetStringValue(void);
- char mLeadingChar;
+ virtual void AppendSourceTo(nsAString& anOutputString);
+
+ nsresult ConsumeStrictComment(nsScanner& aScanner);
+ nsresult ConsumeQuirksComment(nsScanner& aScanner);
protected:
- nsString mTextValue;
+ nsSlidingSubstring mComment; // does not include MDO & MDC
+ nsSlidingSubstring mCommentDecl; // includes MDO & MDC
};
diff --git a/parser/htmlparser/src/nsHTMLTokens.cpp b/parser/htmlparser/src/nsHTMLTokens.cpp
index 2658e6bcf1d..8fb9147310f 100644
--- a/parser/htmlparser/src/nsHTMLTokens.cpp
+++ b/parser/htmlparser/src/nsHTMLTokens.cpp
@@ -991,7 +991,11 @@ CCommentToken::CCommentToken() : CHTMLToken(eHTMLTag_comment) {
* @return
*/
CCommentToken::CCommentToken(const nsAString& aName) : CHTMLToken(eHTMLTag_comment) {
- mTextValue.Assign(aName);
+ mComment.Rebind(aName);
+}
+
+void CCommentToken::AppendSourceTo(nsAString& anOutputString){
+ anOutputString.Append(mCommentDecl);
}
static PRBool IsCommentEnd(
@@ -1018,22 +1022,23 @@ static PRBool IsCommentEnd(
return PR_FALSE;
}
-static
-nsresult ConsumeStrictComment(nsScanner& aScanner, nsString& aString) {
- aString.Truncate();
-
+nsresult CCommentToken::ConsumeStrictComment(nsScanner& aScanner)
+{
//
/*********************************************************
NOTE: This algorithm does a fine job of handling comments
when they're formatted per spec, but if they're not
we don't handle them well.
*********************************************************/
- nsReadingIterator end, current, gt;
+ nsReadingIterator end, current, gt, lt;
aScanner.EndReading(end);
aScanner.CurrentPosition(current);
nsReadingIterator beginData = end;
+ lt = current;
+ lt.advance(-2); //
-#if 0
- // XXX We should do this, but it HANGS until bug 112943 is fixed:
- aString = Substring(beginData, current);
-#else
- // XXX Instead we can do this EVIL HACK (from jag):
- PRUint32 len = Distance(beginData, current);
- aString.SetLength(len);
- PRUnichar* dest = NS_CONST_CAST(PRUnichar*, aString.get());
- copy_string(beginData, current, dest);
-#endif
+ aScanner.BindSubstring(mComment, beginData, current);
}
- aScanner.SetPosition(++gt);
+ aScanner.BindSubstring(mCommentDecl, lt, ++gt);
+ aScanner.SetPosition(gt);
return NS_OK;
} else {
// Continue after the last '--'
@@ -1080,17 +1077,9 @@ nsresult ConsumeStrictComment(nsScanner& aScanner, nsString& aString) {
aScanner.CurrentPosition(current);
beginData = current;
if (FindCharInReadable('>', current, end)) {
-#if 0
- // XXX We should do this, but it HANGS until bug 112943 is fixed:
- aString = Substring(beginData, current);
-#else
- // XXX Instead we can do this EVIL HACK (from jag):
- PRUint32 len = Distance(beginData, current);
- aString.SetLength(len);
- PRUnichar* dest = NS_CONST_CAST(PRUnichar*, aString.get());
- copy_string(beginData, current, dest);
-#endif
- aScanner.SetPosition(++current);
+ aScanner.BindSubstring(mComment, beginData, current);
+ aScanner.BindSubstring(mCommentDecl, lt, ++current);
+ aScanner.SetPosition(current);
return NS_OK;
}
}
@@ -1111,10 +1100,8 @@ nsresult ConsumeStrictComment(nsScanner& aScanner, nsString& aString) {
return NS_OK;
}
-static
-nsresult ConsumeComment(nsScanner& aScanner, nsString& aString) {
- aString.Truncate();
-
+nsresult CCommentToken::ConsumeQuirksComment(nsScanner& aScanner)
+{
//
/*********************************************************
NOTE: This algorithm does a fine job of handling comments
@@ -1126,7 +1113,9 @@ nsresult ConsumeComment(nsScanner& aScanner, nsString& aString) {
aScanner.CurrentPosition(current);
nsReadingIterator beginData = current,
beginLastMinus = end,
- bestAltCommentEnd = end;
+ bestAltCommentEnd = end,
+ lt = current;
+ lt.advance(-2); //
-#if 0
- // XXX We should do this, but it HANGS until bug 112943 is fixed:
- aString = Substring(beginData, ++current);
-#else
- // XXX Instead we can do this EVIL HACK (from jag):
- PRUint32 len = Distance(beginData, ++current);
- aString.SetLength(len);
- PRUnichar* dest = NS_CONST_CAST(PRUnichar*, aString.get());
- copy_string(beginData, current, dest);
-#endif
+ aScanner.BindSubstring(mComment, beginData, ++current);
}
- aScanner.SetPosition(++gt);
+ aScanner.BindSubstring(mCommentDecl, lt, ++gt);
+ aScanner.SetPosition(gt);
return NS_OK;
} else {
// try again starting after the last '>'
@@ -1209,20 +1190,12 @@ nsresult ConsumeComment(nsScanner& aScanner, nsString& aString) {
// If not, the document has no end comment and should be treated as one big comment.
gt = bestAltCommentEnd;
if (beginData != gt) { // protects from
-#if 0
- // XXX We should do this, but it HANGS until bug 112943 is fixed:
- aString = Substring(beginData, gt);
-#else
- // XXX Instead we can do this EVIL HACK (from jag):
- PRUint32 len = Distance(beginData, gt);
- aString.SetLength(len);
- PRUnichar* dest = NS_CONST_CAST(PRUnichar*, aString.get());
- copy_string(beginData, gt, dest);
-#endif
+ aScanner.BindSubstring(mComment, beginData, gt);
}
if (gt != end) {
++gt;
}
+ aScanner.BindSubstring(mCommentDecl, lt, gt);
aScanner.SetPosition(gt);
return NS_OK;
}
@@ -1252,18 +1225,10 @@ nsresult ConsumeComment(nsScanner& aScanner, nsString& aString) {
}
if (current != gt) {
-#if 0
- // XXX We should do this, but it HANGS until bug 112943 is fixed:
- aString = Substring(beginData, ++current);
-#else
- // XXX Instead we can do this EVIL HACK (from jag):
- PRUint32 len = Distance(beginData, ++current);
- aString.SetLength(len);
- PRUnichar* dest = NS_CONST_CAST(PRUnichar*, aString.get());
- copy_string(beginData, current, dest);
-#endif
+ aScanner.BindSubstring(mComment, beginData, ++current);
}
- aScanner.SetPosition(++gt);
+ aScanner.BindSubstring(mCommentDecl, lt, ++gt);
+ aScanner.SetPosition(gt);
return NS_OK;
}
@@ -1284,14 +1249,14 @@ nsresult CCommentToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aFl
if (aFlag & NS_IPARSER_FLAG_STRICT_MODE) {
//Enabling strict comment parsing for Bug 53011 and 2749 contradicts!!!!
- result=ConsumeStrictComment(aScanner,mTextValue);
+ result = ConsumeStrictComment(aScanner);
}
else {
- result=ConsumeComment(aScanner,mTextValue);
+ result = ConsumeQuirksComment(aScanner);
}
if (NS_SUCCEEDED(result)) {
- mNewlineCount = !(aFlag & NS_IPARSER_FLAG_VIEW_SOURCE) ? mTextValue.CountChar(kNewLine) : -1;
+ mNewlineCount = !(aFlag & NS_IPARSER_FLAG_VIEW_SOURCE) ? mCommentDecl.CountChar(kNewLine) : -1;
}
return result;
@@ -1299,7 +1264,7 @@ nsresult CCommentToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aFl
const nsAString& CCommentToken::GetStringValue(void)
{
- return mTextValue;
+ return mComment;
}
/*
diff --git a/parser/htmlparser/src/nsViewSourceHTML.cpp b/parser/htmlparser/src/nsViewSourceHTML.cpp
index 936cdb4532d..b40f9fbcaa8 100644
--- a/parser/htmlparser/src/nsViewSourceHTML.cpp
+++ b/parser/htmlparser/src/nsViewSourceHTML.cpp
@@ -1084,9 +1084,7 @@ NS_IMETHODIMP CViewSourceHTML::HandleToken(CToken* aToken,nsIParser* aParser) {
case eToken_comment:
{
nsAutoString theStr;
- theStr.Assign(NS_LITERAL_STRING("") );
+ aToken->AppendSourceTo(theStr);
result=WriteTag(mCommentTag,theStr,0,PR_TRUE);
}
break;