Fixed CanHandle to check against the validity of the parent being returned rather than the success of the function. Removed some code that was taken out a few days ago. Morse accidently put it back in when checking in his local version of nsWebShell.cpp.

docshell/base/nsWebShell.cpp

@@ -1680,7 +1680,7 @@ NS_IMETHODIMP nsWebShell::CanHandleContent(const char * aContentType,
   // up to our parent content handler...
   nsCOMPtr<nsIURIContentListener> parentListener;
   nsresult rv = GetParentURIContentListener(getter_AddRefs(parentListener));
-  if (NS_SUCCEEDED(rv))
+  if (parentListener)
     rv = parentListener->CanHandleContent(aContentType, aCommand, aWindowTarget, aDesiredContentType, 
                                           aCanHandleContent);
   else
@@ -3088,11 +3088,6 @@ nsWebShell::OnEndURLLoad(nsIDocumentLoader* loader,
   {
       mDocLoaderObserver->OnEndURLLoad(mDocLoader, channel, aStatus);
   }
-  if(eCharsetReloadRequested == mCharsetReloadState)
-      mCharsetReloadState = eCharsetReloadStopOrigional;
-  else 
-      mCharsetReloadState = eCharsetReloadInit;
-
   return NS_OK;
 }
 

webshell/src/nsWebShell.cpp

@@ -1680,7 +1680,7 @@ NS_IMETHODIMP nsWebShell::CanHandleContent(const char * aContentType,
   // up to our parent content handler...
   nsCOMPtr<nsIURIContentListener> parentListener;
   nsresult rv = GetParentURIContentListener(getter_AddRefs(parentListener));
-  if (NS_SUCCEEDED(rv))
+  if (parentListener)
     rv = parentListener->CanHandleContent(aContentType, aCommand, aWindowTarget, aDesiredContentType, 
                                           aCanHandleContent);
   else
@@ -3088,11 +3088,6 @@ nsWebShell::OnEndURLLoad(nsIDocumentLoader* loader,
   {
       mDocLoaderObserver->OnEndURLLoad(mDocLoader, channel, aStatus);
   }
-  if(eCharsetReloadRequested == mCharsetReloadState)
-      mCharsetReloadState = eCharsetReloadStopOrigional;
-  else 
-      mCharsetReloadState = eCharsetReloadInit;
-
   return NS_OK;
 }