NECKO ifdef (ifdef'd _off_ by default) this checkin should not impact anything. checkin approved. If someone runs into a problem, call me at 303.546.0061.
git-svn-id: svn://10.0.0.236/trunk@35863 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -22,6 +22,12 @@
|
||||
#include "nsVoidArray.h"
|
||||
#include "nsString.h"
|
||||
#include "nsIURL.h"
|
||||
#ifdef NECKO
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsIURI.h"
|
||||
#include "nsIIOService.h"
|
||||
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
|
||||
#endif // NECKO
|
||||
#include "nsIStreamListener.h"
|
||||
#include "nsIDTDDebug.h"
|
||||
#include "nsIComponentManager.h"
|
||||
@@ -192,7 +198,21 @@ extern "C" NS_EXPORT int DebugRobot(
|
||||
|
||||
// Create url
|
||||
nsIURL* url;
|
||||
nsresult rv = NS_NewURL(&url, *urlName);
|
||||
nsresult rv;
|
||||
#ifndef NECKO
|
||||
rv = NS_NewURL(&url, *urlName);
|
||||
#else
|
||||
NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
nsIURI *uri = nsnull;
|
||||
const char *uriStr = urlName->GetBuffer();
|
||||
rv = service->NewURI(uriStr, nsnull, &uri);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
rv = uri->QueryInterface(nsIURL::GetIID(), (void**)&url);
|
||||
NS_RELEASE(uri);
|
||||
#endif // NECKO
|
||||
if (NS_OK != rv) {
|
||||
printf("invalid URL: '");
|
||||
fputs(*urlName, stdout);
|
||||
|
||||
@@ -21,6 +21,12 @@
|
||||
#include "nsIParser.h"
|
||||
#include "nsString.h"
|
||||
#include "nsIURL.h"
|
||||
#ifdef NECKO
|
||||
#include "nsIURI.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsIIOService.h"
|
||||
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
|
||||
#endif // NECKO
|
||||
#include "nsCRT.h"
|
||||
#include "nsVoidArray.h"
|
||||
class nsIDocument;
|
||||
@@ -316,7 +322,27 @@ void RobotSink::ProcessLink(const nsString& aLink)
|
||||
nsIURL* docURL = mDocumentURL;
|
||||
if (nsnull != docURL) {
|
||||
nsIURL* absurl;
|
||||
nsresult rv = NS_NewURL(&absurl, aLink, docURL);
|
||||
nsresult rv;
|
||||
#ifndef NECKO
|
||||
rv = NS_NewURL(&absurl, aLink, docURL);
|
||||
#else
|
||||
NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv);
|
||||
if (NS_FAILED(rv)) return;
|
||||
|
||||
nsIURI *uri = nsnull, *baseUri = nsnull;
|
||||
|
||||
rv = mDocumentURL->QueryInterface(nsIURI::GetIID(), (void**)&baseUri);
|
||||
if (NS_FAILED(rv)) return;
|
||||
|
||||
const char *uriStr = aLink.GetBuffer();
|
||||
rv = service->NewURI(uriStr, baseUri, &uri);
|
||||
NS_RELEASE(baseUri);
|
||||
if (NS_FAILED(rv)) return;
|
||||
|
||||
rv = uri->QueryInterface(nsIURL::GetIID(), (void**)&absurl);
|
||||
NS_RELEASE(uri);
|
||||
#endif // NECKO
|
||||
|
||||
if (NS_OK == rv) {
|
||||
absURLSpec.Truncate();
|
||||
PRUnichar* str;
|
||||
|
||||
Reference in New Issue
Block a user