diff --git a/mozilla/parser/htmlparser/public/nsIParserService.h b/mozilla/parser/htmlparser/public/nsIParserService.h
index 04f5a97773a..08ec7e79d5c 100644
--- a/mozilla/parser/htmlparser/public/nsIParserService.h
+++ b/mozilla/parser/htmlparser/public/nsIParserService.h
@@ -39,7 +39,7 @@
 #define nsIParserService_h__
 
 #include "nsISupports.h"
-#include "nsString.h"
+#include "nsStringGlue.h"
 #include "nsHTMLTags.h"
 #include "nsIElementObserver.h"
 
@@ -155,7 +155,7 @@ class nsIParserService : public nsISupports {
   NS_IMETHOD GetTopicObservers(const nsAString& aTopic,
                                nsIObserverEntry** aEntry) = 0;
 
-  virtual nsresult CheckQName(const nsASingleFragmentString& aQName,
+  virtual nsresult CheckQName(const nsAString& aQName,
                               PRBool aNamespaceAware,
                               const PRUnichar** aColon) = 0;
   virtual PRBool IsXMLLetter(PRUnichar aChar) = 0;
diff --git a/mozilla/parser/htmlparser/src/nsParserService.cpp b/mozilla/parser/htmlparser/src/nsParserService.cpp
index 24a146f9db5..814de66d7fe 100644
--- a/mozilla/parser/htmlparser/src/nsParserService.cpp
+++ b/mozilla/parser/htmlparser/src/nsParserService.cpp
@@ -199,14 +199,14 @@ nsParserService::GetTopicObservers(const nsAString& aTopic,
 }
 
 nsresult
-nsParserService::CheckQName(const nsASingleFragmentString& aQName,
+nsParserService::CheckQName(const nsAString& aQName,
                             PRBool aNamespaceAware,
                             const PRUnichar** aColon)
 {
   const char* colon;
   const PRUnichar *begin, *end;
-  aQName.BeginReading(begin);
-  aQName.EndReading(end);
+  begin = aQName.BeginReading();
+  end = aQName.EndReading();
   int result = MOZ_XMLCheckQName(NS_REINTERPRET_CAST(const char*, begin),
                                  NS_REINTERPRET_CAST(const char*, end),
                                  aNamespaceAware, &colon);
diff --git a/mozilla/parser/htmlparser/src/nsParserService.h b/mozilla/parser/htmlparser/src/nsParserService.h
index 21d65d6241a..0612dac709c 100644
--- a/mozilla/parser/htmlparser/src/nsParserService.h
+++ b/mozilla/parser/htmlparser/src/nsParserService.h
@@ -81,7 +81,7 @@ public:
   NS_IMETHOD GetTopicObservers(const nsAString& aTopic,
                                nsIObserverEntry** aEntry);
 
-  nsresult CheckQName(const nsASingleFragmentString& aQName,
+  nsresult CheckQName(const nsAString& aQName,
                       PRBool aNamespaceAware, const PRUnichar** aColon);
 
   PRBool IsXMLLetter(PRUnichar aChar)