Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NECKO only: Using helper function NS_MakeAbsoluteURI A: chofmann R:valeski

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@38985 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
andreas.otte%primus-online.de
1999-07-11 15:46:10 +00:00
parent db3b4ce81c
commit aa8f29f8c5
17 changed files with 45 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mozilla/layout/html/content/src/nsHTMLImageElement.cpp
View File

@@ -41,6 +41,7 @@
#include "nsIIOService.h"
#include "nsIURL.h"
#include "nsIServiceManager.h"
#include "nsNeckoUtil.h"
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
#endif // NECKO
@@ -539,21 +540,7 @@ nsHTMLImageElement::SetSrc(const nsString& aSrc)
#ifndef NECKO
result = NS_MakeAbsoluteURL(baseURL, empty, aSrc, url);
#else
NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &result);
if (NS_FAILED(result)) return result;
nsIURI *baseUri = nsnull;
result = baseURL->QueryInterface(nsIURI::GetIID(), (void**)&baseUri);
if (NS_FAILED(result)) return result;
char *absUrlStr = nsnull;
char *urlSpec = aSrc.ToNewCString();
if (!urlSpec) return NS_ERROR_OUT_OF_MEMORY;
result = service->MakeAbsolute(urlSpec, baseUri, &absUrlStr);
NS_RELEASE(baseUri);
url = absUrlStr;
nsCRT::free(urlSpec);
delete [] absUrlStr;
result = NS_MakeAbsoluteURI(aSrc, baseURL, url);
#endif // NECKO
if (NS_FAILED(result)) {
url = aSrc;