Call to GetCurrentURI modified to new style. b=46847, r=valeski, a=valeski

git-svn-id: svn://10.0.0.236/trunk@77612 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
locka%iol.ie
2000-08-30 11:37:06 +00:00
parent 3173294e22
commit 5ff2709c4c
5 changed files with 19 additions and 11 deletions

View File

@@ -75,6 +75,7 @@
#include "nsIWebShell.h"
#include "nsIDocShell.h"
#include "nsIWebNavigation.h"
#include "nsIDocument.h"
#include "nsIDocumentObserver.h"
#include "nsIHTMLDocument.h"
@@ -4179,7 +4180,8 @@ HTMLContentSink::ProcessMETATag(const nsIParserNode& aNode)
// first get our baseURI
nsCOMPtr<nsIURI> baseURI;
rv = docShell->GetCurrentURI(getter_AddRefs(baseURI));
nsCOMPtr<nsIWebNavigation> webNav = do_QueryInterface(docShell);
rv = webNav->GetCurrentURI(getter_AddRefs(baseURI));
if (NS_FAILED(rv)) return rv;
PRInt32 millis = -1;
@@ -4275,7 +4277,8 @@ HTMLContentSink::ProcessMETATag(const nsIParserNode& aNode)
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIURI> baseURI;
rv = docShell->GetCurrentURI(getter_AddRefs(baseURI));
nsCOMPtr<nsIWebNavigation> webNav = do_QueryInterface(docShell);
rv = webNav->GetCurrentURI(getter_AddRefs(baseURI));
if (NS_FAILED(rv)) return rv;
rv = cookieServ->SetCookieString(baseURI, result);