Minor build changes per API review. Now nsIFileURL and nsIFileChannel have their own IDL file which means that if you were using either of these two interfaces, you need to include a new include file. r=valeski@netscape.com

chrome/src/nsChromeProtocolHandler.cpp

@@ -30,6 +30,7 @@
 #include "nsCRT.h"
 #include "nsChromeProtocolHandler.h"
 #include "nsIChannel.h"
+#include "nsIFileChannel.h"
 #include "nsIChromeRegistry.h"
 #include "nsIComponentManager.h"
 #include "nsIEventQueue.h"

chrome/src/nsChromeRegistry.cpp

@@ -48,6 +48,7 @@
 #include "nsIStringBundle.h"
 #include "nsISimpleEnumerator.h"
 #include "nsNetUtil.h"
+#include "nsIFileChannel.h"
 #include "nsIXBLService.h"
 #include "nsPIDOMWindow.h"
 #include "nsIDOMWindowInternal.h"

content/html/document/src/nsHTMLDocument.cpp

@@ -26,6 +26,7 @@
 #undef NS_IMPL_IDS
 
 #include "nsCOMPtr.h"
+#include "nsIFileChannel.h"
 #include "nsXPIDLString.h"
 #include "nsHTMLDocument.h"
 #include "nsIParser.h"

editor/base/nsEditorShell.cpp

@@ -53,6 +53,7 @@
 #include "nsIURI.h"
 #include "nsCURILoader.h"
 #include "nsNetUtil.h"
+#include "nsIFileChannel.h"
 
 #include "nsIScriptGlobalObject.h"
 #include "nsIWebNavigation.h"

editor/base/nsHTMLDataTransfer.cpp

@@ -42,7 +42,7 @@
 #include "nsIDOMHTMLAnchorElement.h"
 #include "nsIDOMHTMLImageElement.h"
 #include "nsISelectionController.h"
-
+#include "nsIFileChannel.h"
 #include "nsIFrameSelection.h"  // For TABLESELECTION_ defines
 #include "nsIIndependentSelection.h" //domselections answer to frameselection
 

editor/composer/src/nsEditorShell.cpp

@@ -53,6 +53,7 @@
 #include "nsIURI.h"
 #include "nsCURILoader.h"
 #include "nsNetUtil.h"
+#include "nsIFileChannel.h"
 
 #include "nsIScriptGlobalObject.h"
 #include "nsIWebNavigation.h"

editor/libeditor/html/nsHTMLDataTransfer.cpp

@@ -42,7 +42,7 @@
 #include "nsIDOMHTMLAnchorElement.h"
 #include "nsIDOMHTMLImageElement.h"
 #include "nsISelectionController.h"
-
+#include "nsIFileChannel.h"
 #include "nsIFrameSelection.h"  // For TABLESELECTION_ defines
 #include "nsIIndependentSelection.h" //domselections answer to frameselection
 

embedding/browser/powerplant/source/CBrowserApp.cp

@@ -61,6 +61,7 @@
 #include "nsRepeater.h"
 #include "nsILocalFile.h"
 #include "nsILocalFileMac.h"
+#include "nsIFileChannel.h"
 #include "nsIFileSpec.h"
 #include "nsEmbedAPI.h"
 #include "nsMPFileLocProvider.h"

mailnews/base/src/nsMsgServiceProvider.cpp

@@ -31,7 +31,7 @@
 #include "nsIRDFRemoteDataSource.h"
 
 #include "nsIChromeRegistry.h" // for chrome registry
-
+#include "nsIFileChannel.h"
 #include "nsIFileSpec.h"
 #include "nsAppDirectoryServiceDefs.h"
 

mailnews/base/src/nsStatusBarBiffManager.cpp

@@ -35,6 +35,7 @@
 #include "nsMsgFolderDataSource.h"
 #include "MailNewsTypes.h"
 #include "nsIMsgFolder.h" // TO include biffState enum. Change to bool later...
+#include "nsIFileChannel.h"
 #include "nsISound.h"
 #include "nsIPref.h"
 #include "nsXPIDLString.h"

mailnews/base/util/nsMsgDBFolder.cpp

@@ -26,6 +26,7 @@
 #include "nsMsgDBFolder.h"
 #include "nsMsgFolderFlags.h"
 #include "nsIPref.h"
+#include "nsIFileChannel.h"
 #include "nsIMsgFolderCache.h"
 #include "nsIMsgFolderCacheElement.h"
 #include "nsMsgBaseCID.h"

mailnews/base/util/nsMsgProtocol.cpp

@@ -29,6 +29,7 @@
 #include "nsILoadGroup.h"
 #include "nsIIOService.h"
 #include "nsNetUtil.h"
+#include "nsIFileChannel.h"
 #include "nsFileStream.h"
 #include "nsIFileTransportService.h"
 #include "nsINetSupportDialogService.h"

netwerk/base/public/Makefile.in

@@ -31,6 +31,7 @@ MODULE		= necko
 XPIDLSRCS	= \
 		nsIAuthenticator.idl \
 		nsIChannel.idl \
+		nsIFileChannel.idl \
 		nsIDownloader.idl \
 		nsIFileStreams.idl \
 		nsIFileTransportService.idl \
@@ -52,6 +53,7 @@ XPIDLSRCS	= \
 		nsISocketTransport.idl \
 		nsISocketTransportService.idl \
 		nsIStreamIO.idl \
+		nsIStreamIOChannel.idl \
 		nsIStreamObserver.idl \
 		nsIStreamListener.idl \
 		nsIStreamProvider.idl \

netwerk/base/public/makefile.win

@@ -34,6 +34,7 @@ EXPORTS =                           \
 XPIDLSRCS =                             \
 	.\nsIAuthenticator.idl          \
         .\nsIChannel.idl                \
+        .\nsIFileChannel.idl	        \
         .\nsIFileStreams.idl            \
         .\nsIFileTransportService.idl   \
         .\nsIIOService.idl              \
@@ -54,6 +55,7 @@ XPIDLSRCS =                             \
         .\nsISocketTransport.idl        \
         .\nsISocketTransportService.idl \
         .\nsIStreamIO.idl               \
+	.\nsIStreamIOChannel.idl	\
         .\nsIStreamObserver.idl         \
         .\nsIStreamListener.idl         \
         .\nsIStreamProvider.idl         \

netwerk/base/public/nsIChannel.idl

@@ -30,7 +30,6 @@ interface nsIStreamListener;
 interface nsIStreamProvider;
 interface nsILoadGroup;
 interface nsIInterfaceRequestor;
-interface nsIFile;
 interface nsIStreamIO;
 
 typedef unsigned long nsLoadFlags;
@@ -236,79 +235,3 @@ interface nsIChannel : nsIRequest
 
 };
 
-////////////////////////////////////////////////////////////////////////////////
-// nsIStreamIOChannel
-
-/**
- * nsIStreamIOChannel specializes nsIChannel to allow a simple channel to be
- * constructed from an nsIStreamIO object and a URL.
- */
-[scriptable, uuid(308362ce-0d06-11d4-986e-00c04fa0cf4a)]
-interface nsIStreamIOChannel : nsIChannel
-{
-    void init(in nsIURI uri, in nsIStreamIO io);
-};
-
-%{C++
-
-#define NS_STREAMIOCHANNEL_CLASSNAME "Stream I/O Channel"
-#define NS_STREAMIOCHANNEL_CONTRACTID    "@mozilla.org/network/stream-io-channel;1"
-
-#define NS_STREAMIOCHANNEL_CID                       \
-{ /* 6ddb050c-0d04-11d4-986e-00c04fa0cf4a */         \
-    0x6ddb050c,                                      \
-    0x0d04,                                          \
-    0x11d4,                                          \
-    {0x98, 0x6e, 0x00, 0xc0, 0x4f, 0xa0, 0xcf, 0x4a} \
-}
-
-%}
-
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * nsIFileChannel is an interface that allows for the initialization
- * of a simple nsIChannel that is constructed from a single nsIFile and
- * associated content type. 
- */
-[scriptable, uuid(68a26506-f947-11d3-8cda-0060b0fc14a3)]
-interface nsIFileChannel : nsIChannel
-{
-    /** 
-     * Values for ioFlags parameters to be or'd together. 
-     * (From prio.h)
-     */
-    const long NS_RDONLY        = 0x01;
-    const long NS_WRONLY        = 0x02;
-    const long NS_RDWR          = 0x04;
-    const long NS_CREATE_FILE   = 0x08;
-    const long NS_APPEND        = 0x10;
-    const long NS_TRUNCATE      = 0x20;
-    const long NS_SYNC          = 0x40;
-    const long NS_EXCL          = 0x80;
-
-    void init(in nsIFile file,
-              in long ioFlags,
-              in long perm);
-    
-    readonly attribute nsIFile file;
-    attribute long ioFlags;
-    attribute long permissions;
-};
-
-%{C++
-
-#define NS_LOCALFILECHANNEL_CLASSNAME "Local File Channel"
-#define NS_LOCALFILECHANNEL_CONTRACTID "@mozilla.org/network/local-file-channel;1"
-
-#define NS_LOCALFILECHANNEL_CID                      \
-{ /* 6d5b2d44-f947-11d3-8cda-0060b0fc14a3 */         \
-    0x6d5b2d44,                                      \
-    0xf947,                                          \
-    0x11d3,                                          \
-    {0x8c, 0xda, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
-}
-
-%}
-
-////////////////////////////////////////////////////////////////////////////////

netwerk/base/public/nsIFileStreams.idl

@@ -119,7 +119,7 @@ interface nsIBufferedOutputStream : nsIOutputStream
 #include "nsIInterfaceRequestor.h"
 #include "nsCOMPtr.h"
 #include "nsIServiceManager.h"
-#include "nsIChannel.h"
+#include "nsIFileChannel.h"
 #include "nsILocalFile.h"
 #include "nsIInputStream.h"
 #include "nsIOutputStream.h"

netwerk/base/public/nsIProtocolHandler.idl

@@ -24,21 +24,25 @@
 #include "nsIChannel.idl"
 
 interface nsIURI;
-interface nsIInterfaceRequestor;
-interface nsILoadGroup;
 
 [scriptable, uuid(15fd6940-8ea7-11d3-93ad-00104ba0fd40)]
 interface nsIProtocolHandler : nsISupports
 {
     readonly attribute string scheme;
 
+	/** 
+	 * Default Port will be the port that this protocol normally
+	 * uses.  If a port does not make sense for the protocol (eg about://)
+	 * -1 will be returned.
+	 */
+
     readonly attribute long defaultPort;
 
     /**
      * Makes a URI object that is suitable for loading by this protocol.
      * In the usual case (when only the accessors provided by nsIURI are 
      * needed), this method just constructs a standard URI using the
-     * component manager with kStandardURLCID.
+     * component manager with kStandardURLCID.  aBaseURI may be nsnull.
      */
     nsIURI newURI(in string aSpec, in nsIURI aBaseURI);
 

netwerk/base/public/nsIURL.idl

@@ -24,9 +24,6 @@
 
 #include "nsIURI.idl"
 
-interface nsIChannel;
-interface nsIEventSinkGetter;
-
 /**
  * The nsIURL interface provides convenience methods that further
  * break down the path portion of nsIURI:
@@ -160,14 +157,3 @@ interface nsIStandardURL : nsISupports
 
 ////////////////////////////////////////////////////////////////////////////////
 
-interface nsIFile;
-
-/**
- * nsIFileURL is used for the file: protocol, and gives access to the
- * underlying nsIFile object.
- */
-[scriptable, uuid(d26b2e2e-1dd1-11b2-88f3-8545a7ba7949)]
-interface nsIFileURL : nsIURL
-{
-    attribute nsIFile file;
-};

netwerk/base/public/nsNetUtil.h

@@ -36,6 +36,7 @@
 #include "nsIIOService.h"
 #include "nsIServiceManager.h"
 #include "nsIChannel.h"
+#include "nsIStreamIOChannel.h"
 #include "nsITransport.h"
 #include "nsMemory.h"
 #include "nsCOMPtr.h"

netwerk/base/src/nsDownloader.cpp

@@ -25,6 +25,7 @@
 #include "nsIURL.h"
 #include "nsNetUtil.h"
 #include "nsIChannel.h"
+#include "nsIFileChannel.h"
 #include "nsProxiedService.h"
 #include "nsIFile.h"
 #include "nsXPIDLString.h"

netwerk/base/src/nsFileStreams.cpp

@@ -508,7 +508,6 @@ nsFileOutputStream::GetNonBlocking(PRBool *aNonBlocking)
 NS_IMETHODIMP
 nsFileOutputStream::SetNonBlocking(PRBool aNonBlocking)
 {
-    NS_NOTREACHED("SetNonBlocking");
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 

netwerk/base/src/nsFileStreams.h

@@ -25,6 +25,7 @@
 
 #include "nsIFileStreams.h"
 #include "nsIFile.h"
+#include "nsIChannel.h"
 #include "nsIInputStream.h"
 #include "nsIOutputStream.h"
 #include "nsIStreamIO.h"

netwerk/base/src/nsInputStreamChannel.h

@@ -23,7 +23,7 @@
 #ifndef nsInputStreamChannel_h__
 #define nsInputStreamChannel_h__
 
-#include "nsIChannel.h"
+#include "nsIStreamIOChannel.h"
 #include "nsIInputStream.h"
 #include "nsIURI.h"
 #include "nsCRT.h"

netwerk/base/src/nsStdURL.cpp

@@ -24,6 +24,7 @@
 
 #include "nsIIOService.h"
 #include "nsURLHelper.h"
+#include "nsIFileChannel.h"
 #include "nsStdURL.h"
 #include "nsStdURLParser.h"
 #include "nscore.h"

netwerk/base/src/nsStdURL.h

@@ -31,6 +31,8 @@
 #include "nsString.h" // REMOVE Later!!
 #include "nsCOMPtr.h"
 #include "nsIFile.h"
+#include "nsIFileChannel.h"
+#include "nsIFileChannel.h"
 
 #define NS_THIS_STANDARDURL_IMPLEMENTATION_CID       \
 { /* e3939dc8-29ab-11d3-8cce-0060b0fc14a3 */         \

netwerk/cache/src/nsCacheEntry.cpp

@@ -113,7 +113,8 @@ nsCacheEntry::SetSecurityInfo( nsISupports *  info)
 nsresult
 nsCacheEntry::GetData(nsISupports **result)
 {
-    if (!result)         return NS_ERROR_NULL_POINTER;
+    if (!result)         
+        return NS_ERROR_NULL_POINTER;
 
     NS_IF_ADDREF(*result = mData);
     return NS_OK;
@@ -370,9 +371,10 @@ nsCacheEntryHashTable::AddEntry( nsCacheEntry *cacheEntry)
     if (!cacheEntry) return NS_ERROR_NULL_POINTER;
 
     hashEntry = PL_DHashTableOperate(&table, cacheEntry->mKey, PL_DHASH_ADD);
+#ifndef DEBUG_dougt
     NS_ASSERTION(((nsCacheEntryHashTableEntry *)hashEntry)->cacheEntry == 0,
                  "nsCacheEntryHashTable::AddEntry - entry already used");
-
+#endif
     ((nsCacheEntryHashTableEntry *)hashEntry)->cacheEntry = cacheEntry;
 
     return NS_OK;

netwerk/mime/src/nsMIMEService.cpp

@@ -38,6 +38,7 @@
 #include "nsString.h"
 #include "nsMIMEInfoImpl.h"
 #include "nsIURL.h"
+#include "nsIFileChannel.h"
 #include "nsCOMPtr.h"
 #include "nsXPIDLString.h"
 #include "nsMimeTypes.h"

netwerk/protocol/file/src/nsFileChannel.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "nsFileChannel.h"
+#include "nsIFileChannel.h"
 #include "nsIURL.h"
 #include "nsXPIDLString.h"
 #include "nsIServiceManager.h"

netwerk/protocol/file/src/nsFileChannel.h

@@ -37,6 +37,7 @@
 #include "nsIPipe.h"
 #include "nsCOMPtr.h"
 #include "nsIFile.h"        /* Solaris/gcc needed this here. */
+#include "nsIFileChannel.h"
 #include "nsIProgressEventSink.h"
 #include "nsITransport.h"
 

netwerk/protocol/res/src/nsResChannel.h

@@ -24,6 +24,7 @@
 #define nsResChannel_h__
 
 #include "nsIResChannel.h"
+#include "nsIFileChannel.h"
 #include "nsIStreamListener.h"
 #include "nsIStreamProvider.h"
 #include "nsIResProtocolHandler.h"

netwerk/protocol/res/src/nsResProtocolHandler.cpp

@@ -40,6 +40,7 @@
 #include "nsIIOService.h"
 #include "nsIServiceManager.h"
 #include "nsResChannel.h"
+#include "nsIFileChannel.h"
 #include "prenv.h"
 #include "prmem.h"
 #include "prprf.h"

netwerk/test/TestFileInput2.cpp

@@ -28,6 +28,7 @@
 #include "nsISupportsArray.h"
 #include "prinrval.h"
 #include "nsIFileStreams.h"
+#include "nsIFileChannel.h"
 #include "nsILocalFile.h"
 #include "nsNetUtil.h"
 #include <stdio.h>

rdf/chrome/src/nsChromeProtocolHandler.cpp

@@ -30,6 +30,7 @@
 #include "nsCRT.h"
 #include "nsChromeProtocolHandler.h"
 #include "nsIChannel.h"
+#include "nsIFileChannel.h"
 #include "nsIChromeRegistry.h"
 #include "nsIComponentManager.h"
 #include "nsIEventQueue.h"

rdf/chrome/src/nsChromeRegistry.cpp

@@ -48,6 +48,7 @@
 #include "nsIStringBundle.h"
 #include "nsISimpleEnumerator.h"
 #include "nsNetUtil.h"
+#include "nsIFileChannel.h"
 #include "nsIXBLService.h"
 #include "nsPIDOMWindow.h"
 #include "nsIDOMWindowInternal.h"

rdf/datasource/src/nsFileSystemDataSource.cpp

@@ -55,6 +55,7 @@
 #include "nsEnumeratorUtils.h"
 #include "nsIURL.h"
 #include "nsNetUtil.h"
+#include "nsIFileChannel.h"
 #include "nsIChannel.h"
 #include "nsIFile.h"
 #include "nsEscape.h"

uriloader/exthandler/nsExternalHelperAppService.cpp

@@ -25,6 +25,7 @@
 #include "nsIURL.h"
 #include "nsIFile.h"
 #include "nsIChannel.h"
+#include "nsIFileChannel.h"
 #include "nsIDirectoryService.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsXPIDLString.h"

widget/public/nsIFilePicker.idl

@@ -23,6 +23,7 @@
 
 #include "nsISupports.idl"
 #include "nsIURL.idl"
+#include "nsIFileChannel.idl"
 #include "nsILocalFile.idl"
 
 interface nsIDOMWindowInternal;

widget/src/beos/nsFilePicker.cpp

@@ -29,6 +29,7 @@
 #include "nsFilePicker.h"
 #include "nsILocalFile.h"
 #include "nsIURL.h"
+#include "nsIFileChannel.h"
 #include "nsIStringBundle.h"
 
 #include "nsFileWidget.h"

widget/src/beos/nsFilePicker.h

@@ -30,7 +30,7 @@
 #include "nsBaseFilePicker.h"
 #include "nsString.h"
 #include "nsdefs.h"
-
+#include "nsIFileChannel.h"
 //
 // Native BeOS FileSelector wrapper
 //

widget/src/mac/nsFilePicker.cpp

@@ -30,6 +30,7 @@
 #include "nsIURL.h"
 #include "nsVoidArray.h"
 #include "nsStringUtil.h"
+#include "nsIFileChannel.h"
 
 #include <InternetConfig.h>
 

widget/src/mac/nsFilePicker.h

@@ -26,6 +26,7 @@
 
 #include "nsBaseFilePicker.h"
 #include "nsString.h"
+#include "nsIFileChannel.h"
 #include <Navigation.h>
 
 #define	kMaxTypeListCount	10

widget/src/os2/nsFilePicker.cpp

@@ -36,6 +36,7 @@
 #include "nsFilePicker.h"
 #include "nsILocalFile.h"
 #include "nsIURL.h"
+#include "nsIFileChannel.h"
 #include "nsIStringBundle.h"
 
 static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);

widget/src/os2/nsFilePicker.h

@@ -30,6 +30,7 @@
 #include "nsBaseFilePicker.h"
 #include "nsString.h"
 #include "nsdefs.h"
+#include "nsIFileChannel.h"
 
 /**
  * Native Windows FileSelector wrapper

widget/src/windows/nsClipboard.cpp

@@ -39,7 +39,7 @@
 #include "nsPrimitiveHelpers.h"
 #include "nsIURL.h"
 #include "nsImageClipboard.h"
-
+#include "nsIFileChannel.h"
 #include "nsIWidget.h"
 #include "nsIComponentManager.h"
 #include "nsWidgetsCID.h"

widget/src/windows/nsFilePicker.cpp

@@ -33,6 +33,7 @@
 #undef NS_IMPL_IDS
 #include "nsFilePicker.h"
 #include "nsILocalFile.h"
+#include "nsIFileChannel.h"
 #include "nsIURL.h"
 #include "nsIStringBundle.h"
 #include <windows.h>

widget/src/windows/nsFilePicker.h

@@ -24,6 +24,8 @@
 #ifndef nsFilePicker_h__
 #define nsFilePicker_h__
 
+#include "nsIFileChannel.h"
+
 #define NS_IMPL_IDS
 #include "nsICharsetConverterManager.h"
 #undef NS_IMPL_IDS

xpfe/components/search/src/nsInternetSearchService.cpp

@@ -57,6 +57,7 @@
 #include "nsEscape.h"
 #include "nsNetUtil.h"
 #include "nsIChannel.h"
+#include "nsIFileChannel.h"
 #include "nsIHTTPChannel.h"
 #include "nsHTTPEnums.h"
 #include "nsIInputStream.h"

xpfe/components/xfer/src/nsStreamTransfer.cpp

@@ -26,6 +26,7 @@
 #include "nsStreamXferOp.h"
 #include "nsIFilePicker.h"
 #include "nsILocalFile.h"
+#include "nsIFileChannel.h"
 #include "nsNetUtil.h"
 #include "nsIPref.h"
 #include "nsIURL.h"

xpinstall/src/nsInstall.cpp

@@ -35,6 +35,7 @@
 
 #include "nsHashtable.h"
 #include "nsFileStream.h"
+#include "nsIFileChannel.h"
 #include "nsSpecialSystemDirectory.h"
 #include "nsDirectoryService.h"
 #include "nsDirectoryServiceDefs.h"

xpinstall/src/nsRegisterItem.cpp

@@ -26,6 +26,7 @@
 #include "nsRegisterItem.h"
 #include "nsInstallResources.h"
 #include "nsNetUtil.h"
+#include "nsIFileChannel.h"
 #include "nsXPIDLString.h"
 #include "nsInstallTrigger.h"
 #include "nsIChromeRegistry.h"

xpinstall/src/nsSoftwareUpdateRun.cpp

@@ -36,6 +36,7 @@
 #include "nsProxiedService.h"
 #include "nsFileStream.h"
 #include "nsIURI.h"
+#include "nsIFileChannel.h"
 #include "nsNetUtil.h"
 
 #include "nspr.h"

xpinstall/src/nsXPInstallManager.cpp

@@ -31,6 +31,7 @@
 #include "nsIServiceManager.h"
 
 #include "nsIURL.h"
+#include "nsIFileChannel.h"
 
 #include "nsITransport.h"
 #include "nsIFileTransportService.h"