Fix 29541

r=travis,a=jar

docshell/base/nsDocShell.h

@@ -140,8 +140,8 @@ protected:
    NS_IMETHOD StopCurrentLoads();
    NS_IMETHOD ScrollIfAnchor(nsIURI* aURI, PRBool* aWasAnchor);
    NS_IMETHOD OnLoadingSite(nsIURI* aURI);
-   void SetCurrentURI(nsIURI* aURI);
-   void SetReferrerURI(nsIURI* aURI);
+   virtual void SetCurrentURI(nsIURI* aURI);
+   virtual void SetReferrerURI(nsIURI* aURI);
 
    // Session History
    NS_IMETHOD ShouldAddToSessionHistory(nsIURI* aURI, PRBool* aShouldAdd);

docshell/base/nsWebShell.cpp

@@ -347,6 +347,7 @@ public:
 
   // nsIDocShell
   NS_DECL_NSIDOCSHELL
+  void SetCurrentURI(nsIURI* aURI);
 
   // nsWebShell
   nsIEventQueue* GetEventQueue(void);
@@ -1163,10 +1164,24 @@ nsWebShell::GetURL(const PRUnichar** aURL)
 NS_IMETHODIMP
 nsWebShell::SetURL(const PRUnichar* aURL)
 {
-  mURL = aURL;
+  nsCOMPtr<nsIURI> uri;
+  NS_ENSURE_SUCCESS(NS_NewURI(getter_AddRefs(uri), aURL, nsnull), 
+                    NS_ERROR_FAILURE);
+  SetCurrentURI(uri);
   return NS_OK;
 }
 
+void 
+nsWebShell::SetCurrentURI(nsIURI* aURI)
+{
+   nsXPIDLCString spec;
+   if (NS_SUCCEEDED(aURI->GetSpec(getter_Copies(spec)))) {
+     mURL = spec;
+     nsDocShell::SetCurrentURI(aURI);
+   }
+}
+
+
 NS_IMETHODIMP
 nsWebShell::GetIsInSHist(PRBool& aResult)
 {

webshell/src/nsWebShell.cpp

@@ -347,6 +347,7 @@ public:
 
   // nsIDocShell
   NS_DECL_NSIDOCSHELL
+  void SetCurrentURI(nsIURI* aURI);
 
   // nsWebShell
   nsIEventQueue* GetEventQueue(void);
@@ -1163,10 +1164,24 @@ nsWebShell::GetURL(const PRUnichar** aURL)
 NS_IMETHODIMP
 nsWebShell::SetURL(const PRUnichar* aURL)
 {
-  mURL = aURL;
+  nsCOMPtr<nsIURI> uri;
+  NS_ENSURE_SUCCESS(NS_NewURI(getter_AddRefs(uri), aURL, nsnull), 
+                    NS_ERROR_FAILURE);
+  SetCurrentURI(uri);
   return NS_OK;
 }
 
+void 
+nsWebShell::SetCurrentURI(nsIURI* aURI)
+{
+   nsXPIDLCString spec;
+   if (NS_SUCCEEDED(aURI->GetSpec(getter_Copies(spec)))) {
+     mURL = spec;
+     nsDocShell::SetCurrentURI(aURI);
+   }
+}
+
+
 NS_IMETHODIMP
 nsWebShell::GetIsInSHist(PRBool& aResult)
 {