Fixing remaining part of bug 245131. Use nsTextFragment::AppendTo() in more places now that we can. r+sr=peterv@propagandism.org

content/base/src/nsGenericDOMDataNode.cpp

@@ -1195,12 +1195,7 @@ nsGenericDOMDataNode::IsOnlyWhitespace()
 void
 nsGenericDOMDataNode::AppendTextTo(nsAString& aResult)
 {
-  if (mText.Is2b()) {
-    aResult.Append(mText.Get2b(), mText.GetLength());
-  } else {
-    const char *str = mText.Get1b();
-    AppendASCIItoUTF16(Substring(str, str + mText.GetLength()), aResult);
-  }
+  mText.AppendTo(aResult);
 }
 
 void

content/base/src/nsGenericElement.cpp

@@ -3603,20 +3603,17 @@ nsGenericElement::GetContentsAsText(nsAString& aText)
 {
   aText.Truncate();
   PRInt32 children = GetChildCount();
-  
-  nsCOMPtr<nsIDOMText> tc;
-  nsAutoString textData;
+
+  nsCOMPtr<nsITextContent> tc;
 
   PRInt32 i;
   for (i = 0; i < children; ++i) {
-    tc = do_QueryInterface(GetChildAt(i));
-    if (tc) {
-      if (aText.IsEmpty()) {
-        tc->GetData(aText);
-      } else {
-        tc->GetData(textData);
-        aText.Append(textData);
-      }
+    nsIContent *child = GetChildAt(i);
+
+    if (child->IsContentOfType(eTEXT)) {
+      tc = do_QueryInterface(child);
+
+      tc->AppendTextTo(aText);
     }
   }
 }