diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp
index 74d50b9fba3..901ff97f9d6 100644
--- a/mozilla/content/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp
@@ -1654,17 +1654,11 @@ nsHTMLDocument::GetSourceDocumentURL(JSContext* cx,
         
         result = window->GetDocument(getter_AddRefs(document));
         if (NS_SUCCEEDED(result)) {
-          nsCOMPtr<nsIDOMHTMLDocument> htmlDocument(do_QueryInterface(document, &result));
-          if (htmlDocument) {
-            nsAutoString url;
-            
-            htmlDocument->GetURL(url);
-#ifndef NECKO            
-            result = NS_NewURL(sourceURL, url);
-#else
-            result = NS_NewURI(sourceURL, url);
-#endif // NECKO
-          }
+          nsCOMPtr<nsIDocument> doc(do_QueryInterface(document, &result));
+          if (doc) { 
+            *sourceURL = doc->GetDocumentURL(); 
+            result = sourceURL ? NS_OK : NS_ERROR_FAILURE; 
+          } 
         }
       }
     }
diff --git a/mozilla/layout/html/document/src/nsHTMLDocument.cpp b/mozilla/layout/html/document/src/nsHTMLDocument.cpp
index 74d50b9fba3..901ff97f9d6 100644
--- a/mozilla/layout/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/layout/html/document/src/nsHTMLDocument.cpp
@@ -1654,17 +1654,11 @@ nsHTMLDocument::GetSourceDocumentURL(JSContext* cx,
         
         result = window->GetDocument(getter_AddRefs(document));
         if (NS_SUCCEEDED(result)) {
-          nsCOMPtr<nsIDOMHTMLDocument> htmlDocument(do_QueryInterface(document, &result));
-          if (htmlDocument) {
-            nsAutoString url;
-            
-            htmlDocument->GetURL(url);
-#ifndef NECKO            
-            result = NS_NewURL(sourceURL, url);
-#else
-            result = NS_NewURI(sourceURL, url);
-#endif // NECKO
-          }
+          nsCOMPtr<nsIDocument> doc(do_QueryInterface(document, &result));
+          if (doc) { 
+            *sourceURL = doc->GetDocumentURL(); 
+            result = sourceURL ? NS_OK : NS_ERROR_FAILURE; 
+          } 
         }
       }
     }