Follow-on fixes for bug 17612 r+sr=mrbkap a=beltzner (grudgingly given that I should have filed a new bug)

Author: Neil Rashbrook

parser/htmlparser/src/nsViewSourceHTML.cpp

@@ -1113,8 +1113,19 @@ void CViewSourceHTML::WriteTextInElement(const nsAString& tagName,
                                          const nsAString& attrName, 
                                          const nsAString& attrValue) {
   // Open the element, supplying the attribute, if any.
-  CStartToken startToken(tagName, tagType);
-  nsCParserStartNode startNode(&startToken, 0/*stack token*/);
+  nsTokenAllocator* theAllocator = mTokenizer->GetTokenAllocator();
+  if (!theAllocator) {
+    return;
+  }
+
+  CStartToken* startToken =
+    static_cast<CStartToken*>
+      (theAllocator->CreateTokenOfType(eToken_start, tagType, tagName));
+  if (!startToken) {
+    return;
+  }
+
+  nsCParserStartNode startNode(startToken, theAllocator);
   if (!attrName.IsEmpty()) {
     AddAttrToNode(startNode, allocator, attrName, attrValue);
   }
@@ -1162,7 +1173,7 @@ void CViewSourceHTML::TrimTokenValue(nsAString::const_iterator& start,
   }
 }
 
-PRBool CViewSourceHTML::IsTokenValueTrimmableCharacter(char ch) {
+PRBool CViewSourceHTML::IsTokenValueTrimmableCharacter(PRUnichar ch) {
   if (ch == ' ') return PR_TRUE;
   if (ch == '\t') return PR_TRUE;
   if (ch == '\r') return PR_TRUE;

parser/htmlparser/src/nsViewSourceHTML.h

@@ -123,7 +123,7 @@ class CViewSourceHTML: public nsIDTD
     const nsDependentSubstring TrimTokenValue(const nsAString& tokenValue);
     void TrimTokenValue(nsAString::const_iterator& start, 
                         nsAString::const_iterator& end);
-    PRBool IsTokenValueTrimmableCharacter(char ch);
+    PRBool IsTokenValueTrimmableCharacter(PRUnichar ch);
     nsresult GetBaseURI(nsIURI **result);
     nsresult SetBaseURI(const nsAString& baseSpec);