update to use ns_quicksort so that this branch builds

git-svn-id: svn://10.0.0.236/branches/FAST-GTK-GFX@31772 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/extensions/datetime/Makefile.in

@@ -1,41 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= necko
-LIBRARY_NAME	= necko_datetime
-IS_COMPONENT	= 1
-
-CPPSRCS		= \
-		nsDateTimeHandler.cpp \
-		nsDateTimeChannel.cpp \
-		nsDateTimeModule.cpp \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
-
-include $(topsrcdir)/config/rules.mk

mozilla/extensions/datetime/nsDateTimeChannel.cpp

@@ -1,333 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-// datetime implementation
-
-#include "nsDateTimeChannel.h"
-#include "nsIServiceManager.h"
-#include "nsILoadGroup.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsXPIDLString.h"
-#include "nsISocketTransportService.h"
-
-static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
-
-// nsDateTimeChannel methods
-nsDateTimeChannel::nsDateTimeChannel() {
-    NS_INIT_REFCNT();
-    mContentLength = -1;
-    mPort = -1;
-}
-
-nsDateTimeChannel::~nsDateTimeChannel() {
-}
-
-NS_IMPL_ISUPPORTS4(nsDateTimeChannel, nsIChannel, nsIRequest, nsIStreamListener, nsIStreamObserver)
-
-nsresult
-nsDateTimeChannel::Init(const char* verb, 
-                    nsIURI* uri, 
-                    nsILoadGroup* aLoadGroup,
-                    nsIInterfaceRequestor* notificationCallbacks, 
-                    nsLoadFlags loadAttributes,
-                    nsIURI* originalURI,
-                    PRUint32 bufferSegmentSize,
-                    PRUint32 bufferMaxSize)
-{
-    nsresult rv;
-
-    NS_ASSERTION(uri, "no uri");
-
-    mOriginalURI = originalURI ? originalURI : uri;
-    mUrl = uri;
-
-    rv = mUrl->GetPort(&mPort);
-    if (NS_FAILED(rv) || mPort < 1)
-        mPort = DATETIME_PORT;
-
-    rv = mUrl->GetPath(getter_Copies(mHost));
-    if (NS_FAILED(rv)) return rv;
-
-    if (!*(const char *)mHost) return NS_ERROR_NOT_INITIALIZED;
-
-    rv = SetLoadAttributes(loadAttributes);
-    if (NS_FAILED(rv)) return rv;
-    rv = SetLoadGroup(aLoadGroup);
-    if (NS_FAILED(rv)) return rv;
-    rv = SetNotificationCallbacks(notificationCallbacks);
-    if (NS_FAILED(rv)) return rv;
-
-    return NS_OK;
-}
-
-NS_METHOD
-nsDateTimeChannel::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult)
-{
-    nsDateTimeChannel* dc = new nsDateTimeChannel();
-    if (dc == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(dc);
-    nsresult rv = dc->QueryInterface(aIID, aResult);
-    NS_RELEASE(dc);
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIRequest methods:
-
-NS_IMETHODIMP
-nsDateTimeChannel::IsPending(PRBool *result)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::Cancel(void)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::Suspend(void)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::Resume(void)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIChannel methods:
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetOriginalURI(nsIURI * *aURI)
-{
-    *aURI = mOriginalURI;
-    NS_ADDREF(*aURI);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetURI(nsIURI * *aURI)
-{
-    *aURI = mUrl;
-    NS_IF_ADDREF(*aURI);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::OpenInputStream(PRUint32 startPosition, PRInt32 readCount,
-                              nsIInputStream **_retval)
-{
-    nsresult rv = NS_OK;
-
-    NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIChannel> channel;
-    rv = socketService->CreateTransport(mHost, mPort, mHost, 32, 32, getter_AddRefs(channel));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = channel->SetNotificationCallbacks(mCallbacks);
-    if (NS_FAILED(rv)) return rv;
-
-    return channel->OpenInputStream(startPosition, readCount, _retval);
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::OpenOutputStream(PRUint32 startPosition, nsIOutputStream **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::AsyncOpen(nsIStreamObserver *observer, nsISupports* ctxt)
-{
-    nsresult rv = NS_OK;
-
-    NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIChannel> channel;
-    rv = socketService->CreateTransport(mHost, mPort, mHost, 32, 32, getter_AddRefs(channel));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = channel->SetNotificationCallbacks(mCallbacks);
-    if (NS_FAILED(rv)) return rv;
-
-    return channel->AsyncOpen(observer, ctxt);
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::AsyncRead(PRUint32 startPosition, PRInt32 readCount,
-                        nsISupports *ctxt,
-                        nsIStreamListener *aListener)
-{
-    nsresult rv = NS_OK;
-
-    NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIChannel> channel;
-    rv = socketService->CreateTransport(mHost, mPort, mHost, 32, 32, getter_AddRefs(channel));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = channel->SetNotificationCallbacks(mCallbacks);
-    if (NS_FAILED(rv)) return rv;
-
-    mListener = aListener;
-
-    return channel->AsyncRead(startPosition, readCount, ctxt, this);
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::AsyncWrite(nsIInputStream *fromStream,
-                         PRUint32 startPosition,
-                         PRInt32 writeCount,
-                         nsISupports *ctxt,
-                         nsIStreamObserver *observer)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetLoadAttributes(PRUint32 *aLoadAttributes)
-{
-    *aLoadAttributes = mLoadAttributes;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetLoadAttributes(PRUint32 aLoadAttributes)
-{
-    mLoadAttributes = aLoadAttributes;
-    return NS_OK;
-}
-
-#define DATETIME_TYPE "text/plain"
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetContentType(char* *aContentType) {
-    if (!aContentType) return NS_ERROR_NULL_POINTER;
-
-    *aContentType = nsCRT::strdup(DATETIME_TYPE);
-    if (!*aContentType) return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetContentType(const char *aContentType)
-{
-    //It doesn't make sense to set the content-type on this type
-    // of channel...
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetContentLength(PRInt32 *aContentLength)
-{
-    *aContentLength = mContentLength;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
-{
-    *aLoadGroup = mLoadGroup;
-    NS_IF_ADDREF(*aLoadGroup);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
-{
-    if (mLoadGroup) // if we already had a load group remove ourselves...
-      (void)mLoadGroup->RemoveChannel(this, nsnull, nsnull, nsnull);
-
-    mLoadGroup = aLoadGroup;
-    if (mLoadGroup) {
-        return mLoadGroup->AddChannel(this, nsnull);
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetOwner(nsISupports* *aOwner)
-{
-    *aOwner = mOwner.get();
-    NS_IF_ADDREF(*aOwner);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetOwner(nsISupports* aOwner)
-{
-    mOwner = aOwner;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
-{
-    *aNotificationCallbacks = mCallbacks.get();
-    NS_IF_ADDREF(*aNotificationCallbacks);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
-{
-    mCallbacks = aNotificationCallbacks;
-    return NS_OK;
-}
-
-
-// nsIStreamObserver methods
-NS_IMETHODIMP
-nsDateTimeChannel::OnStartRequest(nsIChannel *aChannel, nsISupports *aContext) {
-    return mListener->OnStartRequest(this, aContext);
-}
-
-
-NS_IMETHODIMP
-nsDateTimeChannel::OnStopRequest(nsIChannel* aChannel, nsISupports* aContext,
-                                      nsresult aStatus, const PRUnichar* aMsg) {
-    if (mLoadGroup) {
-        nsresult rv = mLoadGroup->RemoveChannel(this, nsnull, aStatus, aMsg);
-        if (NS_FAILED(rv)) return rv;
-    }
-    return mListener->OnStopRequest(this, aContext, aStatus, aMsg);
-}
-
-
-// nsIStreamListener method
-NS_IMETHODIMP
-nsDateTimeChannel::OnDataAvailable(nsIChannel* aChannel, nsISupports* aContext,
-                               nsIInputStream *aInputStream, PRUint32 aSourceOffset,
-                               PRUint32 aLength) {
-    mContentLength = aLength;
-    return mListener->OnDataAvailable(this, aContext, aInputStream, aSourceOffset, aLength);
-}
-

mozilla/extensions/datetime/nsDateTimeChannel.h

@@ -1,84 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-// A datetime channel retrieves date time information from 
-// RFC 867 compliant datetime servers. The date/time returned
-// to the caller is of MIME type "text/plain".
-
-#ifndef nsDateTimeChannel_h___
-#define nsDateTimeChannel_h___
-
-#include "nsString2.h"
-#include "nsILoadGroup.h"
-#include "nsIInputStream.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsCOMPtr.h"
-#include "nsXPIDLString.h"
-#include "nsIChannel.h"
-#include "nsIURI.h"
-#include "nsDateTimeHandler.h"
-#include "nsIStreamListener.h"
-
-
-class nsDateTimeChannel : public nsIChannel, public nsIStreamListener {
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIREQUEST
-    NS_DECL_NSICHANNEL
-    NS_DECL_NSISTREAMLISTENER
-    NS_DECL_NSISTREAMOBSERVER
-
-    // nsDateTimeChannel methods:
-    nsDateTimeChannel();
-    virtual ~nsDateTimeChannel();
-
-    // Define a Create method to be used with a factory:
-    static NS_METHOD
-    Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult);
-    
-    nsresult Init(const char* verb, 
-                  nsIURI* uri, 
-                  nsILoadGroup* aLoadGroup,
-                  nsIInterfaceRequestor* notificationCallbacks, 
-                  nsLoadFlags loadAttributes,
-                  nsIURI* originalURI,
-                  PRUint32 bufferSegmentSize,
-                  PRUint32 bufferMaxSize);
-
-protected:
-    nsCOMPtr<nsIInterfaceRequestor>     mCallbacks;
-    nsCOMPtr<nsIURI>                    mOriginalURI;
-    nsCOMPtr<nsIURI>                    mUrl;
-    nsCOMPtr<nsIStreamListener>         mListener;
-    PRUint32                            mLoadAttributes;
-    nsCOMPtr<nsILoadGroup>              mLoadGroup;
-    nsCString                           mContentType;
-    PRInt32                             mContentLength;
-    nsCOMPtr<nsISupports>               mOwner; 
-    PRUint32                            mBufferSegmentSize;
-    PRUint32                            mBufferMaxSize;
-
-    PRInt32                             mPort;
-    nsXPIDLCString                      mHost;
-};
-
-#endif /* nsDateTimeChannel_h___ */

mozilla/extensions/datetime/nsDateTimeHandler.cpp

@@ -1,124 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nspr.h"
-#include "nsDateTimeChannel.h"
-#include "nsDateTimeHandler.h"
-#include "nsIURL.h"
-#include "nsCRT.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIProgressEventSink.h"
-
-static NS_DEFINE_CID(kSimpleURICID,            NS_SIMPLEURI_CID);
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsDateTimeHandler::nsDateTimeHandler() {
-    NS_INIT_REFCNT();
-}
-
-nsDateTimeHandler::~nsDateTimeHandler() {
-}
-
-NS_IMPL_ISUPPORTS(nsDateTimeHandler, NS_GET_IID(nsIProtocolHandler));
-
-NS_METHOD
-nsDateTimeHandler::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult) {
-
-    nsDateTimeHandler* ph = new nsDateTimeHandler();
-    if (ph == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(ph);
-    nsresult rv = ph->QueryInterface(aIID, aResult);
-    NS_RELEASE(ph);
-    return rv;
-}
-    
-////////////////////////////////////////////////////////////////////////////////
-// nsIProtocolHandler methods:
-
-NS_IMETHODIMP
-nsDateTimeHandler::GetScheme(char* *result) {
-    *result = nsCRT::strdup("datetime");
-    if (!*result) return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeHandler::GetDefaultPort(PRInt32 *result) {
-    *result = DATETIME_PORT;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeHandler::NewURI(const char *aSpec, nsIURI *aBaseURI,
-                             nsIURI **result) {
-    nsresult rv;
-
-    // no concept of a relative datetime url
-    NS_ASSERTION(!aBaseURI, "base url passed into datetime protocol handler");
-
-    nsIURI* url;
-    rv = nsComponentManager::CreateInstance(kSimpleURICID, nsnull,
-                                            NS_GET_IID(nsIURI),
-                                            (void**)&url);
-    if (NS_FAILED(rv)) return rv;
-    rv = url->SetSpec((char*)aSpec);
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(url);
-        return rv;
-    }
-
-    *result = url;
-    return rv;
-}
-
-NS_IMETHODIMP
-nsDateTimeHandler::NewChannel(const char* verb, nsIURI* url,
-                          nsILoadGroup* aLoadGroup,
-                          nsIInterfaceRequestor* notificationCallbacks,
-                          nsLoadFlags loadAttributes,
-                          nsIURI* originalURI,
-                          PRUint32 bufferSegmentSize,
-                          PRUint32 bufferMaxSize,
-                          nsIChannel* *result)
-{
-    nsresult rv;
-    
-    nsDateTimeChannel* channel;
-    rv = nsDateTimeChannel::Create(nsnull, NS_GET_IID(nsIChannel), (void**)&channel);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = channel->Init(verb, url, aLoadGroup, notificationCallbacks,
-                       loadAttributes, originalURI, bufferSegmentSize, bufferMaxSize);
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(channel);
-        return rv;
-    }
-
-    *result = channel;
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/extensions/datetime/nsDateTimeHandler.h

@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-// The datetime protocol handler creates "datetime" URIs of the form
-// "datetime:RFC867Server".
-
-#ifndef nsDateTimeHandler_h___
-#define nsDateTimeHandler_h___
-
-#include "nsIProtocolHandler.h"
-
-#define DATETIME_PORT 13
-
-// {AA27D2A0-B71B-11d3-A1A0-0050041CAF44}
-#define NS_DATETIMEHANDLER_CID \
-{ 0xaa27d2a0, 0xb71b, 0x11d3, { 0xa1, 0xa0, 0x0, 0x50, 0x4, 0x1c, 0xaf, 0x44 } }
-
-class nsDateTimeHandler : public nsIProtocolHandler
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIPROTOCOLHANDLER
-
-    // nsDateTimeHandler methods:
-    nsDateTimeHandler();
-    virtual ~nsDateTimeHandler();
-
-    // Define a Create method to be used with a factory:
-    static NS_METHOD Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult);
-};
-
-#endif /* nsDateTimeHandler_h___ */

mozilla/extensions/datetime/nsDateTimeModule.cpp

@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIGenericFactory.h"
-#include "nsDateTimeHandler.h"
-
-static nsModuleComponentInfo gResComponents[] = {
-    { "The DateTime Protocol Handler", 
-      NS_DATETIMEHANDLER_CID,
-      NS_NETWORK_PROTOCOL_PROGID_PREFIX "datetime",
-      nsDateTimeHandler::Create
-    }
-};
-
-NS_IMPL_NSGETMODULE("datetime", gResComponents)

mozilla/extensions/finger/Makefile.in

@@ -1,41 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= necko
-LIBRARY_NAME	= necko_finger
-IS_COMPONENT	= 1
-
-CPPSRCS		= \
-		nsFingerHandler.cpp \
-		nsFingerChannel.cpp \
-		nsFingerModule.cpp \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
-
-include $(topsrcdir)/config/rules.mk

mozilla/extensions/finger/nsFingerChannel.cpp

@@ -1,423 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-// finger implementation
-
-#include "nsFingerChannel.h"
-#include "nsIServiceManager.h"
-#include "nsILoadGroup.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsXPIDLString.h"
-#include "nsISocketTransportService.h"
-#include "nsIStringStream.h"
-#include "nsMimeTypes.h"
-
-static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
-
-#define BUFFER_SEG_SIZE (4*1024)
-#define BUFFER_MAX_SIZE (64*1024)
-
-// nsFingerChannel methods
-nsFingerChannel::nsFingerChannel():
- mContentLength(-1),
- mActAsObserver(PR_TRUE),
- mPort(-1)
-{
-    NS_INIT_REFCNT();
-}
-
-nsFingerChannel::~nsFingerChannel() {
-}
-
-NS_IMPL_ISUPPORTS4(nsFingerChannel, nsIChannel, nsIRequest,
-                   nsIStreamListener, nsIStreamObserver)
-
-nsresult
-nsFingerChannel::Init(const char* verb, 
-                    nsIURI* uri, 
-                    nsILoadGroup* aLoadGroup,
-                    nsIInterfaceRequestor* notificationCallbacks, 
-                    nsLoadFlags loadAttributes,
-                    nsIURI* originalURI,
-                    PRUint32 bufferSegmentSize,
-                    PRUint32 bufferMaxSize)
-{
-    nsresult rv;
-    nsXPIDLCString autoBuffer;
-
-    NS_ASSERTION(uri, "no uri");
-
-    mOriginalURI = originalURI ? originalURI : uri;
-    mUrl = uri;
-
-    rv = mUrl->GetPort(&mPort);
-    if (NS_FAILED(rv) || mPort < 1)
-        mPort = FINGER_PORT;
-
-    rv = mUrl->GetPath(getter_Copies(autoBuffer)); // autoBuffer = user@host
-    if (NS_FAILED(rv)) return rv;
-
-    nsCString cString(autoBuffer);
-    nsCString tempBuf;
-
-    PRUint32 i;
-
-    // Now parse out the user and host
-    for (i=0; cString[i] != '\0'; i++) {
-      if (cString[i] == '@') {
-        cString.Left(tempBuf, i);
-        mUser = tempBuf;
-        cString.Right(tempBuf, cString.Length() - i - 1);
-        mHost = tempBuf;
-        break;
-       }
-    }
-
-    // Catch the case of just the host being given
-
-    if (cString[i] == '\0') {
-      mHost = cString;
-    }
-
-#ifdef DEBUG_bryner
-    printf("Status:mUser = %s, mHost = %s\n", (const char*)mUser,
-            (const char*)mHost);
-#endif
-    if (!*(const char *)mHost) return NS_ERROR_NOT_INITIALIZED;
-
-    rv = SetLoadAttributes(loadAttributes);
-    if (NS_FAILED(rv)) return rv;
-    rv = SetLoadGroup(aLoadGroup);
-    if (NS_FAILED(rv)) return rv;
-    rv = SetNotificationCallbacks(notificationCallbacks);
-    if (NS_FAILED(rv)) return rv;
-
-    return NS_OK;
-}
-
-NS_METHOD
-nsFingerChannel::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult)
-{
-    nsFingerChannel* fc = new nsFingerChannel();
-    if (fc == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(fc);
-    nsresult rv = fc->QueryInterface(aIID, aResult);
-    NS_RELEASE(fc);
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIRequest methods:
-
-NS_IMETHODIMP
-nsFingerChannel::IsPending(PRBool *result)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::Cancel(void)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::Suspend(void)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::Resume(void)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIChannel methods:
-
-NS_IMETHODIMP
-nsFingerChannel::GetOriginalURI(nsIURI * *aURI)
-{
-    *aURI = mOriginalURI;
-    NS_ADDREF(*aURI);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetURI(nsIURI * *aURI)
-{
-    *aURI = mUrl;
-    NS_IF_ADDREF(*aURI);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::OpenInputStream(PRUint32 startPosition, PRInt32 readCount,
-                              nsIInputStream **_retval)
-{
-    nsresult rv = NS_OK;
-
-    NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIChannel> channel;
-    rv = socketService->CreateTransport(mHost, mPort, mHost, BUFFER_SEG_SIZE,
-            BUFFER_MAX_SIZE, getter_AddRefs(channel));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = channel->SetNotificationCallbacks(mCallbacks);
-    if (NS_FAILED(rv)) return rv;
-
-    return channel->OpenInputStream(startPosition, readCount, _retval);
-}
-
-NS_IMETHODIMP
-nsFingerChannel::OpenOutputStream(PRUint32 startPosition, nsIOutputStream **_retval)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::AsyncOpen(nsIStreamObserver *observer, nsISupports* ctxt)
-{
-    nsresult rv = NS_OK;
-
-    NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIChannel> channel;
-    rv = socketService->CreateTransport(mHost, mPort, mHost, BUFFER_SEG_SIZE,
-      BUFFER_MAX_SIZE, getter_AddRefs(channel));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = channel->SetNotificationCallbacks(mCallbacks);
-    if (NS_FAILED(rv)) return rv;
-
-    return channel->AsyncOpen(observer, ctxt);
-}
-
-NS_IMETHODIMP
-nsFingerChannel::AsyncRead(PRUint32 startPosition, PRInt32 readCount,
-                        nsISupports *ctxt,
-                        nsIStreamListener *aListener)
-{
-    nsresult rv = NS_OK;
-
-    NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIChannel> channel;
-    rv = socketService->CreateTransport(mHost, mPort, mHost, BUFFER_SEG_SIZE,
-      BUFFER_MAX_SIZE, getter_AddRefs(channel));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = channel->SetNotificationCallbacks(mCallbacks);
-    if (NS_FAILED(rv)) return rv;
-
-    mListener = aListener;
-
-    return SendRequest(channel);
-}
-
-NS_IMETHODIMP
-nsFingerChannel::AsyncWrite(nsIInputStream *fromStream,
-                         PRUint32 startPosition,
-                         PRInt32 writeCount,
-                         nsISupports *ctxt,
-                         nsIStreamObserver *observer)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetLoadAttributes(PRUint32 *aLoadAttributes)
-{
-    *aLoadAttributes = mLoadAttributes;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetLoadAttributes(PRUint32 aLoadAttributes)
-{
-    mLoadAttributes = aLoadAttributes;
-    return NS_OK;
-}
-
-#define FINGER_TYPE TEXT_PLAIN
-
-NS_IMETHODIMP
-nsFingerChannel::GetContentType(char* *aContentType) {
-    if (!aContentType) return NS_ERROR_NULL_POINTER;
-
-    *aContentType = nsCRT::strdup(FINGER_TYPE);
-    if (!*aContentType) return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetContentType(const char *aContentType)
-{
-    //It doesn't make sense to set the content-type on this type
-    // of channel...
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetContentLength(PRInt32 *aContentLength)
-{
-    *aContentLength = mContentLength;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
-{
-    *aLoadGroup = mLoadGroup;
-    NS_IF_ADDREF(*aLoadGroup);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
-{
-    if (mLoadGroup) // if we already had a load group remove ourselves...
-      (void)mLoadGroup->RemoveChannel(this, nsnull, nsnull, nsnull);
-
-    mLoadGroup = aLoadGroup;
-    if (mLoadGroup) {
-        return mLoadGroup->AddChannel(this, nsnull);
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetOwner(nsISupports* *aOwner)
-{
-    *aOwner = mOwner.get();
-    NS_IF_ADDREF(*aOwner);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetOwner(nsISupports* aOwner)
-{
-    mOwner = aOwner;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
-{
-    *aNotificationCallbacks = mCallbacks.get();
-    NS_IF_ADDREF(*aNotificationCallbacks);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
-{
-    mCallbacks = aNotificationCallbacks;
-    return NS_OK;
-}
-
-
-// nsIStreamObserver methods
-NS_IMETHODIMP
-nsFingerChannel::OnStartRequest(nsIChannel *aChannel, nsISupports *aContext) {
-    if (!mActAsObserver) {
-      // acting as a listener
-      return mListener->OnStartRequest(this, aContext);
-    } else {
-      // we don't want to pass our AsyncWrite's OnStart through
-      // we just ignore this
-      return NS_OK;
-    }
-}
-
-
-NS_IMETHODIMP
-nsFingerChannel::OnStopRequest(nsIChannel* aChannel, nsISupports* aContext,
-                                      nsresult aStatus, const PRUnichar* aMsg) {
-#ifdef DEBUG_bryner
-    printf("nsFingerChannel::OnStopRequest, mActAsObserver=%d\n",
-            mActAsObserver);
-    printf("  aChannel = %p\n", aChannel);
-#endif
-    nsresult rv = NS_OK;
-
-    if (!mActAsObserver) {
-        if (mLoadGroup) {
-          rv = mLoadGroup->RemoveChannel(this, nsnull, aStatus, aMsg);
-          if (NS_FAILED(rv)) return rv;
-        }
-        return mListener->OnStopRequest(this, aContext, aStatus, aMsg);
-    } else {
-        // at this point we know the request has been sent.
-        // we're no longer acting as an observer.
- 
-        mActAsObserver = PR_FALSE;
-        return aChannel->AsyncRead(0, -1, 0, this);
-    }
-
-}
-
-
-// nsIStreamListener method
-NS_IMETHODIMP
-nsFingerChannel::OnDataAvailable(nsIChannel* aChannel, nsISupports* aContext,
-                               nsIInputStream *aInputStream, PRUint32 aSourceOffset,
-                               PRUint32 aLength) {
-    mContentLength = aLength;
-    return mListener->OnDataAvailable(this, aContext, aInputStream, aSourceOffset, aLength);
-}
-
-nsresult
-nsFingerChannel::SendRequest(nsIChannel* aChannel) {
-  // The text to send should already be in mUser
-
-  nsresult rv = NS_OK;
-  nsCOMPtr<nsISupports> result;
-  nsCOMPtr<nsIInputStream> charstream;
-  nsCString requestBuffer(mUser);
-
-  requestBuffer.Append(CRLF);
-
-  mRequest = requestBuffer.ToNewCString();
-
-  rv = NS_NewCharInputStream(getter_AddRefs(result), mRequest);
-  if (NS_FAILED(rv)) return rv;
-
-  charstream = do_QueryInterface(result, &rv);
-  if (NS_FAILED(rv)) return rv;
-
-#ifdef DEBUG_bryner
-  printf("Sending: %s\n", requestBuffer.GetBuffer());
-#endif
-
-  rv = aChannel->AsyncWrite(charstream, 0, requestBuffer.Length(), 0,
-                            this);
-  return rv;
-}
-
-

mozilla/extensions/finger/nsFingerChannel.h

@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsFingerChannel_h___
-#define nsFingerChannel_h___
-
-#include "nsString2.h"
-#include "nsILoadGroup.h"
-#include "nsIInputStream.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsCOMPtr.h"
-#include "nsXPIDLString.h"
-#include "nsIChannel.h"
-#include "nsIURI.h"
-#include "nsFingerHandler.h"
-#include "nsIStreamListener.h"
-
-
-class nsFingerChannel : public nsIChannel, public nsIStreamListener {
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIREQUEST
-    NS_DECL_NSICHANNEL
-    NS_DECL_NSISTREAMLISTENER
-    NS_DECL_NSISTREAMOBSERVER
-
-    // nsFingerChannel methods:
-    nsFingerChannel();
-    virtual ~nsFingerChannel();
-
-    // Define a Create method to be used with a factory:
-    static NS_METHOD
-    Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult);
-    
-    nsresult Init(const char* verb, 
-                  nsIURI* uri, 
-                  nsILoadGroup* aLoadGroup,
-                  nsIInterfaceRequestor* notificationCallbacks, 
-                  nsLoadFlags loadAttributes,
-                  nsIURI* originalURI,
-                  PRUint32 bufferSegmentSize,
-                  PRUint32 bufferMaxSize);
-
-protected:
-    nsCOMPtr<nsIInterfaceRequestor>     mCallbacks;
-    nsCOMPtr<nsIURI>                    mOriginalURI;
-    nsCOMPtr<nsIURI>                    mUrl;
-    nsCOMPtr<nsIStreamListener>         mListener;
-    PRUint32                            mLoadAttributes;
-    nsCOMPtr<nsILoadGroup>              mLoadGroup;
-    nsCString                           mContentType;
-    PRInt32                             mContentLength;
-    nsCOMPtr<nsISupports>               mOwner; 
-    PRUint32                            mBufferSegmentSize;
-    PRUint32                            mBufferMaxSize;
-    PRBool                              mActAsObserver;
-
-    PRInt32                             mPort;
-    nsXPIDLCString                      mHost;
-    nsXPIDLCString                      mUser;
-
-    nsXPIDLCString                      mRequest;
-
-protected:
-    nsresult SendRequest(nsIChannel* aChannel);
-};
-
-#endif /* nsFingerChannel_h___ */

mozilla/extensions/finger/nsFingerHandler.cpp

@@ -1,124 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nspr.h"
-#include "nsFingerChannel.h"
-#include "nsFingerHandler.h"
-#include "nsIURL.h"
-#include "nsCRT.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIProgressEventSink.h"
-
-static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID);
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsFingerHandler::nsFingerHandler() {
-    NS_INIT_REFCNT();
-}
-
-nsFingerHandler::~nsFingerHandler() {
-}
-
-NS_IMPL_ISUPPORTS(nsFingerHandler, NS_GET_IID(nsIProtocolHandler));
-
-NS_METHOD
-nsFingerHandler::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult) {
-
-    nsFingerHandler* ph = new nsFingerHandler();
-    if (ph == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(ph);
-    nsresult rv = ph->QueryInterface(aIID, aResult);
-    NS_RELEASE(ph);
-    return rv;
-}
-    
-////////////////////////////////////////////////////////////////////////////////
-// nsIProtocolHandler methods:
-
-NS_IMETHODIMP
-nsFingerHandler::GetScheme(char* *result) {
-    *result = nsCRT::strdup("finger");
-    if (!*result) return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerHandler::GetDefaultPort(PRInt32 *result) {
-    *result = FINGER_PORT;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerHandler::NewURI(const char *aSpec, nsIURI *aBaseURI,
-                             nsIURI **result) {
-    nsresult rv;
-
-    // no concept of a relative finger url
-    NS_ASSERTION(!aBaseURI, "base url passed into finger protocol handler");
-
-    nsIURI* url;
-    rv = nsComponentManager::CreateInstance(kSimpleURICID, nsnull,
-                                            NS_GET_IID(nsIURI),
-                                            (void**)&url);
-    if (NS_FAILED(rv)) return rv;
-    rv = url->SetSpec((char*)aSpec);
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(url);
-        return rv;
-    }
-
-    *result = url;
-    return rv;
-}
-
-NS_IMETHODIMP
-nsFingerHandler::NewChannel(const char* verb, nsIURI* url,
-                          nsILoadGroup* aLoadGroup,
-                          nsIInterfaceRequestor* notificationCallbacks,
-                          nsLoadFlags loadAttributes,
-                          nsIURI* originalURI,
-                          PRUint32 bufferSegmentSize,
-                          PRUint32 bufferMaxSize,
-                          nsIChannel* *result)
-{
-    nsresult rv;
-    
-    nsFingerChannel* channel;
-    rv = nsFingerChannel::Create(nsnull, NS_GET_IID(nsIChannel), (void**)&channel);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = channel->Init(verb, url, aLoadGroup, notificationCallbacks,
-                       loadAttributes, originalURI, bufferSegmentSize, bufferMaxSize);
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(channel);
-        return rv;
-    }
-
-    *result = channel;
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/extensions/finger/nsFingerHandler.h

@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-// The finger protocol handler creates "finger" URIs of the form
-// "finger:user@host" or "finger:host".
-
-#ifndef nsFingerHandler_h___
-#define nsFingerHandler_h___
-
-#include "nsIProtocolHandler.h"
-
-#define FINGER_PORT 79
-
-// {0x76d6d5d8-1dd2-11b2-b361-850ddf15ef07}
-#define NS_FINGERHANDLER_CID     \
-{ 0x76d6d5d8, 0x1dd2, 0x11b2, \
-   {0xb3, 0x61, 0x85, 0x0d, 0xdf, 0x15, 0xef, 0x07} }
-
-class nsFingerHandler : public nsIProtocolHandler
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIPROTOCOLHANDLER
-
-    // nsFingerHandler methods:
-    nsFingerHandler();
-    virtual ~nsFingerHandler();
-
-    // Define a Create method to be used with a factory:
-    static NS_METHOD Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult);
-};
-
-#endif /* nsFingerHandler_h___ */

mozilla/extensions/finger/nsFingerModule.cpp

@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIGenericFactory.h"
-#include "nsFingerHandler.h"
-
-static nsModuleComponentInfo gResComponents[] = {
-    { "The Finger Protocol Handler", 
-      NS_FINGERHANDLER_CID,
-      NS_NETWORK_PROTOCOL_PROGID_PREFIX "finger",
-      nsFingerHandler::Create
-    }
-};
-
-NS_IMPL_NSGETMODULE("finger", gResComponents)

mozilla/gfx/src/gtk/Makefile.in

@@ -1,3 +1,4 @@
+#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -13,38 +14,40 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
-#
 
-DEPTH		= ../../../..
+DEPTH = ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-REQUIRES	= libreg xpcom
+include $(topsrcdir)/config/config.mk
 
-CPPSRCS		= \
-         diskcache.cpp \
-		$(NULL)
+LIBRARY_NAME = gfxgtk
 
-SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
+MODULE=raptor 
 
-ifdef NO_LD_ARCHIVE_FLAGS
-LOST_SYM_LIBS	= -lxpcomds_s -lxptinfo -lmozreg_s
-endif
+REQUIRES=util img xpcom raptor netlib ps
 
-LIBS		= \
-		-lmozjs \
-		-lxpcom \
-        -lmozdbm_s \
-		$(MOZ_NECKO_UTIL_LIBS) \
-		$(LOST_SYM_LIBS) \
-		$(NSPR_LIBS) \
-		$(NULL)
+DEFINES += -D_IMPL_NS_GFXONXP 
+CXXFLAGS += $(TK_CFLAGS)
+INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
+
+CPPSRCS = \
+	nsDrawingSurfaceGTK.cpp \
+	nsDeviceContextGTK.cpp \
+	nsDeviceContextSpecFactoryG.cpp \
+	nsDeviceContextSpecG.cpp \
+	nsFontMetricsGTK.cpp \
+	nsGfxFactoryGTK.cpp \
+	nsRenderingContextGTK.cpp \
+	nsImageGTK.cpp \
+	nsRegionGTK.cpp 
+
+CSRCS = \
+	nsPrintdGTK.c
 
 include $(topsrcdir)/config/rules.mk
 
-LOCAL_INCLUDES = -I$(srcdir)/..
 
-DEFINES		+= -DUSE_NSREG -DCACHE

mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp

@@ -0,0 +1,375 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include <math.h>
+
+#include "nspr.h"
+#include "il_util.h"
+
+#include "nsDeviceContextGTK.h"
+#include "nsGfxCIID.h"
+
+#include "../ps/nsDeviceContextPS.h"
+
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+
+#define NS_TO_GDK_RGB(ns) (ns & 0xff) << 16 | (ns & 0xff00) | ((ns >> 16) & 0xff)
+
+#define GDK_COLOR_TO_NS_RGB(c) \
+  ((nscolor) NS_RGB(c.red, c.green, c.blue))
+
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+static NS_DEFINE_IID(kDeviceContextIID, NS_IDEVICE_CONTEXT_IID);
+
+nsDeviceContextGTK::nsDeviceContextGTK()
+{
+  NS_INIT_REFCNT();
+  mTwipsToPixels = 1.0;
+  mPixelsToTwips = 1.0;
+  mDepth = 0 ;
+  mPaletteInfo.isPaletteDevice = PR_FALSE;
+  mPaletteInfo.sizePalette = 0;
+  mPaletteInfo.numReserved = 0;
+  mPaletteInfo.palette = NULL;
+  mNumCells = 0;
+}
+
+nsDeviceContextGTK::~nsDeviceContextGTK()
+{
+}
+
+NS_IMPL_QUERY_INTERFACE(nsDeviceContextGTK, kDeviceContextIID)
+NS_IMPL_ADDREF(nsDeviceContextGTK)
+NS_IMPL_RELEASE(nsDeviceContextGTK)
+
+NS_IMETHODIMP nsDeviceContextGTK::Init(nsNativeWidget aNativeWidget)
+{
+  GdkVisual *vis;
+  GtkRequisition req;
+  GtkWidget *sb;
+
+  mWidget = aNativeWidget;
+
+  // Compute dpi of display
+  float screenWidth = float(::gdk_screen_width());
+  float screenWidthIn = float(::gdk_screen_width_mm()) / 25.4f;
+  nscoord dpi = nscoord(screenWidth / screenWidthIn);
+
+  // Now for some wacky heuristics. 
+  if (dpi < 84) dpi = 72;
+  else if (dpi < 108) dpi = 96;
+  else if (dpi < 132) dpi = 120;
+
+  mTwipsToPixels = float(dpi) / float(NSIntPointsToTwips(72));
+  mPixelsToTwips = 1.0f / mTwipsToPixels;
+
+#if 0
+  mTwipsToPixels = ( ((float)::gdk_screen_width()) /
+                     ((float)::gdk_screen_width_mm()) * 25.4) /
+		     (float)NSIntPointsToTwips(72);
+
+  mPixelsToTwips = 1.0f / mTwipsToPixels;
+#endif
+
+  vis = gdk_rgb_get_visual();
+  mDepth = vis->depth;
+
+  sb = gtk_vscrollbar_new(NULL);
+  gtk_widget_ref(sb);
+  gtk_object_sink(GTK_OBJECT(sb));
+  gtk_widget_size_request(sb,&req);
+  mScrollbarWidth = req.width;
+  gtk_widget_destroy(sb);
+  gtk_widget_unref(sb);
+  
+  sb = gtk_hscrollbar_new(NULL);
+  gtk_widget_ref(sb);
+  gtk_object_sink(GTK_OBJECT(sb));
+  gtk_widget_size_request(sb,&req);
+  mScrollbarHeight = req.height;
+  gtk_widget_destroy(sb);
+  gtk_widget_unref(sb);
+
+#ifdef DEBUG
+  static PRBool once = PR_TRUE;
+  if (once) {
+    printf("GFX: dpi=%d t2p=%g p2t=%g depth=%d\n", dpi, mTwipsToPixels, mPixelsToTwips,mDepth);
+    once = PR_FALSE;
+  }
+#endif
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::CreateRenderingContext(nsIRenderingContext *&aContext)
+{
+  nsIRenderingContext *pContext;
+  nsresult             rv;
+  nsDrawingSurfaceGTK  *surf;
+
+  // to call init for this, we need to have a valid nsDrawingSurfaceGTK created
+  pContext = new nsRenderingContextGTK();
+
+  if (nsnull != pContext)
+  {
+    NS_ADDREF(pContext);
+
+    // create the nsDrawingSurfaceGTK
+    surf = new nsDrawingSurfaceGTK();
+
+    if (nsnull != surf)
+      {
+        GdkDrawable *win = nsnull;
+        // FIXME
+        if (GTK_IS_LAYOUT((GtkWidget*)mWidget))
+          win = (GdkDrawable*)gdk_window_ref(GTK_LAYOUT((GtkWidget*)mWidget)->bin_window);
+        else
+          win = (GdkDrawable*)gdk_window_ref(((GtkWidget*)mWidget)->window);
+
+        GdkGC *gc = gdk_gc_new(win);
+
+        // init the nsDrawingSurfaceGTK
+        rv = surf->Init(win,gc);
+
+        if (NS_OK == rv)
+          // Init the nsRenderingContextGTK
+          rv = pContext->Init(this, surf);
+      }
+    else
+      rv = NS_ERROR_OUT_OF_MEMORY;
+  }
+  else
+    rv = NS_ERROR_OUT_OF_MEMORY;
+
+  if (NS_OK != rv)
+  {
+    NS_IF_RELEASE(pContext);
+  }
+
+  aContext = pContext;
+
+  return rv;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::SupportsNativeWidgets(PRBool &aSupportsWidgets)
+{
+  //XXX it is very critical that this not lie!! MMP
+  // read the comments in the mac code for this
+  aSupportsWidgets = PR_TRUE;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetScrollBarDimensions(float &aWidth, float &aHeight) const
+{
+  aWidth = mScrollbarWidth * mPixelsToTwips;
+  aHeight = mScrollbarHeight * mPixelsToTwips;
+ 
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetSystemAttribute(nsSystemAttrID anID, SystemAttrStruct * aInfo) const
+{
+  nsresult status = NS_OK;
+  GtkStyle *style = gtk_style_new();  // get the default styles
+
+  switch (anID) {
+    //---------
+    // Colors
+    //---------
+    case eSystemAttr_Color_WindowBackground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_WindowForeground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_WidgetBackground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_WidgetForeground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_WidgetSelectBackground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_SELECTED]);
+        break;
+    case eSystemAttr_Color_WidgetSelectForeground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_SELECTED]);
+        break;
+    case eSystemAttr_Color_Widget3DHighlight:
+        *aInfo->mColor = NS_RGB(0xa0,0xa0,0xa0);
+        break;
+    case eSystemAttr_Color_Widget3DShadow:
+        *aInfo->mColor = NS_RGB(0x40,0x40,0x40);
+        break;
+    case eSystemAttr_Color_TextBackground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_TextForeground: 
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_TextSelectBackground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_SELECTED]);
+        break;
+    case eSystemAttr_Color_TextSelectForeground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->text[GTK_STATE_SELECTED]);
+        break;
+    //---------
+    // Size
+    //---------
+    case eSystemAttr_Size_ScrollbarHeight:
+        aInfo->mSize = mScrollbarHeight;
+        break;
+    case eSystemAttr_Size_ScrollbarWidth: 
+        aInfo->mSize = mScrollbarWidth;
+        break;
+    case eSystemAttr_Size_WindowTitleHeight:
+        aInfo->mSize = 0;
+        break;
+    case eSystemAttr_Size_WindowBorderWidth:
+        aInfo->mSize = style->klass->xthickness;
+        break;
+    case eSystemAttr_Size_WindowBorderHeight:
+        aInfo->mSize = style->klass->ythickness;
+        break;
+    case eSystemAttr_Size_Widget3DBorder:
+        aInfo->mSize = 4;
+        break;
+    //---------
+    // Fonts
+    //---------
+    case eSystemAttr_Font_Caption:
+    case eSystemAttr_Font_Icon:
+    case eSystemAttr_Font_Menu:
+    case eSystemAttr_Font_MessageBox:
+    case eSystemAttr_Font_SmallCaption:
+    case eSystemAttr_Font_StatusBar:
+    case eSystemAttr_Font_Tooltips:
+    case eSystemAttr_Font_Widget:
+      status = NS_ERROR_FAILURE;
+      break;
+  } // switch
+
+  gtk_style_unref(style);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetDrawingSurface(nsIRenderingContext &aContext, 
+                                                    nsDrawingSurface &aSurface)
+{
+  aContext.CreateDrawingSurface(nsnull, 0, aSurface);
+  return nsnull == aSurface ? NS_ERROR_OUT_OF_MEMORY : NS_OK;  
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::ConvertPixel(nscolor aColor, 
+                                               PRUint32 & aPixel)
+{
+  aPixel = ::gdk_rgb_xpixel_from_rgb (NS_TO_GDK_RGB(aColor));
+
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP nsDeviceContextGTK::CheckFontExistence(const nsString& aFontName)
+{
+  char        **fnames = nsnull;
+  PRInt32     namelen = aFontName.Length() + 1;
+  char        *wildstring = (char *)PR_Malloc(namelen + 200);
+  float       t2d;
+  GetTwipsToDevUnits(t2d);
+  PRInt32     dpi = NSToIntRound(t2d * 1440);
+  int         numnames = 0;
+  XFontStruct *fonts;
+  nsresult    rv = NS_ERROR_FAILURE;
+  
+  if (nsnull == wildstring)
+    return NS_ERROR_UNEXPECTED;
+  
+  if (abs(dpi - 75) < abs(dpi - 100))
+    dpi = 75;
+  else
+    dpi = 100;
+  
+  char* fontName = aFontName.ToNewCString();
+  PR_snprintf(wildstring, namelen + 200,
+             "*-%s-*-*-normal--*-*-%d-%d-*-*-*",
+             fontName, dpi, dpi);
+  delete [] fontName;
+  
+  fnames = ::XListFontsWithInfo(GDK_DISPLAY(), wildstring, 1, &numnames, &fonts);
+  
+  if (numnames > 0)
+  {
+    ::XFreeFontInfo(fnames, fonts, numnames);
+    rv = NS_OK;
+  }
+  
+  PR_Free(wildstring);
+  
+  return rv;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetDeviceSurfaceDimensions(PRInt32 &aWidth, PRInt32 &aHeight)
+{
+  aWidth = 1;
+  aHeight = 1;
+
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetDeviceContextFor(nsIDeviceContextSpec *aDevice,
+                                                      nsIDeviceContext *&aContext)
+{
+  // Create a Postscript device context 
+  aContext = new nsDeviceContextPS();
+  ((nsDeviceContextPS *)aContext)->SetSpec(aDevice);
+  NS_ADDREF(aDevice);
+  return((nsDeviceContextPS *) aContext)->Init((nsIDeviceContext*)aContext, (nsIDeviceContext*)this);
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::BeginDocument(void)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::EndDocument(void)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::BeginPage(void)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::EndPage(void)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetDepth(PRUint32& aDepth)
+{
+  GdkVisual * rgb_visual = gdk_rgb_get_visual();
+
+  gint rgb_depth = rgb_visual->depth;
+
+  aDepth = (PRUint32) rgb_depth;
+
+  return NS_OK;
+}

mozilla/gfx/src/gtk/nsDeviceContextGTK.h

@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsDeviceContextGTK_h___
+#define nsDeviceContextGTK_h___
+
+#include "nsDeviceContext.h"
+#include "nsUnitConversion.h"
+#include "nsIWidget.h"
+#include "nsIView.h"
+#include "nsIRenderingContext.h"
+
+#include "nsRenderingContextGTK.h"
+
+class nsDeviceContextGTK : public DeviceContextImpl
+{
+public:
+  nsDeviceContextGTK();
+  virtual ~nsDeviceContextGTK();
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD  Init(nsNativeWidget aNativeWidget);
+
+  NS_IMETHOD  CreateRenderingContext(nsIRenderingContext *&aContext);
+  NS_IMETHOD  SupportsNativeWidgets(PRBool &aSupportsWidgets);
+
+  NS_IMETHOD  GetScrollBarDimensions(float &aWidth, float &aHeight) const;
+  NS_IMETHOD  GetSystemAttribute(nsSystemAttrID anID, SystemAttrStruct * aInfo) const;
+
+  //get a low level drawing surface for rendering. the rendering context
+  //that is passed in is used to create the drawing surface if there isn't
+  //already one in the device context. the drawing surface is then cached
+  //in the device context for re-use.
+
+  NS_IMETHOD GetDrawingSurface(nsIRenderingContext &aContext, nsDrawingSurface &aSurface);
+
+  NS_IMETHOD ConvertPixel(nscolor aColor, PRUint32 & aPixel);
+  NS_IMETHOD CheckFontExistence(const nsString& aFontName);
+
+  NS_IMETHOD GetDeviceSurfaceDimensions(PRInt32 &aWidth, PRInt32 &aHeight);
+
+  NS_IMETHOD GetDeviceContextFor(nsIDeviceContextSpec *aDevice,
+                                 nsIDeviceContext *&aContext);
+
+  NS_IMETHOD BeginDocument(void);
+  NS_IMETHOD EndDocument(void);
+
+  NS_IMETHOD BeginPage(void);
+  NS_IMETHOD EndPage(void);
+
+  NS_IMETHOD GetDepth(PRUint32& aDepth);
+
+private:
+  PRUint32      mDepth;
+  PRBool        mWriteable;
+  nsPaletteInfo mPaletteInfo;
+  PRUint32 mNumCells;
+  PRInt16 mScrollbarHeight;
+  PRInt16 mScrollbarWidth;
+};
+
+#endif /* nsDeviceContextGTK_h___ */
+

mozilla/gfx/src/gtk/nsDeviceContextSpecFactoryG.cpp

@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsDeviceContextSpecFactoryG.h"
+#include "nsDeviceContextSpecG.h"
+#include "nsGfxCIID.h"
+#include "plstr.h"
+
+/** -------------------------------------------------------
+ *  Constructor
+ *  @update   dc 2/16/98
+ */
+nsDeviceContextSpecFactoryGTK :: nsDeviceContextSpecFactoryGTK()
+{
+}
+
+/** -------------------------------------------------------
+ *  Destructor
+ *  @update   dc 2/16/98
+ */
+nsDeviceContextSpecFactoryGTK :: ~nsDeviceContextSpecFactoryGTK()
+{
+}
+
+static NS_DEFINE_IID(kDeviceContextSpecFactoryIID, NS_IDEVICE_CONTEXT_SPEC_FACTORY_IID);
+static NS_DEFINE_IID(kIDeviceContextSpecIID, NS_IDEVICE_CONTEXT_SPEC_IID);
+static NS_DEFINE_IID(kDeviceContextSpecCID, NS_DEVICE_CONTEXT_SPEC_CID);
+
+NS_IMPL_QUERY_INTERFACE(nsDeviceContextSpecFactoryGTK, kDeviceContextSpecFactoryIID)
+NS_IMPL_ADDREF(nsDeviceContextSpecFactoryGTK)
+NS_IMPL_RELEASE(nsDeviceContextSpecFactoryGTK)
+
+/** -------------------------------------------------------
+ *  Initialize the device context spec factory
+ *  @update   dc 2/16/98
+ */
+NS_IMETHODIMP nsDeviceContextSpecFactoryGTK :: Init(void)
+{
+  return NS_OK;
+}
+
+/** -------------------------------------------------------
+ *  Get a device context specification
+ *  @update   dc 2/16/98
+ */
+NS_IMETHODIMP nsDeviceContextSpecFactoryGTK :: CreateDeviceContextSpec(nsIDeviceContextSpec *aOldSpec,
+                                                                       nsIDeviceContextSpec *&aNewSpec,
+                                                                       PRBool aQuiet)
+{
+nsresult  						rv = NS_ERROR_FAILURE;
+nsIDeviceContextSpec  *devSpec = nsnull;
+
+	nsComponentManager::CreateInstance(kDeviceContextSpecCID, nsnull, kIDeviceContextSpecIID, (void **)&devSpec);
+
+	if (nsnull != devSpec){
+	  if (NS_OK == ((nsDeviceContextSpecGTK *)devSpec)->Init(aQuiet)){
+	    aNewSpec = devSpec;
+	    rv = NS_OK;
+	  }
+	}
+	return rv;
+}

mozilla/gfx/src/gtk/nsDeviceContextSpecFactoryG.h

@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsDeviceContextSpecFactoryG_h___
+#define nsDeviceContextSpecFactoryG_h___
+
+#include "nsIDeviceContextSpecFactory.h"
+#include "nsIDeviceContextSpec.h"
+
+class nsDeviceContextSpecFactoryGTK : public nsIDeviceContextSpecFactory
+{
+public:
+  nsDeviceContextSpecFactoryGTK();
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD Init(void);
+  NS_IMETHOD CreateDeviceContextSpec(nsIDeviceContextSpec *aOldSpec,
+                                     nsIDeviceContextSpec *&aNewSpec,
+                                     PRBool aQuiet);
+
+protected:
+  virtual ~nsDeviceContextSpecFactoryGTK();
+};
+
+#endif

mozilla/gfx/src/gtk/nsDeviceContextSpecG.cpp

@@ -0,0 +1,197 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsDeviceContextSpecG.h"
+#include "prenv.h" /* for PR_GetEnv */
+
+//#include "prmem.h"
+//#include "plstr.h"
+
+/** -------------------------------------------------------
+ *  Construct the nsDeviceContextSpecGTK
+ *  @update   dc 12/02/98
+ */
+nsDeviceContextSpecGTK :: nsDeviceContextSpecGTK()
+{
+  NS_INIT_REFCNT();
+	
+}
+
+/** -------------------------------------------------------
+ *  Destroy the nsDeviceContextSpecGTK
+ *  @update   dc 2/15/98
+ */
+nsDeviceContextSpecGTK :: ~nsDeviceContextSpecGTK()
+{
+}
+
+static NS_DEFINE_IID(kIDeviceContextSpecIID, NS_IDEVICE_CONTEXT_SPEC_IID);
+static NS_DEFINE_IID(kIDeviceContextSpecPSIID, NS_IDEVICE_CONTEXT_SPEC_PS_IID);
+
+#if 0
+NS_IMPL_QUERY_INTERFACE(nsDeviceContextSpecGTK, kDeviceContextSpecIID)
+NS_IMPL_ADDREF(nsDeviceContextSpecGTK)
+NS_IMPL_RELEASE(nsDeviceContextSpecGTK)
+#endif
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: QueryInterface(REFNSIID aIID, void** aInstancePtr)
+{
+  if (nsnull == aInstancePtr)
+    return NS_ERROR_NULL_POINTER;
+
+  if (aIID.Equals(kIDeviceContextSpecIID))
+  {
+    nsIDeviceContextSpec* tmp = this;
+    *aInstancePtr = (void*) tmp;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  if (aIID.Equals(kIDeviceContextSpecPSIID))
+  {
+    nsIDeviceContextSpecPS* tmp = this;
+    *aInstancePtr = (void*) tmp;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+
+  if (aIID.Equals(kISupportsIID))
+  {
+    nsIDeviceContextSpec* tmp = this;
+    nsISupports* tmp2 = tmp;
+    *aInstancePtr = (void*) tmp2;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  return NS_NOINTERFACE;
+}
+
+NS_IMPL_ADDREF(nsDeviceContextSpecGTK)
+NS_IMPL_RELEASE(nsDeviceContextSpecGTK)
+
+/** -------------------------------------------------------
+ *  Initialize the nsDeviceContextSpecGTK
+ *  @update   dc 2/15/98
+ *  @update   syd 3/2/99
+ */
+NS_IMETHODIMP nsDeviceContextSpecGTK :: Init(PRBool	aQuiet)
+{
+  char *path;
+
+  // XXX these settings should eventually come out of preferences 
+
+  mPrData.toPrinter = PR_TRUE;
+  mPrData.fpf = PR_TRUE;
+  mPrData.grayscale = PR_FALSE;
+  mPrData.size = NS_LETTER_SIZE;
+  sprintf( mPrData.command, "lpr" );
+
+  // PWD, HOME, or fail 
+
+  if ( ( path = PR_GetEnv( "PWD" ) ) == (char *) NULL ) 
+	if ( ( path = PR_GetEnv( "HOME" ) ) == (char *) NULL )
+  		strcpy( mPrData.path, "netscape.ps" );
+  if ( path != (char *) NULL )
+	sprintf( mPrData.path, "%s/netscape.ps", path );
+  else
+	return NS_ERROR_FAILURE;
+
+  ::UnixPrDialog( &mPrData );
+  if ( mPrData.cancel == PR_TRUE ) 
+	return NS_ERROR_FAILURE;
+  else
+        return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetToPrinter( PRBool &aToPrinter )     
+{
+  aToPrinter = mPrData.toPrinter;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetFirstPageFirst ( PRBool &aFpf )      
+{
+  aFpf = mPrData.fpf;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetGrayscale ( PRBool &aGrayscale )      
+{
+  aGrayscale = mPrData.grayscale;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetSize ( int &aSize )      
+{
+  aSize = mPrData.size;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetTopMargin ( float &value )      
+{
+  value = mPrData.top;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetBottomMargin ( float &value )      
+{
+  value = mPrData.bottom;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetRightMargin ( float &value )      
+{
+  value = mPrData.right;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetLeftMargin ( float &value )      
+{
+  value = mPrData.left;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetCommand ( char **aCommand )      
+{
+  *aCommand = &mPrData.command[0];
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetPath ( char **aPath )      
+{
+  *aPath = &mPrData.path[0];
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetUserCancelled( PRBool &aCancel )     
+{
+  aCancel = mPrData.cancel;
+  return NS_OK;
+}
+
+/** -------------------------------------------------------
+ * Closes the printmanager if it is open.
+ *  @update   dc 2/15/98
+ */
+NS_IMETHODIMP nsDeviceContextSpecGTK :: ClosePrintManager()
+{
+	return NS_OK;
+}  

mozilla/gfx/src/gtk/nsDeviceContextSpecG.h

@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsDeviceContextSpecG_h___
+#define nsDeviceContextSpecG_h___
+
+#include "nsIDeviceContextSpec.h"
+#include "nsDeviceContextSpecG.h"
+#include "nsIDeviceContextSpecPS.h"
+
+#include "nsPrintdGTK.h"
+
+class nsDeviceContextSpecGTK : public nsIDeviceContextSpec ,
+                                      public nsIDeviceContextSpecPS
+{
+public:
+/**
+ * Construct a nsDeviceContextSpecMac, which is an object which contains and manages a mac printrecord
+ * @update  dc 12/02/98
+ */
+  nsDeviceContextSpecGTK();
+
+  NS_DECL_ISUPPORTS
+
+/**
+ * Initialize the nsDeviceContextSpecMac for use.  This will allocate a printrecord for use
+ * @update   dc 2/16/98
+ * @param aQuiet if PR_TRUE, prevent the need for user intervention
+ *        in obtaining device context spec. if nsnull is passed in for
+ *        the aOldSpec, this will typically result in getting a device
+ *        context spec for the default output device (i.e. default
+ *        printer).
+ * @return error status
+ */
+  NS_IMETHOD Init(PRBool	aQuiet);
+  
+  
+/**
+ * Closes the printmanager if it is open.
+ * @update   dc 2/13/98
+ * @update   syd 3/20/99
+ * @return error status
+ */
+
+  NS_IMETHOD ClosePrintManager();
+
+  NS_IMETHOD GetToPrinter( PRBool &aToPrinter ); 
+
+  NS_IMETHOD GetFirstPageFirst ( PRBool &aFpf );     
+
+  NS_IMETHOD GetGrayscale( PRBool &aGrayscale );   
+
+  NS_IMETHOD GetSize ( int &aSize ); 
+
+  NS_IMETHOD GetTopMargin ( float &value ); 
+
+  NS_IMETHOD GetBottomMargin ( float &value ); 
+
+  NS_IMETHOD GetLeftMargin ( float &value ); 
+
+  NS_IMETHOD GetRightMargin ( float &value ); 
+
+  NS_IMETHOD GetCommand ( char **aCommand );   
+
+  NS_IMETHOD GetPath ( char **aPath );    
+
+  NS_IMETHOD GetUserCancelled( PRBool &aCancel );      
+
+protected:
+/**
+ * Destuct a nsDeviceContextSpecMac, this will release the printrecord
+ * @update  dc 2/16/98
+ */
+  virtual ~nsDeviceContextSpecGTK();
+
+protected:
+
+  UnixPrData mPrData;
+	
+};
+
+#endif

mozilla/gfx/src/gtk/nsDrawingSurfaceGTK.cpp

@@ -0,0 +1,367 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#if defined (HAVE_IPC_H) && defined (HAVE_SHM_H) && defined (HAVE_XSHM_H)
+#define USE_SHM
+#endif
+
+//#define USE_SHM
+
+#include <gdk/gdkx.h>
+#include <gdk/gdkprivate.h>
+#ifdef USE_SHM
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <X11/extensions/XShm.h>
+#endif /* USE_SHM */
+#include "nsDrawingSurfaceGTK.h"
+
+static NS_DEFINE_IID(kIDrawingSurfaceIID, NS_IDRAWING_SURFACE_IID);
+static NS_DEFINE_IID(kIDrawingSurfaceGTKIID, NS_IDRAWING_SURFACE_GTK_IID);
+
+nsDrawingSurfaceGTK :: nsDrawingSurfaceGTK()
+{
+  NS_INIT_REFCNT();
+  GdkVisual *v;
+
+  mPixmap = nsnull;
+  mGC = nsnull;
+  mDepth = 0;
+  mWidth = mHeight = 0;
+  mFlags = 0;
+
+  mImage = nsnull;
+  mLockWidth = mLockHeight = 0;
+  mLockFlags = 0;
+  mLocked = PR_FALSE;
+
+  v = ::gdk_rgb_get_visual();
+
+  mPixFormat.mRedMask = v->red_mask;
+  mPixFormat.mGreenMask = v->green_mask;
+  mPixFormat.mBlueMask = v->blue_mask;
+  // FIXME
+  mPixFormat.mAlphaMask = 0;
+
+  mPixFormat.mRedShift = v->red_shift;
+  mPixFormat.mGreenShift = v->green_shift;
+  mPixFormat.mBlueShift = v->blue_shift;
+  // FIXME
+  mPixFormat.mAlphaShift = 0;
+
+  mDepth = v->depth;
+}
+
+nsDrawingSurfaceGTK :: ~nsDrawingSurfaceGTK()
+{
+  if (mPixmap)
+    ::gdk_pixmap_unref(mPixmap);
+
+  if (mImage)
+    ::gdk_image_destroy(mImage);
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: QueryInterface(REFNSIID aIID, void** aInstancePtr)
+{
+  if (nsnull == aInstancePtr)
+    return NS_ERROR_NULL_POINTER;
+
+  if (aIID.Equals(kIDrawingSurfaceIID))
+  {
+    nsIDrawingSurface* tmp = this;
+    *aInstancePtr = (void*) tmp;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  if (aIID.Equals(kIDrawingSurfaceGTKIID))
+  {
+    nsDrawingSurfaceGTK* tmp = this;
+    *aInstancePtr = (void*) tmp;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+
+  if (aIID.Equals(kISupportsIID))
+  {
+    nsIDrawingSurface* tmp = this;
+    nsISupports* tmp2 = tmp;
+    *aInstancePtr = (void*) tmp2;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  return NS_NOINTERFACE;
+}
+
+NS_IMPL_ADDREF(nsDrawingSurfaceGTK);
+NS_IMPL_RELEASE(nsDrawingSurfaceGTK);
+
+
+  /**
+   * Lock a rect of a drawing surface and return a
+   * pointer to the upper left hand corner of the
+   * bitmap.
+   * @param  aX x position of subrect of bitmap
+   * @param  aY y position of subrect of bitmap
+   * @param  aWidth width of subrect of bitmap
+   * @param  aHeight height of subrect of bitmap
+   * @param  aBits out parameter for upper left hand
+   *         corner of bitmap
+   * @param  aStride out parameter for number of bytes
+   *         to add to aBits to go from scanline to scanline
+   * @param  aWidthBytes out parameter for number of
+   *         bytes per line in aBits to process aWidth pixels
+   * @return error status
+   *
+   **/
+NS_IMETHODIMP nsDrawingSurfaceGTK :: Lock(PRInt32 aX, PRInt32 aY,
+                                          PRUint32 aWidth, PRUint32 aHeight,
+                                          void **aBits, PRInt32 *aStride,
+                                          PRInt32 *aWidthBytes, PRUint32 aFlags)
+{
+#if 0
+  g_print("nsDrawingSurfaceGTK::Lock() called\n" \
+          "  aX = %i, aY = %i,\n" \
+	  "  aWidth = %i, aHeight = %i,\n" \
+	  "  aBits, aStride, aWidthBytes,\n" \
+	  "  aFlags = %i\n", aX, aY, aWidth, aHeight, aFlags);
+#endif
+
+  if (mLocked)
+  {
+    NS_ASSERTION(0, "nested lock attempt");
+    return NS_ERROR_FAILURE;
+  }
+  mLocked = PR_TRUE;
+
+  mLockX = aX;
+  mLockY = aY;
+  mLockWidth = aWidth;
+  mLockHeight = aHeight;
+  mLockFlags = aFlags;
+
+  // Obtain an ximage from the pixmap.
+#ifdef USE_SHM
+  if (gdk_get_use_xshm())
+  {
+    mImage = gdk_image_new(GDK_IMAGE_FASTEST,
+                           gdk_rgb_get_visual(),
+                           mLockWidth,
+                           mLockHeight);
+    
+    XShmGetImage(GDK_DISPLAY(),
+                 GDK_WINDOW_XWINDOW(mPixmap),
+                 GDK_IMAGE_XIMAGE(mImage),
+                 mLockX, mLockY,
+                 0xFFFFFFFF);
+
+    gdk_flush();
+  }
+  else
+  {
+#endif /* USE_SHM */
+    mImage = ::gdk_image_get(mPixmap, mLockX, mLockY, mLockWidth, mLockHeight);
+#ifdef USE_SHM
+  }
+#endif /* USE_SHM */
+
+  *aBits = GDK_IMAGE_XIMAGE(mImage)->data;
+
+  *aWidthBytes = GDK_IMAGE_XIMAGE(mImage)->bytes_per_line;
+  *aStride = GDK_IMAGE_XIMAGE(mImage)->bytes_per_line;
+
+
+#if 0
+  int bytes_per_line = GDK_IMAGE_XIMAGE(mImage)->bytes_per_line;
+
+  //
+  // All this code is a an attempt to set the stride width properly.
+  // Needs to be cleaned up alot.  For now, it will only work in the
+  // case where aWidthBytes and aStride are the same.  One is assigned to 
+  // the other.
+  // 
+
+  *aWidthBytes = mImage->bpl;
+  *aStride = mImage->bpl;
+
+  int width_in_pixels = *aWidthBytes << 8;
+
+
+  int bitmap_pad = GDK_IMAGE_XIMAGE(mImage)->bitmap_pad;
+  int depth = GDK_IMAGE_XIMAGE(mImage)->depth;
+
+#define RASWIDTH8(width, bpp) (width)
+#define RASWIDTH16(width, bpp) ((((width) * (bpp) + 15) >> 4) << 1)
+#define RASWIDTH32(width, bpp) ((((width) * (bpp) + 31) >> 5) << 2)
+
+  switch(bitmap_pad)
+    {
+    case 8:
+      *aStride = RASWIDTH8(aWidth,bitmap_pad);
+      break;
+
+    case 16:
+      *aStride = bytes_per_line;
+      *aStride = RASWIDTH16(aWidth,bitmap_pad);
+      break;
+
+    case 32:
+      *aStride = bytes_per_line;
+      *aStride = RASWIDTH32(aWidth,bitmap_pad);
+      break;
+
+    default:
+
+      NS_ASSERTION(nsnull,"something got screwed");
+
+    }
+
+  *aStride = (*aWidthBytes) + ((bitmap_pad >> 3) - 1);
+
+  GDK_IMAGE_XIMAGE(mImage)->bitmap_pad;
+
+  *aWidthBytes = mImage->bpl;
+#endif
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: Unlock(void)
+{
+  //  g_print("nsDrawingSurfaceGTK::UnLock() called\n");
+  if (!mLocked)
+  {
+    NS_ASSERTION(0, "attempting to unlock an DS that isn't locked");
+    return NS_ERROR_FAILURE;
+  }
+
+  // If the lock was not read only, put the bits back on the pixmap
+  if (!(mLockFlags & NS_LOCK_SURFACE_READ_ONLY))
+  {
+#if 0
+    g_print("gdk_draw_image(pixmap=%p,lockx=%d,locky=%d,lockw=%d,lockh=%d)\n",
+            mPixmap,
+            mLockX, mLockY,
+            mLockWidth, mLockHeight);
+#endif
+
+    gdk_draw_image(mPixmap,
+                   mGC,
+                   mImage,
+                   0, 0,
+                   mLockX, mLockY,
+                   mLockWidth, mLockHeight);
+
+  }
+
+  // FIXME if we are using shared mem, we shouldn't destroy the image...
+  if (mImage)
+    ::gdk_image_destroy(mImage);
+  mImage = nsnull;
+
+  mLocked = PR_FALSE;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: GetDimensions(PRUint32 *aWidth, PRUint32 *aHeight)
+{
+  *aWidth = mWidth;
+  *aHeight = mHeight;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: IsOffscreen(PRBool *aOffScreen)
+{
+  *aOffScreen = mIsOffscreen;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: IsPixelAddressable(PRBool *aAddressable)
+{
+// FIXME
+  *aAddressable = PR_FALSE;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: GetPixelFormat(nsPixelFormat *aFormat)
+{
+  *aFormat = mPixFormat;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: Init(GdkDrawable *aDrawable, GdkGC *aGC)
+{
+  mGC = aGC;
+  mPixmap = aDrawable;
+// this is definatly going to be on the screen, as it will be the window of a
+// widget or something.
+  mIsOffscreen = PR_FALSE;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: Init(GdkGC *aGC, PRUint32 aWidth,
+                                          PRUint32 aHeight, PRUint32 aFlags)
+{
+//  ::g_return_val_if_fail (aGC != nsnull, NS_ERROR_FAILURE);
+//  ::g_return_val_if_fail ((aWidth > 0) && (aHeight > 0), NS_ERROR_FAILURE);
+
+  mGC = aGC;
+  mWidth = aWidth;
+  mHeight = aHeight;
+  mFlags = aFlags;
+
+// we can draw on this offscreen because it has no parent
+  mIsOffscreen = PR_TRUE;
+
+  mPixmap = ::gdk_pixmap_new(nsnull, mWidth, mHeight, mDepth);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: GetGC(GdkGC *aGC)
+{
+  aGC = ::gdk_gc_ref(mGC);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: ReleaseGC(void)
+{
+  ::gdk_gc_unref(mGC);
+  return NS_OK;
+}
+
+/* below are utility functions used mostly for nsRenderingContext and nsImage
+ * to plug into gdk_* functions for drawing.  You should not set a pointer
+ * that might hang around with the return from these.  instead use the ones
+ * above.  pav
+ */
+GdkGC *nsDrawingSurfaceGTK::GetGC(void)
+{
+  return mGC;
+}
+
+GdkDrawable *nsDrawingSurfaceGTK::GetDrawable(void)
+{
+  return mPixmap;
+}
+

mozilla/gfx/src/gtk/nsDrawingSurfaceGTK.h

@@ -0,0 +1,85 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsDrawingSurfaceGTK_h___
+#define nsDrawingSurfaceGTK_h___
+
+#include "nsIDrawingSurface.h"
+#include "nsIDrawingSurfaceGTK.h"
+
+#include <gtk/gtk.h>
+
+class nsDrawingSurfaceGTK : public nsIDrawingSurface,
+                            public nsIDrawingSurfaceGTK
+{
+public:
+  nsDrawingSurfaceGTK();
+  virtual ~nsDrawingSurfaceGTK();
+
+  NS_DECL_ISUPPORTS
+
+  //nsIDrawingSurface interface
+
+  NS_IMETHOD Lock(PRInt32 aX, PRInt32 aY, PRUint32 aWidth, PRUint32 aHeight,
+                  void **aBits, PRInt32 *aStride, PRInt32 *aWidthBytes,
+                  PRUint32 aFlags);
+  NS_IMETHOD Unlock(void);
+  NS_IMETHOD GetDimensions(PRUint32 *aWidth, PRUint32 *aHeight);
+  NS_IMETHOD IsOffscreen(PRBool *aOffScreen);
+  NS_IMETHOD IsPixelAddressable(PRBool *aAddressable);
+  NS_IMETHOD GetPixelFormat(nsPixelFormat *aFormat);
+
+  //nsIDrawingSurfaceGTK interface
+
+  NS_IMETHOD Init(GdkDrawable *aDrawable, GdkGC *aGC);
+  NS_IMETHOD Init(GdkGC *aGC, PRUint32 aWidth, PRUint32 aHeight, PRUint32 aFlags);
+
+/* get the GC and manage the GdkGC's refcount */
+  NS_IMETHOD GetGC(GdkGC *aGC);
+  NS_IMETHOD ReleaseGC(void);
+
+/* below are utility functions used mostly for nsRenderingContext and nsImage
+ * to plug into gdk_* functions for drawing.  You should not set a pointer
+ * that might hang around with the return from these.  instead use the ones
+ * above.  pav
+ */
+  GdkGC *GetGC(void);
+  GdkDrawable *GetDrawable(void);
+
+private:
+  /* general */
+  GdkPixmap	*mPixmap;
+  GdkGC		*mGC;
+  gint		mDepth;
+  nsPixelFormat	mPixFormat;
+  PRUint32      mWidth;
+  PRUint32      mHeight;
+  PRUint32	mFlags;
+  PRBool	mIsOffscreen;
+
+  /* for locks */
+  GdkImage	*mImage;
+  PRInt32	mLockX;
+  PRInt32	mLockY;
+  PRUint32	mLockWidth;
+  PRUint32	mLockHeight;
+  PRUint32	mLockFlags;
+  PRBool	mLocked;
+};
+
+#endif

mozilla/gfx/src/gtk/nsFontMetricsGTK.h

@@ -0,0 +1,162 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsFontMetricsGTK_h__
+#define nsFontMetricsGTK_h__
+
+#include "nsIFontMetrics.h"
+#include "nsFont.h"
+#include "nsString.h"
+#include "nsUnitConversion.h"
+#include "nsIDeviceContext.h"
+#include "nsCRT.h"
+#include "nsDeviceContextGTK.h"
+
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+
+#define FONT_SWITCHING
+#ifdef FONT_SWITCHING
+
+#ifdef ADD_GLYPH
+#undef ADD_GLYPH
+#endif
+#define ADD_GLYPH(map, g) (map)[(g) >> 3] |= (1 << ((g) & 7))
+
+#ifdef FONT_HAS_GLYPH
+#undef FONT_HAS_GLYPH
+#endif
+#define FONT_HAS_GLYPH(map, g) (((map)[(g) >> 3] >> ((g) & 7)) & 1)
+
+typedef struct nsFontCharSetInfo nsFontCharSetInfo;
+
+typedef gint (*nsFontCharSetConverter)(nsFontCharSetInfo* aSelf,
+  const PRUnichar* aSrcBuf, PRUint32 aSrcLen, PRUint8* aDestBuf,
+  PRUint32 aDestLen);
+
+struct nsFontCharSet;
+class nsFontMetricsGTK;
+
+struct nsFontGTK
+{
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
+
+  void LoadFont(nsFontCharSet* aCharSet, nsFontMetricsGTK* aMetrics);
+
+  GdkFont*               mFont;
+  PRUint8*               mMap;
+  nsFontCharSetInfo*     mCharSetInfo;
+  char*                  mName;
+  PRUint16               mSize;
+  PRUint16               mActualSize;
+  PRInt16                mBaselineAdjust;
+};
+
+struct nsFontStretch;
+struct nsFontFamily;
+typedef struct nsFontSearch nsFontSearch;
+
+#endif /* FONT_SWITCHING */
+
+class nsFontMetricsGTK : public nsIFontMetrics
+{
+public:
+  nsFontMetricsGTK();
+  virtual ~nsFontMetricsGTK();
+
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD  Init(const nsFont& aFont, nsIDeviceContext* aContext);
+  NS_IMETHOD  Destroy();
+
+  NS_IMETHOD  GetXHeight(nscoord& aResult);
+  NS_IMETHOD  GetSuperscriptOffset(nscoord& aResult);
+  NS_IMETHOD  GetSubscriptOffset(nscoord& aResult);
+  NS_IMETHOD  GetStrikeout(nscoord& aOffset, nscoord& aSize);
+  NS_IMETHOD  GetUnderline(nscoord& aOffset, nscoord& aSize);
+
+  NS_IMETHOD  GetHeight(nscoord &aHeight);
+  NS_IMETHOD  GetLeading(nscoord &aLeading);
+  NS_IMETHOD  GetMaxAscent(nscoord &aAscent);
+  NS_IMETHOD  GetMaxDescent(nscoord &aDescent);
+  NS_IMETHOD  GetMaxAdvance(nscoord &aAdvance);
+  NS_IMETHOD  GetFont(const nsFont *&aFont);
+  NS_IMETHOD  GetFontHandle(nsFontHandle &aHandle);
+
+#ifdef FONT_SWITCHING
+
+  nsFontGTK*  FindFont(PRUnichar aChar);
+  static gint GetWidth(nsFontGTK* aFont, const PRUnichar* aString,
+                       PRUint32 aLength);
+  static void DrawString(nsDrawingSurfaceGTK* aSurface, nsFontGTK* aFont,
+                         nscoord aX, nscoord aY, const PRUnichar* aString,
+			 PRUint32 aLength);
+  static void InitFonts(void);
+
+  friend void PickASizeAndLoad(nsFontSearch* aSearch, nsFontStretch* aStretch,
+                               nsFontCharSet* aCharSet);
+  friend void TryCharSet(nsFontSearch* aSearch, nsFontCharSet* aCharSet);
+  friend void TryFamily(nsFontSearch* aSearch, nsFontFamily* aFamily);
+  friend struct nsFontGTK;
+
+  nsFontGTK   **mLoadedFonts;
+  PRUint16    mLoadedFontsAlloc;
+  PRUint16    mLoadedFontsCount;
+
+  nsString    *mFonts;
+  PRUint16    mFontsAlloc;
+  PRUint16    mFontsCount;
+  PRUint16    mFontsIndex;
+
+#endif /* FONT_SWITCHING */
+
+protected:
+  char *PickAppropriateSize(char **names, XFontStruct *fonts, int cnt, nscoord desired);
+  void RealizeFont();
+
+  nsIDeviceContext    *mDeviceContext;
+  nsFont              *mFont;
+  GdkFont             *mFontHandle;
+
+  nscoord             mHeight;
+  nscoord             mAscent;
+  nscoord             mDescent;
+  nscoord             mLeading;
+  nscoord             mMaxAscent;
+  nscoord             mMaxDescent;
+  nscoord             mMaxAdvance;
+  nscoord             mXHeight;
+  nscoord             mSuperscriptOffset;
+  nscoord             mSubscriptOffset;
+  nscoord             mStrikeoutSize;
+  nscoord             mStrikeoutOffset;
+  nscoord             mUnderlineSize;
+  nscoord             mUnderlineOffset;
+
+#ifdef FONT_SWITCHING
+
+  PRUint16            mPixelSize;
+  PRUint8             mStretchIndex;
+  PRUint8             mStyleIndex;
+
+#endif /* FONT_SWITCHING */
+};
+
+#endif

mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp

@@ -0,0 +1,205 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include <gtk/gtk.h>
+
+#include "nscore.h"
+#include "nsIFactory.h"
+#include "nsISupports.h"
+#include "nsGfxCIID.h"
+#include "nsFontMetricsGTK.h"
+#include "nsRenderingContextGTK.h"
+#include "nsImageGTK.h"
+#include "nsDeviceContextGTK.h"
+#include "nsRegionGTK.h"
+#include "nsBlender.h"
+#include "nsDeviceContextSpecG.h"
+#include "nsDeviceContextSpecFactoryG.h" 
+#include "nsIDeviceContextSpecPS.h"
+
+static NS_DEFINE_IID(kCFontMetrics, NS_FONT_METRICS_CID);
+static NS_DEFINE_IID(kCRenderingContext, NS_RENDERING_CONTEXT_CID);
+static NS_DEFINE_IID(kCImage, NS_IMAGE_CID);
+static NS_DEFINE_IID(kCDeviceContext, NS_DEVICE_CONTEXT_CID);
+static NS_DEFINE_IID(kCRegion, NS_REGION_CID);
+
+static NS_DEFINE_IID(kCBlender, NS_BLENDER_CID);
+
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
+
+static NS_DEFINE_IID(kCDeviceContextSpec, NS_DEVICE_CONTEXT_SPEC_CID);
+static NS_DEFINE_IID(kCDeviceContextSpecFactory, NS_DEVICE_CONTEXT_SPEC_FACTORY_CID); 
+
+
+class nsGfxFactoryGTK : public nsIFactory
+{   
+  public:   
+    // nsISupports methods   
+    NS_IMETHOD QueryInterface(const nsIID &aIID,    
+                                       void **aResult);   
+    NS_IMETHOD_(nsrefcnt) AddRef(void);   
+    NS_IMETHOD_(nsrefcnt) Release(void);   
+
+    // nsIFactory methods   
+    NS_IMETHOD CreateInstance(nsISupports *aOuter,   
+                                       const nsIID &aIID,   
+                                       void **aResult);   
+
+    NS_IMETHOD LockFactory(PRBool aLock);   
+
+    nsGfxFactoryGTK(const nsCID &aClass);   
+    virtual ~nsGfxFactoryGTK();   
+
+  private:   
+    nsrefcnt  mRefCnt;   
+    nsCID     mClassID;
+};   
+
+nsGfxFactoryGTK::nsGfxFactoryGTK(const nsCID &aClass)   
+{   
+  mRefCnt = 0;
+  mClassID = aClass;
+}   
+
+nsGfxFactoryGTK::~nsGfxFactoryGTK()   
+{   
+  NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction");   
+}   
+
+nsresult nsGfxFactoryGTK::QueryInterface(const nsIID &aIID,   
+                                         void **aResult)   
+{   
+  if (aResult == NULL) {   
+    return NS_ERROR_NULL_POINTER;   
+  }   
+
+  // Always NULL result, in case of failure   
+  *aResult = NULL;   
+
+  if (aIID.Equals(kISupportsIID)) {   
+    *aResult = (void *)(nsISupports*)this;   
+  } else if (aIID.Equals(kIFactoryIID)) {   
+    *aResult = (void *)(nsIFactory*)this;   
+  }   
+
+  if (*aResult == NULL) {   
+    return NS_NOINTERFACE;   
+  }   
+
+  AddRef(); // Increase reference count for caller   
+  return NS_OK;   
+}   
+
+nsrefcnt nsGfxFactoryGTK::AddRef()   
+{   
+  return ++mRefCnt;   
+}   
+
+nsrefcnt nsGfxFactoryGTK::Release()   
+{   
+  if (--mRefCnt == 0) {   
+    delete this;   
+    return 0; // Don't access mRefCnt after deleting!   
+  }   
+  return mRefCnt;   
+}  
+
+nsresult nsGfxFactoryGTK::CreateInstance(nsISupports *aOuter,  
+                                          const nsIID &aIID,  
+                                          void **aResult)  
+{  
+  if (aResult == NULL) {  
+    return NS_ERROR_NULL_POINTER;  
+  }  
+
+  *aResult = NULL;  
+  
+  nsISupports *inst = nsnull;
+
+  if (mClassID.Equals(kCFontMetrics)) {
+    inst = (nsISupports *)new nsFontMetricsGTK();
+  }
+  else if (mClassID.Equals(kCDeviceContext)) {
+    inst = (nsISupports *)new nsDeviceContextGTK();
+  }
+  else if (mClassID.Equals(kCRenderingContext)) {
+    inst = (nsISupports *)new nsRenderingContextGTK();
+  }
+  else if (mClassID.Equals(kCImage)) {
+    inst = (nsISupports *)new nsImageGTK();
+  }
+  else if (mClassID.Equals(kCRegion)) {
+    inst = (nsISupports *)new nsRegionGTK();
+  }
+  else if (mClassID.Equals(kCBlender)) {
+    inst = (nsISupports *)new nsBlender;
+  }
+  else if (mClassID.Equals(kCDeviceContextSpec)) {
+    nsDeviceContextSpecGTK* dcs;
+    NS_NEWXPCOM(dcs, nsDeviceContextSpecGTK);
+    inst = (nsISupports *)((nsIDeviceContextSpecPS *)dcs);
+  }
+  else if (mClassID.Equals(kCDeviceContextSpecFactory)) {
+    nsDeviceContextSpecFactoryGTK* dcs;
+    NS_NEWXPCOM(dcs, nsDeviceContextSpecFactoryGTK);
+    inst = (nsISupports *)dcs;
+  }          
+	
+  if (inst == NULL) {  
+    return NS_ERROR_OUT_OF_MEMORY;  
+  }  
+
+  nsresult res = inst->QueryInterface(aIID, aResult);
+
+  if (res != NS_OK) {  
+    // We didn't get the right interface, so clean up  
+    delete inst;  
+  }  
+//  else {
+//    inst->Release();
+//  }
+
+  return res;  
+}  
+
+nsresult nsGfxFactoryGTK::LockFactory(PRBool aLock)  
+{  
+  // Not implemented in simplest case.  
+  return NS_OK;
+}  
+
+// return the proper factory to the caller
+extern "C" NS_GFXNONXP nsresult NSGetFactory(nsISupports* servMgr,
+                                             const nsCID &aClass,
+                                             const char *aClassName,
+                                             const char *aProgID,
+                                             nsIFactory **aFactory)
+{
+  if (nsnull == aFactory) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  *aFactory = new nsGfxFactoryGTK(aClass);
+
+  if (nsnull == aFactory) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  return (*aFactory)->QueryInterface(kIFactoryIID, (void**)aFactory);
+}

mozilla/gfx/src/gtk/nsIDrawingSurfaceGTK.h

@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsIDrawingSurfaceGTK_h___
+#define nsIDrawingSurfaceGTK_h___
+
+#include "nsIDrawingSurface.h"
+#include <gtk/gtk.h>
+
+// windows specific drawing surface method set
+
+#define NS_IDRAWING_SURFACE_GTK_IID   \
+{ 0x1ed958b0, 0xcab6, 0x11d2, \
+{ 0xa8, 0x49, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9 } }
+
+class nsIDrawingSurfaceGTK : public nsISupports
+{
+public:
+  /**
+   * Initialize a drawing surface using a windows DC.
+   * aDC is "owned" by the drawing surface until the drawing
+   * surface is destroyed.
+   * @param  aDC HDC to initialize drawing surface with
+   * @return error status
+   **/
+  NS_IMETHOD Init(GdkDrawable *aDrawable, GdkGC *aGC) = 0;
+
+  /**
+   * Initialize an offscreen drawing surface using a
+   * windows DC. aDC is not "owned" by this drawing surface, instead
+   * it is used to create a drawing surface compatible
+   * with aDC. if width or height are less than zero, aDC will
+   * be created with no offscreen bitmap installed.
+   * @param  aDC HDC to initialize drawing surface with
+   * @param  aWidth width of drawing surface
+   * @param  aHeight height of drawing surface
+   * @param  aFlags flags used to control type of drawing
+   *         surface created
+   * @return error status
+   **/
+  NS_IMETHOD Init(GdkGC *aGC, PRUint32 aWidth, PRUint32 aHeight,
+                  PRUint32 aFlags) = 0;
+
+  /**
+   * Get a windows DC that represents the drawing surface.
+   * GetDC() must be paired with ReleaseDC(). Getting a DC
+   * and Lock()ing are mutually exclusive operations.
+   * @param  aDC out parameter for HDC
+   * @return error status
+   **/
+  NS_IMETHOD GetGC(GdkGC *aGC) = 0;
+
+  /**
+   * Release a windows DC obtained by GetDC().
+   * ReleaseDC() must be preceded by a call to ReleaseDC().
+   * @return error status
+   **/
+  NS_IMETHOD ReleaseGC(void) = 0;
+
+};
+
+#endif  // nsIDrawingSurfaceGTK_h___ 

mozilla/gfx/src/gtk/nsImageGTK.cpp

@@ -0,0 +1,515 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+
+#include "nsImageGTK.h"
+#include "nsRenderingContextGTK.h"
+
+#include "nspr.h"
+
+#define IsFlagSet(a,b) (a & b)
+
+#undef CHEAP_PERFORMANCE_MEASURMENT
+
+
+// Defining this will trace the allocation of images.  This includes
+// ctor, dtor and update.
+#undef TRACE_IMAGE_ALLOCATION
+
+static NS_DEFINE_IID(kIImageIID, NS_IIMAGE_IID);
+
+//------------------------------------------------------------
+
+nsImageGTK::nsImageGTK()
+{
+  NS_INIT_REFCNT();
+  mImageBits = nsnull;
+  mWidth = 0;
+  mHeight = 0;
+  mDepth = 0;
+  mAlphaBits = nsnull;
+  mAlphaPixmap = nsnull;
+  mImagePixmap = nsnull;
+  mGC = nsnull;
+
+#ifdef TRACE_IMAGE_ALLOCATION
+  printf("nsImageGTK::nsImageGTK(this=%p)\n",
+         this);
+#endif
+}
+
+//------------------------------------------------------------
+
+nsImageGTK::~nsImageGTK()
+{
+  if(nsnull != mImageBits) {
+    delete[] (PRUint8*)mImageBits;
+    mImageBits = nsnull;
+  }
+
+  if (nsnull != mAlphaBits) {
+    delete[] (PRUint8*)mAlphaBits;
+    mAlphaBits = nsnull;
+  }
+
+  if (nsnull != mAlphaPixmap) {
+    gdk_pixmap_unref(mAlphaPixmap);
+    mAlphaPixmap = nsnull;
+  }
+
+  if (nsnull != mImagePixmap) {
+    gdk_pixmap_unref(mImagePixmap);
+    mImagePixmap = nsnull;
+  }
+
+  if (nsnull != mGC) {
+    gdk_gc_unref(mGC);
+    mGC = nsnull;
+  }
+
+#ifdef TRACE_IMAGE_ALLOCATION
+  printf("nsImageGTK::~nsImageGTK(this=%p)\n",
+         this);
+#endif
+}
+
+NS_IMPL_ISUPPORTS(nsImageGTK, kIImageIID);
+
+//------------------------------------------------------------
+
+nsresult nsImageGTK::Init(PRInt32 aWidth, PRInt32 aHeight,
+                          PRInt32 aDepth, nsMaskRequirements aMaskRequirements)
+{
+  g_return_val_if_fail ((aWidth != 0) || (aHeight != 0), NS_ERROR_FAILURE);
+
+  if (nsnull != mImageBits) {
+   delete[] (PRUint8*)mImageBits;
+   mImageBits = nsnull;
+  }
+
+  if (nsnull != mAlphaBits) {
+    delete[] (PRUint8*)mAlphaBits;
+    mAlphaBits = nsnull;
+  }
+
+  if (nsnull != mAlphaPixmap) {
+    gdk_pixmap_unref(mAlphaPixmap);
+    mAlphaPixmap = nsnull;
+  }
+
+  if (nsnull != mImagePixmap) {
+    gdk_pixmap_unref(mImagePixmap);
+    mImagePixmap = nsnull;
+  }
+
+  if (24 == aDepth) {
+    mNumBytesPixel = 3;
+  } else {
+    NS_ASSERTION(PR_FALSE, "unexpected image depth");
+    return NS_ERROR_UNEXPECTED;
+  }
+
+  mImageUpdated = PR_TRUE;
+  mWidth = aWidth;
+  mHeight = aHeight;
+  mDepth = aDepth;
+  mIsTopToBottom = PR_TRUE;
+
+#ifdef TRACE_IMAGE_ALLOCATION
+  printf("nsImageGTK::Init(this=%p,%d,%d,%d,%d)\n",
+         this,
+         aWidth,
+         aHeight,
+         aDepth,
+         aMaskRequirements);
+#endif
+
+  // create the memory for the image
+  ComputMetrics();
+
+  mImageBits = (PRUint8*) new PRUint8[mSizeImage];
+
+  switch(aMaskRequirements)
+  {
+    case nsMaskRequirements_kNoMask:
+      mAlphaBits = nsnull;
+      mAlphaWidth = 0;
+      mAlphaHeight = 0;
+      break;
+
+    case nsMaskRequirements_kNeeds1Bit:
+      mAlphaRowBytes = (aWidth + 7) / 8;
+      mAlphaDepth = 1;
+
+      // 32-bit align each row
+      mAlphaRowBytes = (mAlphaRowBytes + 3) & ~0x3;
+
+      mAlphaBits = new PRUint8[mAlphaRowBytes * aHeight];
+      mAlphaWidth = aWidth;
+      mAlphaHeight = aHeight;
+
+      mAlphaPixmap = gdk_pixmap_new(nsnull, aWidth, aHeight,
+                                    mAlphaDepth);
+      break;
+
+    case nsMaskRequirements_kNeeds8Bit:
+      mAlphaBits = nsnull;
+      mAlphaWidth = 0;
+      mAlphaHeight = 0;
+      mAlphaDepth = 8;
+      g_print("TODO: want an 8bit mask for an image..\n");
+
+      mAlphaPixmap = gdk_pixmap_new(nsnull, aWidth, aHeight,
+                                    mAlphaDepth);
+      break;
+  }
+
+
+  mImagePixmap = gdk_pixmap_new(nsnull, aWidth, aHeight,
+                                gdk_rgb_get_visual()->depth);
+  mGC = gdk_gc_new(mImagePixmap);
+
+  return NS_OK;
+}
+
+//------------------------------------------------------------
+
+PRInt32 nsImageGTK::CalcBytesSpan(PRUint32  aWidth)
+{
+  PRInt32 spanbytes;
+
+  spanbytes = (aWidth * mDepth) >> 5;
+
+  if (((PRUint32)aWidth * mDepth) & 0x1F)
+    spanbytes++;
+  spanbytes <<= 2;
+  return(spanbytes);
+}
+
+void nsImageGTK::ComputMetrics()
+{
+  mRowBytes = CalcBytesSpan(mWidth);
+  mSizeImage = mRowBytes * mHeight;
+}
+
+PRInt32 nsImageGTK::GetHeight()
+{
+  return mHeight;
+}
+
+PRInt32 nsImageGTK::GetWidth()
+{
+  return mWidth;
+}
+
+PRUint8 *nsImageGTK::GetBits()
+{
+  return mImageBits;
+}
+
+void *nsImageGTK::GetBitInfo()
+{
+  return nsnull;
+}
+
+PRInt32 nsImageGTK::GetLineStride()
+{
+  return mRowBytes;
+}
+
+nsColorMap *nsImageGTK::GetColorMap()
+{
+  return nsnull;
+}
+
+PRBool nsImageGTK::IsOptimized()
+{
+  return PR_TRUE;
+}
+
+PRUint8 *nsImageGTK::GetAlphaBits()
+{
+  return mAlphaBits;
+}
+
+PRInt32 nsImageGTK::GetAlphaWidth()
+{
+  return mAlphaWidth;
+}
+
+PRInt32 nsImageGTK::GetAlphaHeight()
+{
+  return mAlphaHeight;
+}
+
+PRInt32 nsImageGTK::GetAlphaLineStride()
+{
+  return mAlphaRowBytes;
+}
+
+nsIImage *nsImageGTK::DuplicateImage()
+{
+  return nsnull;
+}
+
+void nsImageGTK::SetAlphaLevel(PRInt32 aAlphaLevel)
+{
+}
+
+PRInt32 nsImageGTK::GetAlphaLevel()
+{
+  return 0;
+}
+
+void nsImageGTK::MoveAlphaMask(PRInt32 aX, PRInt32 aY)
+{
+}
+
+//------------------------------------------------------------
+
+// set up the palette to the passed in color array, RGB only in this array
+void nsImageGTK::ImageUpdated(nsIDeviceContext *aContext,
+                              PRUint8 aFlags,
+                              nsRect *aUpdateRect)
+{
+#ifdef TRACE_IMAGE_ALLOCATION
+  printf("nsImageGTK::ImageUpdated(this=%p,%d)\n",
+         this,
+         aFlags);
+#endif
+
+  if (IsFlagSet(nsImageUpdateFlags_kBitsChanged, aFlags)) {
+    mImageUpdated = PR_TRUE;
+    // FIXME do something with aUpdateRect
+  }
+}
+
+#ifdef CHEAP_PERFORMANCE_MEASURMENT
+static PRTime gConvertTime, gStartTime, gPixmapTime, gEndTime;
+#endif
+
+// Draw the bitmap, this method has a source and destination coordinates
+NS_IMETHODIMP
+nsImageGTK::Draw(nsIRenderingContext &aContext, nsDrawingSurface aSurface,
+                 PRInt32 aSX, PRInt32 aSY, PRInt32 aSWidth, PRInt32 aSHeight,
+                 PRInt32 aDX, PRInt32 aDY, PRInt32 aDWidth, PRInt32 aDHeight)
+{
+  g_return_val_if_fail ((aSurface != nsnull), NS_ERROR_FAILURE);
+
+  nsDrawingSurfaceGTK *drawing = (nsDrawingSurfaceGTK*)aSurface;
+
+  if (mAlphaBits)
+    g_print("calling nsImageGTK::Draw() with alpha bits\n");
+
+  gdk_draw_rgb_image (drawing->GetDrawable(),
+                      mGC,
+                      aDX, aDY, aDWidth, aDHeight,
+                      GDK_RGB_DITHER_MAX,
+                      mImageBits + mRowBytes * aSY + 3 * aDX,
+                      mRowBytes);
+
+  return NS_OK;
+}
+
+//------------------------------------------------------------
+
+// Draw the bitmap, this draw just has destination coordinates
+NS_IMETHODIMP
+nsImageGTK::Draw(nsIRenderingContext &aContext,
+                 nsDrawingSurface aSurface,
+                 PRInt32 aX, PRInt32 aY,
+                 PRInt32 aWidth, PRInt32 aHeight)
+{
+  g_return_val_if_fail ((aSurface != nsnull), NS_ERROR_FAILURE);
+
+
+  // XXX kipp: this is temporary code until we eliminate the
+  // width/height arguments from the draw method.
+  if ((aWidth != mWidth) || (aHeight != mHeight)) {
+    aWidth = mWidth;
+    aHeight = mHeight;
+  }
+
+#ifdef TRACE_IMAGE_ALLOCATION
+  printf("nsImageGTK::Draw(this=%p,x=%d,y=%d,width=%d,height=%d)\n",
+         this,
+         aX,
+         aY,
+         aWidth,
+         aHeight);
+#endif
+
+  nsDrawingSurfaceGTK* drawing = (nsDrawingSurfaceGTK*) aSurface;
+
+  XImage *x_image = nsnull;
+  Pixmap pixmap = 0;
+  Display *dpy = nsnull;
+  Visual *visual = nsnull;
+  GC      gc;
+  XGCValues gcv;
+
+#ifdef CHEAP_PERFORMANCE_MEASURMENT
+  gStartTime = gPixmapTime = PR_Now();
+#endif
+
+  // Create gc clip-mask on demand
+  if ((mAlphaBits) && (mImageUpdated == PR_TRUE))
+  {
+    /* get the X primitives */
+    dpy = GDK_WINDOW_XDISPLAY(mAlphaPixmap);
+
+    
+    /* this is the depth of the pixmap that we are going to draw to.
+       It's always a bitmap.  We're doing alpha here folks. */
+    visual = GDK_VISUAL_XVISUAL(gdk_rgb_get_visual());
+
+    // Make an image out of the alpha-bits created by the image library
+    x_image = XCreateImage(dpy, visual,
+                           1, /* visual depth...1 for bitmaps */
+                           XYPixmap,
+                           0, /* x offset, XXX fix this */
+                           (char *)mAlphaBits,  /* cast away our sign. */
+                           aWidth,
+                           aHeight,
+                           32,/* bitmap pad */
+                           mAlphaRowBytes); /* bytes per line */
+
+    x_image->bits_per_pixel=1;
+
+    /* Image library always places pixels left-to-right MSB to LSB */
+    x_image->bitmap_bit_order = MSBFirst;
+
+    /* This definition doesn't depend on client byte ordering
+       because the image library ensures that the bytes in
+       bitmask data are arranged left to right on the screen,
+       low to high address in memory. */
+    x_image->byte_order = MSBFirst;
+#if defined(IS_LITTLE_ENDIAN)
+    // no, it's still MSB XXX check on this!!
+    //      x_image->byte_order = LSBFirst;
+#elif defined (IS_BIG_ENDIAN)
+    x_image->byte_order = MSBFirst;
+#else
+#error ERROR! Endianness is unknown;
+#endif
+
+    // Write into the pixemap that is underneath gdk's mAlphaPixmap
+    // the image we just created.
+
+    pixmap = GDK_WINDOW_XWINDOW(mAlphaPixmap);
+    memset(&gcv, 0, sizeof(XGCValues));
+    gcv.function = GXcopy;
+    gc = XCreateGC(dpy, pixmap, GCFunction, &gcv);
+    XPutImage(dpy, pixmap, gc, x_image, 0, 0, 0, 0,
+              aWidth, aHeight);
+    XFreeGC(dpy, gc);
+
+    // Now we are done with the temporary image
+    x_image->data = 0;          /* Don't free the IL_Pixmap's bits. */
+    XDestroyImage(x_image);
+
+#ifdef CHEAP_PERFORMANCE_MEASURMENT
+    gPixmapTime = PR_Now();
+#endif
+  }
+
+  // Render unique image bits onto an off screen pixmap only once
+  // The image bits can change as a result of ImageUpdated() - for
+  // example: animated GIFs.
+  if (mImageUpdated == PR_TRUE)
+  {
+#ifdef TRACE_IMAGE_ALLOCATION
+    printf("nsImageGTK::Draw(this=%p) gdk_pixmap_new(nsnull,width=%d,height=%d,depth=%d)\n",
+           this,
+           aWidth,
+           aHeight,
+           mDepth);
+#endif
+
+    gdk_gc_set_clip_origin(mGC, 0, 0);
+    gdk_gc_set_clip_mask(mGC, nsnull);
+
+    // Render the image bits into an off screen pixmap
+    gdk_draw_rgb_image (mImagePixmap,
+                        mGC,
+                        0, 0, aWidth, aHeight,
+                        GDK_RGB_DITHER_MAX,
+                        mImageBits, mRowBytes);
+
+    if (mAlphaPixmap)
+    {
+      // Setup gc to use the given alpha-pixmap for clipping
+      gdk_gc_set_clip_mask(mGC, mAlphaPixmap);
+      gdk_gc_set_clip_origin(mGC, aX, aY);
+    }
+    
+#ifdef TRACE_IMAGE_ALLOCATION
+    printf("nsImageGTK::Draw(this=%p) gdk_draw_pixmap(x=%d,y=%d,width=%d,height=%d)\n",
+           this,
+           aX,
+           aY,
+           aWidth,
+           aHeight);
+#endif
+
+    mImageUpdated = PR_FALSE;
+  }
+
+
+  // copy our offscreen pixmap onto the window.
+  gdk_window_copy_area(drawing->GetDrawable(),      // dest window
+                       mGC,                         // gc
+                       aX,                          // xsrc
+                       aY,                          // ysrc
+                       mImagePixmap,                // source window
+                       0,                           // xdest
+                       0,                           // ydest
+                       aWidth,                      // width
+                       aHeight);                    // height
+
+  if (mAlphaBits)
+  {
+    // Revert gc to its old clip-mask and origin
+    gdk_gc_set_clip_origin(mGC, 0, 0);
+    gdk_gc_set_clip_mask(mGC, nsnull);
+  }
+
+#ifdef CHEAP_PERFORMANCE_MEASURMENT
+  gEndTime = PR_Now();
+  printf("nsImageGTK::Draw(this=%p,w=%d,h=%d) total=%lld pixmap=%lld, cvt=%lld\n",
+         this,
+         aWidth, aHeight,
+         gEndTime - gStartTime,
+         gPixmapTime - gStartTime,
+         gConvertTime - gPixmapTime);
+#endif
+
+  mImageUpdated = PR_FALSE;
+
+  return NS_OK;
+}
+
+
+//------------------------------------------------------------
+
+nsresult nsImageGTK::Optimize(nsIDeviceContext* aContext)
+{
+  return NS_OK;
+}

mozilla/gfx/src/gtk/nsImageGTK.h

@@ -0,0 +1,115 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsImageGTK_h___
+#define nsImageGTK_h___
+
+#include "nsIImage.h"
+
+#include "X11/Xlib.h"
+#include "X11/Xutil.h"
+#include <gdk/gdk.h>
+
+#undef Bool
+
+class nsImageGTK : public nsIImage
+{
+public:
+  nsImageGTK();
+  virtual ~nsImageGTK();
+
+  NS_DECL_ISUPPORTS
+
+  /**
+  @see nsIImage.h
+  */
+  virtual PRInt32     GetBytesPix()       { return mNumBytesPixel; }
+  virtual PRInt32     GetHeight();
+  virtual PRInt32     GetWidth();
+  virtual PRUint8*    GetBits();
+  virtual void*       GetBitInfo();
+  virtual PRBool      GetIsRowOrderTopToBottom() { return mIsTopToBottom; }
+  virtual PRInt32     GetLineStride();
+  virtual nsColorMap* GetColorMap();
+  NS_IMETHOD Draw(nsIRenderingContext &aContext,
+                  nsDrawingSurface aSurface,
+                  PRInt32 aX, PRInt32 aY,
+                  PRInt32 aWidth, PRInt32 aHeight);
+  NS_IMETHOD Draw(nsIRenderingContext &aContext,
+                  nsDrawingSurface aSurface,
+                  PRInt32 aSX, PRInt32 aSY, PRInt32 aSWidth, PRInt32 aSHeight,
+                  PRInt32 aDX, PRInt32 aDY, PRInt32 aDWidth, PRInt32 aDHeight);
+  virtual void ImageUpdated(nsIDeviceContext *aContext,
+                            PRUint8 aFlags, nsRect *aUpdateRect);
+  virtual nsresult    Init(PRInt32 aWidth, PRInt32 aHeight,
+                           PRInt32 aDepth,
+                           nsMaskRequirements aMaskRequirements);
+  virtual PRBool      IsOptimized();
+
+  virtual nsresult    Optimize(nsIDeviceContext* aContext);
+  virtual PRUint8*    GetAlphaBits();
+  virtual PRInt32     GetAlphaWidth();
+  virtual PRInt32     GetAlphaHeight();
+  virtual PRInt32     GetAlphaLineStride();
+  virtual nsIImage*   DuplicateImage();
+
+  /**
+   * Calculate the number of bytes spaned for this image for a given width
+   * @param aWidth is the width to calculate the number of bytes for
+   * @return the number of bytes in this span
+   */
+  PRInt32  CalcBytesSpan(PRUint32  aWidth);
+  virtual void  SetAlphaLevel(PRInt32 aAlphaLevel);
+  virtual PRInt32 GetAlphaLevel();
+  virtual void  MoveAlphaMask(PRInt32 aX, PRInt32 aY);
+
+private:
+  /**
+   * Calculate the amount of memory needed for the initialization of the image
+   */
+  void ComputMetrics();
+  void ComputePaletteSize(PRIntn nBitCount);
+
+private:
+  PRInt32    mWidth;
+  PRInt32    mHeight;
+  PRInt32    mDepth;       // bits per pixel
+  PRInt32    mRowBytes;
+  PRUint8    *mImageBits;
+  PRUint8    *mConvertedBits;
+  PRInt32    mSizeImage;
+  PRBool     mIsTopToBottom;
+  PRBool     mImageUpdated;
+
+  PRInt8     mNumBytesPixel;
+
+  // alpha layer members
+  PRUint8    *mAlphaBits;
+  GdkPixmap  *mAlphaPixmap;
+  PRInt8     mAlphaDepth;        // alpha layer depth
+  PRInt16    mAlphaRowBytes;     // alpha bytes per row
+  PRInt16    mAlphaWidth;        // alpha layer width
+  PRInt16    mAlphaHeight;       // alpha layer height
+  nsPoint    mLocation;          // alpha mask location
+
+  GdkPixmap  *mImagePixmap;
+
+  GdkGC      *mGC;
+};
+
+#endif

mozilla/gfx/src/gtk/nsPrintdGTK.c

@@ -0,0 +1,452 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/* Original Code: Syd Logan (syd@netscape.com) 3/12/99 */
+
+#include <gtk/gtk.h>
+
+#include "nspr.h"
+
+#include "nsPrintdGTK.h"
+
+/* A structure to hold widgets that need to be referenced in callbacks. We
+   declare this statically in the caller entry point (as a field of 
+   UnixPrOps, below), and pass a pointer to the structure to Gtk+ for each 
+   signal handler registered. This avoids use of globals. */
+
+typedef struct prwidgets {
+	GtkWidget *toplevel;		/* should be set to toplevel window */
+	GtkWidget *prDialog;		
+	GtkWidget *cmdEntry;
+	GtkWidget *pathEntry;
+	GtkWidget *browseButton;
+	GtkWidget *fpfToggle;
+	GtkWidget *greyToggle;
+	GtkWidget *letterToggle;
+	GtkWidget *legalToggle;
+	GtkWidget *execToggle;
+	GtkWidget *topSpinner;
+	GtkWidget *bottomSpinner;
+	GtkWidget *leftSpinner;
+	GtkWidget *rightSpinner;
+	GtkFileSelection *fsWidget;
+} PrWidgets;
+
+typedef struct unixprops {
+	UnixPrData *prData;	/* pointer to caller struct */
+	PrWidgets widgets;	 
+} UnixPrOps;
+
+/* user clicked cancel. tear things down, and set cancel field in 
+   caller data to PR_TRUE so printing will not happen */
+
+static void
+CancelPrint (GtkWidget *widget, UnixPrOps *prOps)
+{
+	gtk_main_quit();
+	gtk_widget_destroy( GTK_WIDGET(prOps->widgets.prDialog) );
+	prOps->prData->cancel = PR_TRUE;
+}
+
+/* user selected the Print button. Collect any remaining data from the
+   widgets, and set cancel field in caller data to PR_FALSE so printing
+   will be performed. Also, tear down dialog and exit inner main loop */
+ 
+static void
+DoPrint (GtkWidget *widget, UnixPrOps *prOps)
+{
+	strcpy( prOps->prData->command, 
+		gtk_entry_get_text( GTK_ENTRY( prOps->widgets.cmdEntry ) ) );
+	strcpy( prOps->prData->path, 
+		gtk_entry_get_text( GTK_ENTRY( prOps->widgets.pathEntry ) ) );
+
+	if ( GTK_TOGGLE_BUTTON( prOps->widgets.fpfToggle )->active == PR_TRUE )
+		prOps->prData->fpf = PR_TRUE;
+	else
+		prOps->prData->fpf = PR_FALSE;
+
+	if ( GTK_TOGGLE_BUTTON( prOps->widgets.greyToggle )->active == PR_TRUE )
+		prOps->prData->grayscale = PR_TRUE;
+	else
+		prOps->prData->grayscale = PR_FALSE;
+	if ( GTK_TOGGLE_BUTTON( prOps->widgets.letterToggle )->active == PR_TRUE )
+		prOps->prData->size = NS_LETTER_SIZE;
+	else if ( GTK_TOGGLE_BUTTON( prOps->widgets.legalToggle )->active == PR_TRUE )
+		prOps->prData->size = NS_LEGAL_SIZE;
+	else if ( GTK_TOGGLE_BUTTON( prOps->widgets.execToggle )->active == PR_TRUE )
+		prOps->prData->size = NS_EXECUTIVE_SIZE;
+	else
+		prOps->prData->size = NS_A4_SIZE;
+
+	/* margins */
+
+	prOps->prData->top = gtk_spin_button_get_value_as_float( 
+		GTK_SPIN_BUTTON(prOps->widgets.topSpinner) );
+	prOps->prData->bottom = gtk_spin_button_get_value_as_float( 
+		GTK_SPIN_BUTTON(prOps->widgets.bottomSpinner) );
+	prOps->prData->left = gtk_spin_button_get_value_as_float( 
+		GTK_SPIN_BUTTON(prOps->widgets.leftSpinner) );
+	prOps->prData->right = gtk_spin_button_get_value_as_float( 
+		GTK_SPIN_BUTTON(prOps->widgets.rightSpinner) );
+
+	/* we got everything... bring down the dialog and tell caller
+	   it's o.k. to print */
+
+	gtk_main_quit();
+	gtk_widget_destroy( GTK_WIDGET(prOps->widgets.prDialog) );
+	prOps->prData->cancel = PR_FALSE;
+}
+
+/* User hit ok in file selection widget brought up by the browse button.
+   snarf the selected file, stuff it in caller data */
+
+static void
+ModifyPrPath (GtkWidget *widget, UnixPrOps *prOps)
+{
+	strcpy( prOps->prData->path, 
+		gtk_file_selection_get_filename(prOps->widgets.fsWidget) );
+      	gtk_entry_set_text (GTK_ENTRY (prOps->widgets.pathEntry), 
+		prOps->prData->path);
+	gtk_widget_destroy( GTK_WIDGET(prOps->widgets.fsWidget) );
+}
+
+/* user selected print to printer. de-sensitize print to file fields */
+
+static void
+SwitchToPrinter (GtkWidget *widget, UnixPrOps *prOps)
+{
+	gtk_widget_set_sensitive( prOps->widgets.cmdEntry, PR_TRUE );
+	gtk_widget_set_sensitive( prOps->widgets.pathEntry, PR_FALSE );
+	gtk_widget_set_sensitive( prOps->widgets.browseButton, PR_FALSE );
+	prOps->prData->toPrinter = PR_TRUE;
+}
+
+/* user selected print to file. de-sensitize print to printer fields */
+
+static void
+SwitchToFile (GtkWidget *widget, UnixPrOps *prOps)
+{
+	gtk_widget_set_sensitive( prOps->widgets.cmdEntry, PR_FALSE );
+	gtk_widget_set_sensitive( prOps->widgets.pathEntry, PR_TRUE );
+	gtk_widget_set_sensitive( prOps->widgets.browseButton, PR_TRUE );
+	prOps->prData->toPrinter = PR_FALSE;
+}
+
+/* user hit the browse button. Pop up a file selection widget and grab
+   result */
+
+static void
+GetPrPath (GtkWidget *widget, UnixPrOps *prOps)
+{
+    GtkWidget *fs;
+
+    fs = gtk_file_selection_new("Netscape: File Browser");
+
+    gtk_file_selection_set_filename( GTK_FILE_SELECTION(fs), 
+	prOps->prData->path );
+
+    gtk_window_set_modal (GTK_WINDOW(fs),PR_TRUE);
+
+#if 0
+    /* XXX not sure what the toplevel window should be. */
+
+    gtk_window_set_transient_for (GTK_WINDOW (fs), 
+	GTK_WINDOW (prOps->widgets.toplevel));
+#endif
+
+    prOps->widgets.fsWidget = GTK_FILE_SELECTION(fs);
+
+    gtk_signal_connect (GTK_OBJECT(GTK_FILE_SELECTION(fs)->ok_button), 
+	"clicked", GTK_SIGNAL_FUNC(ModifyPrPath), prOps);
+
+    gtk_signal_connect_object (GTK_OBJECT(
+	GTK_FILE_SELECTION(fs)->cancel_button), "clicked",
+	GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT (fs));
+
+    gtk_widget_show(fs);
+}
+
+/* create file data dialog. XXX widget should be NULL */
+
+static void
+DoPrintGTK (GtkWidget *widget, UnixPrOps *prOps)
+{
+	GtkWidget *separator, *dialog, *label, *vbox, *entry, *hbox, 
+		*button, *fileButton, *prButton, *table, *spinner1;
+        GtkAdjustment *adj;
+
+	prOps->widgets.prDialog = dialog = 
+		gtk_window_new( GTK_WINDOW_TOPLEVEL );
+	gtk_window_set_modal( GTK_WINDOW(dialog), PR_TRUE );
+#if 0
+	/* not yet sure what the toplevel window should be */
+
+        gtk_window_set_transient_for (GTK_WINDOW (dialog), 
+		GTK_WINDOW (prOps->widgets.toplevel));
+#endif
+      	gtk_window_set_title( GTK_WINDOW(dialog), "Netscape: Print" );
+
+	vbox = gtk_vbox_new (PR_FALSE, 0);
+        gtk_container_add (GTK_CONTAINER (dialog), vbox);
+
+	table = gtk_table_new (3, 3, PR_FALSE);
+      	gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+        gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+        gtk_container_set_border_width (GTK_CONTAINER (table), 10);
+        gtk_box_pack_start (GTK_BOX (vbox), table, PR_TRUE, PR_TRUE, 5);
+	label = gtk_label_new( "Print To:" );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
+        	0, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = prButton = gtk_radio_button_new_with_label (NULL, "Printer");
+        if ( prOps->prData->toPrinter == PR_TRUE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	button = fileButton = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), "File");
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+        if ( prOps->prData->toPrinter == PR_FALSE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+
+	label = gtk_label_new( "Print Command:" );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
+        	0, GTK_EXPAND | GTK_FILL, 0, 0);
+	entry = gtk_entry_new ();
+      	gtk_entry_set_text (GTK_ENTRY (entry), prOps->prData->command);
+	gtk_table_attach (GTK_TABLE (table), entry, 1, 3, 1, 2,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	if ( prOps->prData->toPrinter == PR_FALSE )
+		gtk_widget_set_sensitive( entry, PR_FALSE );
+	prOps->widgets.cmdEntry = entry;
+
+	label = gtk_label_new( "File Name:" );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
+        	0, GTK_EXPAND | GTK_FILL, 0, 0);
+	entry = gtk_entry_new ();
+	gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 2, 3,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+      	gtk_entry_set_text (GTK_ENTRY (entry), prOps->prData->path);
+	if ( prOps->prData->toPrinter == PR_TRUE )
+		gtk_widget_set_sensitive( entry, PR_FALSE );
+	prOps->widgets.pathEntry = entry;
+
+	button = gtk_button_new_with_label ("Browse...");
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 2, 3,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+      	gtk_signal_connect (GTK_OBJECT (button), "clicked",
+        	GTK_SIGNAL_FUNC (GetPrPath), prOps);
+	if ( prOps->prData->toPrinter == PR_TRUE )
+		gtk_widget_set_sensitive( entry, PR_FALSE );
+	prOps->widgets.browseButton = button;
+
+	separator = gtk_hseparator_new ();
+      	gtk_box_pack_start (GTK_BOX (vbox), separator, PR_TRUE, PR_FALSE, 0);
+
+	table = gtk_table_new (2, 4, PR_FALSE);
+      	gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+        gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+        gtk_container_set_border_width (GTK_CONTAINER (table), 10);
+      	gtk_box_pack_start (GTK_BOX (vbox), table, PR_TRUE, PR_FALSE, 0);
+
+	label = gtk_label_new( "Print: " );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (NULL, "First Page First");
+        if ( prOps->prData->fpf == PR_TRUE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	prOps->widgets.fpfToggle = button;
+	gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), 
+		"Last Page First");
+        if ( prOps->prData->fpf == PR_FALSE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	label = gtk_label_new( "Print: " );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (NULL, "Greyscale");
+	prOps->widgets.greyToggle = button;
+        if ( prOps->prData->grayscale == PR_TRUE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 1, 2, 2, 3,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), 
+		"Color");
+        if ( prOps->prData->grayscale == PR_FALSE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 2, 3,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	label = gtk_label_new( "Paper Size: " );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (NULL, 
+		"Letter (8 1/2 x 11 in.)");
+	prOps->widgets.letterToggle = button;
+        if ( prOps->prData->size == NS_LETTER_SIZE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 1, 2, 3, 4,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), 
+		"Legal (8 1/2 x 14 in.)");
+	prOps->widgets.legalToggle = button;
+        if ( prOps->prData->size == NS_LEGAL_SIZE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 3, 4,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	button = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), 
+		"Executive (7 1/2 x 10 in.)");
+	prOps->widgets.execToggle = button;
+        if ( prOps->prData->size == NS_EXECUTIVE_SIZE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 1, 2, 4, 5,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), 
+		"A4 (210 x 297 mm)");
+        if ( prOps->prData->size == NS_A4_SIZE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 4, 5,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	/* margins */
+
+	separator = gtk_hseparator_new ();
+      	gtk_box_pack_start (GTK_BOX (vbox), separator, PR_TRUE, PR_FALSE, 0);
+
+	hbox = gtk_hbox_new (PR_FALSE, 0);
+      	gtk_box_pack_start (GTK_BOX (vbox), hbox, PR_FALSE, PR_FALSE, 5);
+	label = gtk_label_new( "Margins (inches):" );
+      	gtk_box_pack_start (GTK_BOX (hbox), label, PR_FALSE, PR_FALSE, 10);
+
+	table = gtk_table_new (1, 2, PR_FALSE);
+      	gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+        gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+        gtk_container_set_border_width (GTK_CONTAINER (table), 10);
+      	gtk_box_pack_start (GTK_BOX (vbox), table, PR_TRUE, PR_FALSE, 0);
+	hbox = gtk_hbox_new (PR_FALSE, 0);
+	gtk_table_attach (GTK_TABLE (table), hbox, 0, 1, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	label = gtk_label_new( "Top: " );
+      	gtk_box_pack_start (GTK_BOX (hbox), label, PR_TRUE, PR_FALSE, 0);
+        adj = (GtkAdjustment *) gtk_adjustment_new (1.0, 0.0, 999.0,
+        	0.25, 1.0, 0.0);
+        prOps->widgets.topSpinner = spinner1 = 
+		gtk_spin_button_new (adj, 1.0, 2);
+        gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
+        gtk_widget_set_usize (spinner1, 60, 0);
+        gtk_box_pack_start (GTK_BOX (hbox), spinner1, FALSE, TRUE, 0);
+
+	label = gtk_label_new( "Bottom: " );
+      	gtk_box_pack_start (GTK_BOX (hbox), label, PR_TRUE, PR_FALSE, 0);
+        adj = (GtkAdjustment *) gtk_adjustment_new (1.0, 0.0, 999.0,
+        	0.25, 1.0, 0.0);
+        prOps->widgets.bottomSpinner = spinner1 = 
+		gtk_spin_button_new (adj, 1.0, 2);
+        gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
+        gtk_widget_set_usize (spinner1, 60, 0);
+        gtk_box_pack_start (GTK_BOX (hbox), spinner1, FALSE, TRUE, 0);
+	
+	hbox = gtk_hbox_new (PR_FALSE, 0);
+	gtk_table_attach (GTK_TABLE (table), hbox, 1, 2, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	label = gtk_label_new( "Left: " );
+      	gtk_box_pack_start (GTK_BOX (hbox), label, PR_TRUE, PR_FALSE, 0);
+        adj = (GtkAdjustment *) gtk_adjustment_new (0.75, 0.0, 999.0,
+        	0.25, 1.0, 0.0);
+        prOps->widgets.leftSpinner = spinner1 = 
+		gtk_spin_button_new (adj, 1.0, 2);
+        gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
+        gtk_widget_set_usize (spinner1, 60, 0);
+        gtk_box_pack_start (GTK_BOX (hbox), spinner1, FALSE, TRUE, 0);
+
+	label = gtk_label_new( "Right: " );
+      	gtk_box_pack_start (GTK_BOX (hbox), label, PR_TRUE, PR_FALSE, 0);
+        adj = (GtkAdjustment *) gtk_adjustment_new (0.75, 0.0, 999.0,
+        	0.25, 1.0, 0.0);
+        prOps->widgets.rightSpinner = spinner1 = 
+		gtk_spin_button_new (adj, 1.0, 2);
+        gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
+        gtk_widget_set_usize (spinner1, 60, 0);
+        gtk_box_pack_start (GTK_BOX (hbox), spinner1, FALSE, TRUE, 0);
+
+	separator = gtk_hseparator_new ();
+      	gtk_box_pack_start (GTK_BOX (vbox), separator, PR_TRUE, PR_FALSE, 0);
+
+        hbox = gtk_hbox_new (PR_FALSE, 0);
+        gtk_box_pack_start (GTK_BOX (vbox), hbox, PR_TRUE, PR_FALSE, 5);
+	button = gtk_button_new_with_label ("Print");
+      	gtk_signal_connect (GTK_OBJECT (button), "clicked",
+        	GTK_SIGNAL_FUNC (DoPrint), prOps );
+        gtk_box_pack_start (GTK_BOX (hbox), button, PR_TRUE, PR_FALSE, 0);
+
+	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+	gtk_widget_grab_default (button);
+
+	button = gtk_button_new_with_label ("Cancel");
+      	gtk_signal_connect (GTK_OBJECT (button), "clicked",
+        	GTK_SIGNAL_FUNC ( CancelPrint ), prOps);
+        gtk_box_pack_start (GTK_BOX (hbox), button, PR_TRUE, PR_FALSE, 0);
+
+	/* Do this here, otherwise, upon creation the callbacks will be
+           triggered and the widgets these callbacks set sensitivity on
+	   do not exist yet */
+
+      	gtk_signal_connect (GTK_OBJECT (prButton), "clicked",
+        	GTK_SIGNAL_FUNC (SwitchToPrinter), prOps);
+      	gtk_signal_connect (GTK_OBJECT (fileButton), "clicked",
+        	GTK_SIGNAL_FUNC (SwitchToFile), prOps);
+
+	gtk_widget_show_all( dialog );
+	gtk_main ();
+}
+
+/* public interface to print dialog. Caller passes in preferences using
+   argument, we return any changes and indication of whether to print
+   or cancel. */
+
+void
+UnixPrDialog( UnixPrData *prData )
+{
+	static UnixPrOps prOps;
+
+	prOps.prData = prData;
+	DoPrintGTK( (GtkWidget *) NULL, &prOps );
+}
+

mozilla/gfx/src/gtk/nsPrintdGTK.h

@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/* Original Code: Syd Logan (syd@netscape.com) 3/12/99 */
+
+#ifndef nsPrintdGTK_h___
+#define nsPrintdGTK_h___
+
+#include <limits.h>
+
+PR_BEGIN_EXTERN_C
+
+/* stolen from nsPostScriptObj.h. needs to be put somewhere else that
+   both ps and gtk can see easily */
+
+#ifndef NS_LEGAL_SIZE
+#define NS_LETTER_SIZE    0
+#define NS_LEGAL_SIZE     1
+#define NS_EXECUTIVE_SIZE 2
+#define NS_A4_SIZE        3
+#endif
+
+#ifndef PATH_MAX
+#define PATH_MAX	_POSIX_PATH_MAX
+#endif
+
+typedef struct unixprdata {
+        PRBool toPrinter;          /* If PR_TRUE, print to printer */
+        PRBool fpf;                /* If PR_TRUE, first page first */
+        PRBool grayscale;          /* If PR_TRUE, print grayscale */
+        int size;                   /* Paper size e.g., SizeLetter */
+        char command[ PATH_MAX ];   /* Print command e.g., lpr */
+        char path[ PATH_MAX ];      /* If toPrinter = PR_FALSE, dest file */
+	PRBool cancel;		    /* If PR_TRUE, user cancelled */
+	float left;		    /* left margin */
+	float right;		    /* right margin */
+	float top;		    /* top margin */
+	float bottom;		    /* bottom margin */
+} UnixPrData;
+
+void UnixPrDialog(UnixPrData *prData);
+
+PR_END_EXTERN_C
+
+#endif /* nsPrintdGTK_h___ */

mozilla/gfx/src/gtk/nsRegionGTK.cpp

@@ -0,0 +1,302 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include <gtk/gtk.h>
+#include <gdk/gdkprivate.h>
+#include "nsRegionGTK.h"
+#include "xregion.h"
+#include "prmem.h"
+
+static NS_DEFINE_IID(kRegionIID, NS_IREGION_IID);
+
+nsRegionGTK::nsRegionGTK()
+{
+  NS_INIT_REFCNT();
+  
+  mRegion = nsnull;
+  mRegionType = eRegionComplexity_empty;
+}
+
+nsRegionGTK::~nsRegionGTK()
+{
+   if (mRegion)
+     ::gdk_region_destroy(mRegion);
+  mRegion = nsnull;
+}
+
+NS_IMPL_QUERY_INTERFACE(nsRegionGTK, kRegionIID)
+NS_IMPL_ADDREF(nsRegionGTK)
+NS_IMPL_RELEASE(nsRegionGTK)
+
+nsresult nsRegionGTK::Init(void)
+{
+  NS_ADDREF_THIS();
+  mRegion = ::gdk_region_new();
+  mRegionType = eRegionComplexity_empty;
+  return NS_OK;
+}
+
+void nsRegionGTK::SetTo(const nsIRegion &aRegion)
+{
+  nsRegionGTK * pRegion = (nsRegionGTK *)&aRegion;
+
+  SetRegionEmpty();
+  
+  GdkRegion *nRegion = ::gdk_regions_union(mRegion, pRegion->mRegion);
+  ::gdk_region_destroy(mRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::SetTo(const nsRegionGTK *aRegion)
+{
+  SetRegionEmpty();
+  
+  GdkRegion *nRegion = ::gdk_regions_union(mRegion, aRegion->mRegion);
+  ::gdk_region_destroy(mRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::SetTo(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  SetRegionEmpty();
+
+  GdkRectangle grect;
+
+  grect.x = aX;
+  grect.y = aY;
+  grect.width = aWidth;
+  grect.height = aHeight;
+  
+  GdkRegion *nRegion = ::gdk_region_union_with_rect(mRegion, &grect);
+  ::gdk_region_destroy(mRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::Intersect(const nsIRegion &aRegion)
+{
+  nsRegionGTK * pRegion = (nsRegionGTK *)&aRegion;
+
+  GdkRegion *nRegion = ::gdk_regions_intersect(mRegion, pRegion->mRegion);
+  ::gdk_region_destroy(mRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::Intersect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  GdkRegion *tRegion = CreateRectRegion(aX, aY, aWidth, aHeight);
+
+  GdkRegion *nRegion = ::gdk_regions_intersect(mRegion, tRegion);
+  ::gdk_region_destroy(tRegion);
+  ::gdk_region_destroy(mRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::Union(const nsIRegion &aRegion)
+{
+   nsRegionGTK * pRegion = (nsRegionGTK *)&aRegion;
+   
+   GdkRegion *nRegion = ::gdk_regions_union(mRegion, pRegion->mRegion);
+   ::gdk_region_destroy(mRegion);
+   mRegion = nRegion;
+}
+
+void nsRegionGTK::Union(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  GdkRegion *tRegion = CreateRectRegion(aX, aY, aWidth, aHeight);
+
+  GdkRegion *nRegion = ::gdk_regions_union(mRegion, tRegion);
+  ::gdk_region_destroy(mRegion);
+  ::gdk_region_destroy(tRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::Subtract(const nsIRegion &aRegion)
+{
+  nsRegionGTK * pRegion = (nsRegionGTK *)&aRegion;
+
+   GdkRegion *nRegion = ::gdk_regions_subtract(mRegion, pRegion->mRegion);
+   ::gdk_region_destroy(mRegion);
+   mRegion = nRegion;
+}
+
+void nsRegionGTK::Subtract(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  GdkRegion *tRegion = CreateRectRegion(aX, aY, aWidth, aHeight);
+  
+  GdkRegion *nRegion = ::gdk_regions_subtract(mRegion, tRegion);
+  ::gdk_region_destroy(mRegion);
+  ::gdk_region_destroy(tRegion);
+  mRegion = nRegion;
+}
+
+PRBool nsRegionGTK::IsEmpty(void)
+{
+  return (::gdk_region_empty(mRegion));
+}
+
+PRBool nsRegionGTK::IsEqual(const nsIRegion &aRegion)
+{
+  nsRegionGTK *pRegion = (nsRegionGTK *)&aRegion;
+
+  return(::gdk_region_equal(mRegion, pRegion->mRegion));
+
+}
+
+void nsRegionGTK::GetBoundingBox(PRInt32 *aX, PRInt32 *aY, PRInt32 *aWidth, PRInt32 *aHeight)
+{
+  GdkRectangle rect;
+
+  ::gdk_region_get_clipbox(mRegion, &rect);
+
+  *aX = rect.x;
+  *aY = rect.y;
+  *aWidth = rect.width;
+  *aHeight = rect.height;
+}
+
+void nsRegionGTK::Offset(PRInt32 aXOffset, PRInt32 aYOffset)
+{
+   ::gdk_region_offset(mRegion, aXOffset, aYOffset);
+}
+
+PRBool nsRegionGTK::ContainsRect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  GdkOverlapType containment;
+  GdkRectangle rect;
+   
+  rect.x = aX;
+  rect.y = aY;
+  rect.width = aWidth;
+  rect.height = aHeight;
+   
+  containment = ::gdk_region_rect_in(mRegion, &rect);
+
+  if (containment != GDK_OVERLAP_RECTANGLE_OUT)
+    return PR_TRUE;
+  else
+    return PR_FALSE;
+
+}
+
+NS_IMETHODIMP nsRegionGTK::GetRects(nsRegionRectSet **aRects)
+{
+  nsRegionRectSet   *rects;
+  GdkRegionPrivate  *priv = (GdkRegionPrivate *)mRegion;
+  Region            pRegion = priv->xregion;
+  int               nbox;
+  BOX               *pbox;
+  nsRegionRect      *rect;
+
+  NS_ASSERTION(!(nsnull == aRects), "bad ptr");
+
+  //code lifted from old xfe. MMP
+
+  pbox = pRegion->rects;
+  nbox = pRegion->numRects;
+
+  rects = *aRects;
+
+  if ((nsnull == rects) || (rects->mRectsLen < (PRUint32)nbox))
+  {
+    void *buf = PR_Realloc(rects, sizeof(nsRegionRectSet) + (sizeof(nsRegionRect) * (nbox - 1)));
+
+    if (nsnull == buf)
+    {
+      if (nsnull != rects)
+        rects->mNumRects = 0;
+
+      return NS_OK;
+    }
+
+    rects = (nsRegionRectSet *)buf;
+    rects->mRectsLen = nbox;
+  }
+
+  rects->mNumRects = nbox;
+  rects->mArea = 0;
+  rect = &rects->mRects[0];
+
+  while (nbox--)
+  {
+    rect->x = pbox->x1;
+    rect->width = (pbox->x2 - pbox->x1);
+    rect->y = pbox->y1;
+    rect->height = (pbox->y2 - pbox->y1);
+
+    rects->mArea += rect->width * rect->height;
+
+    pbox++;
+    rect++;
+  }
+
+  *aRects = rects;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsRegionGTK::FreeRects(nsRegionRectSet *aRects)
+{
+  if (nsnull != aRects)
+    PR_Free((void *)aRects);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsRegionGTK::GetNativeRegion(void *&aRegion) const
+{
+  aRegion = (void *)mRegion;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsRegionGTK::GetRegionComplexity(nsRegionComplexity &aComplexity) const
+{
+  // cast to avoid const-ness problems on some compilers
+  if (((nsRegionGTK*)this)->IsEmpty())
+    aComplexity = eRegionComplexity_empty;
+  else
+    aComplexity = eRegionComplexity_complex;
+
+  return NS_OK;
+}
+
+void nsRegionGTK::SetRegionEmpty()
+{
+  if (!IsEmpty()) {
+    ::gdk_region_destroy(mRegion);
+    mRegion = ::gdk_region_new();
+  }
+}
+
+GdkRegion *nsRegionGTK::CreateRectRegion(PRInt32 aX,
+					 PRInt32 aY,
+					 PRInt32 aWidth,
+					 PRInt32 aHeight)
+{
+  GdkRegion *tRegion = ::gdk_region_new();
+  GdkRectangle rect;
+
+  rect.x = aX;
+  rect.y = aY;
+  rect.width = aWidth;
+  rect.height = aHeight;
+
+  GdkRegion *rRegion = ::gdk_region_union_with_rect(tRegion, &rect);
+  ::gdk_region_destroy(tRegion);
+  
+  return (rRegion);
+}

mozilla/gfx/src/gtk/nsRegionGTK.h

@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsRegionGTK_h___
+#define nsRegionGTK_h___
+
+#include "nsIRegion.h"
+
+class nsRegionGTK : public nsIRegion
+{
+public:
+  nsRegionGTK();
+  virtual ~nsRegionGTK();
+
+  NS_DECL_ISUPPORTS
+
+  virtual nsresult Init();
+
+  virtual void SetTo(const nsIRegion &aRegion);
+  virtual void SetTo(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+  void SetTo(const nsRegionGTK *aRegion);
+  virtual void Intersect(const nsIRegion &aRegion);
+  virtual void Intersect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+  virtual void Union(const nsIRegion &aRegion);
+  virtual void Union(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+  virtual void Subtract(const nsIRegion &aRegion);
+  virtual void Subtract(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+  virtual PRBool IsEmpty(void);
+  virtual PRBool IsEqual(const nsIRegion &aRegion);
+  virtual void GetBoundingBox(PRInt32 *aX, PRInt32 *aY, PRInt32 *aWidth, PRInt32 *aHeight);
+  virtual void Offset(PRInt32 aXOffset, PRInt32 aYOffset);
+  virtual PRBool ContainsRect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+  NS_IMETHOD GetRects(nsRegionRectSet **aRects);
+  NS_IMETHOD FreeRects(nsRegionRectSet *aRects);
+  NS_IMETHOD GetNativeRegion(void *&aRegion) const;
+  NS_IMETHOD GetRegionComplexity(nsRegionComplexity &aComplexity) const;
+
+  GdkRegion *CreateRectRegion(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+
+private:
+  GdkRegion           *mRegion;
+  nsRegionComplexity  mRegionType;
+
+  virtual void SetRegionEmpty();
+
+};
+
+#endif  // nsRegionGTK_h___ 

mozilla/gfx/src/gtk/nsRenderingContextGTK.h

@@ -0,0 +1,173 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsRenderingContextGTK_h___
+#define nsRenderingContextGTK_h___
+
+#include "nsIRenderingContext.h"
+#include "nsUnitConversion.h"
+#include "nsFont.h"
+#include "nsIFontMetrics.h"
+#include "nsPoint.h"
+#include "nsString.h"
+#include "nsCRT.h"
+#include "nsTransform2D.h"
+#include "nsIViewManager.h"
+#include "nsIWidget.h"
+#include "nsRect.h"
+#include "nsImageGTK.h"
+#include "nsIDeviceContext.h"
+#include "nsVoidArray.h"
+
+#include "nsDrawingSurfaceGTK.h"
+#include "nsRegionGTK.h"
+
+#include <gtk/gtk.h>
+
+class nsRenderingContextGTK : public nsIRenderingContext
+{
+public:
+  nsRenderingContextGTK();
+  virtual ~nsRenderingContextGTK();
+
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD Init(nsIDeviceContext* aContext, nsIWidget *aWindow);
+  NS_IMETHOD Init(nsIDeviceContext* aContext, nsDrawingSurface aSurface);
+
+  NS_IMETHOD Reset(void);
+
+  NS_IMETHOD GetDeviceContext(nsIDeviceContext *&aContext);
+
+  NS_IMETHOD LockDrawingSurface(PRInt32 aX, PRInt32 aY, PRUint32 aWidth, PRUint32 aHeight,
+                                void **aBits, PRInt32 *aStride, PRInt32 *aWidthBytes,
+                                PRUint32 aFlags);
+  NS_IMETHOD UnlockDrawingSurface(void);
+
+  NS_IMETHOD SelectOffScreenDrawingSurface(nsDrawingSurface aSurface);
+  NS_IMETHOD GetDrawingSurface(nsDrawingSurface *aSurface);
+  NS_IMETHOD GetHints(PRUint32& aResult);
+
+  NS_IMETHOD PushState(void);
+  NS_IMETHOD PopState(PRBool &aClipEmpty);
+
+  NS_IMETHOD IsVisibleRect(const nsRect& aRect, PRBool &aVisible);
+
+  NS_IMETHOD SetClipRect(const nsRect& aRect, nsClipCombine aCombine, PRBool &aClipEmpty);
+  NS_IMETHOD GetClipRect(nsRect &aRect, PRBool &aClipValid);
+  NS_IMETHOD SetClipRegion(const nsIRegion& aRegion, nsClipCombine aCombine, PRBool &aClipEmpty);
+  NS_IMETHOD GetClipRegion(nsIRegion **aRegion);
+
+  NS_IMETHOD SetLineStyle(nsLineStyle aLineStyle);
+  NS_IMETHOD GetLineStyle(nsLineStyle &aLineStyle);
+
+  NS_IMETHOD SetColor(nscolor aColor);
+  NS_IMETHOD GetColor(nscolor &aColor) const;
+
+  NS_IMETHOD SetFont(const nsFont& aFont);
+  NS_IMETHOD SetFont(nsIFontMetrics *aFontMetrics);
+
+  NS_IMETHOD GetFontMetrics(nsIFontMetrics *&aFontMetrics);
+
+  NS_IMETHOD Translate(nscoord aX, nscoord aY);
+  NS_IMETHOD Scale(float aSx, float aSy);
+  NS_IMETHOD GetCurrentTransform(nsTransform2D *&aTransform);
+
+  NS_IMETHOD CreateDrawingSurface(nsRect *aBounds, PRUint32 aSurfFlags, nsDrawingSurface &aSurface);
+  NS_IMETHOD DestroyDrawingSurface(nsDrawingSurface aDS);
+
+  NS_IMETHOD DrawLine(nscoord aX0, nscoord aY0, nscoord aX1, nscoord aY1);
+  NS_IMETHOD DrawPolyline(const nsPoint aPoints[], PRInt32 aNumPoints);
+
+  NS_IMETHOD DrawRect(const nsRect& aRect);
+  NS_IMETHOD DrawRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+  NS_IMETHOD FillRect(const nsRect& aRect);
+  NS_IMETHOD FillRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+
+  NS_IMETHOD DrawPolygon(const nsPoint aPoints[], PRInt32 aNumPoints);
+  NS_IMETHOD FillPolygon(const nsPoint aPoints[], PRInt32 aNumPoints);
+
+  NS_IMETHOD DrawEllipse(const nsRect& aRect);
+  NS_IMETHOD DrawEllipse(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+  NS_IMETHOD FillEllipse(const nsRect& aRect);
+  NS_IMETHOD FillEllipse(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+
+  NS_IMETHOD DrawArc(const nsRect& aRect,
+                     float aStartAngle, float aEndAngle);
+  NS_IMETHOD DrawArc(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight,
+                     float aStartAngle, float aEndAngle);
+  NS_IMETHOD FillArc(const nsRect& aRect,
+                     float aStartAngle, float aEndAngle);
+  NS_IMETHOD FillArc(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight,
+                     float aStartAngle, float aEndAngle);
+
+  NS_IMETHOD GetWidth(char aC, nscoord &aWidth);
+  NS_IMETHOD GetWidth(PRUnichar aC, nscoord &aWidth,
+                      PRInt32 *aFontID);
+  NS_IMETHOD GetWidth(const nsString& aString, nscoord &aWidth,
+                      PRInt32 *aFontID);
+  NS_IMETHOD GetWidth(const char *aString, nscoord &aWidth);
+  NS_IMETHOD GetWidth(const char *aString, PRUint32 aLength, nscoord &aWidth);
+  NS_IMETHOD GetWidth(const PRUnichar *aString, PRUint32 aLength, nscoord &aWidth,
+                      PRInt32 *aFontID);
+
+  NS_IMETHOD DrawString(const char *aString, PRUint32 aLength,
+                        nscoord aX, nscoord aY,
+                        const nscoord* aSpacing);
+  NS_IMETHOD DrawString(const PRUnichar *aString, PRUint32 aLength,
+                        nscoord aX, nscoord aY,
+                        PRInt32 aFontID,
+                        const nscoord* aSpacing);
+  NS_IMETHOD DrawString(const nsString& aString, nscoord aX, nscoord aY,
+                        PRInt32 aFontID,
+                        const nscoord* aSpacing);
+
+  NS_IMETHOD DrawImage(nsIImage *aImage, nscoord aX, nscoord aY);
+  NS_IMETHOD DrawImage(nsIImage *aImage, nscoord aX, nscoord aY,
+                       nscoord aWidth, nscoord aHeight); 
+  NS_IMETHOD DrawImage(nsIImage *aImage, const nsRect& aRect);
+  NS_IMETHOD DrawImage(nsIImage *aImage, const nsRect& aSRect, const nsRect& aDRect);
+
+  NS_IMETHOD CopyOffScreenBits(nsDrawingSurface aSrcSurf, PRInt32 aSrcX, PRInt32 aSrcY,
+                               const nsRect &aDestBounds, PRUint32 aCopyFlags);
+
+  //locals
+  NS_IMETHOD CommonInit();
+
+protected:
+  nsDrawingSurfaceGTK   *mOffscreenSurface;  
+  nsDrawingSurfaceGTK   *mSurface;
+  nsIDeviceContext      *mContext;
+  nsIFontMetrics        *mFontMetrics;
+  nsRegionGTK           *mClipRegion;
+  nsTransform2D         *mTMatrix;
+  float                  mP2T;
+  GdkWChar*              mDrawStringBuf;
+  PRUint32               mDrawStringSize;
+
+ // graphic state stack (GraphicsState)
+  nsVoidArray           *mStateCache;
+
+  nscolor                mCurrentColor;
+  GdkFont               *mCurrentFont;
+  nsLineStyle            mCurrentLineStyle;
+};
+
+#endif /* nsRenderingContextGTK_h___ */

mozilla/gfx/src/gtk/xregion.h

@@ -0,0 +1,177 @@
+/* $XConsortium: region.h,v 11.13 91/09/10 08:21:49 rws Exp $ */
+/************************************************************************
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
+and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the names of Digital or MIT not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+************************************************************************/
+
+#ifndef _XREGION_H
+#define _XREGION_H
+
+typedef struct {
+    short x1, x2, y1, y2;
+} Box, BOX, BoxRec, *BoxPtr;
+
+typedef struct {
+    short x, y, width, height;
+}RECTANGLE, RectangleRec, *RectanglePtr;
+
+#ifdef TRUE
+#undef TRUE
+#endif
+
+#define TRUE 1
+#ifndef FALSE
+#define FALSE 0
+#endif
+#ifndef MAXSHORT
+#define MAXSHORT 32767
+#endif
+#ifndef MINSHORT
+#define MINSHORT -MAXSHORT
+#endif
+#ifndef MAX
+#define MAX(a,b) (((a) > (b)) ? (a) : (b))
+#endif
+#ifndef MIN
+#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#endif
+
+
+/* 
+ *   clip region
+ */
+
+typedef struct _XRegion {
+    long size;
+    long numRects;
+    BOX *rects;
+    BOX extents;
+} REGION;
+
+/* Xutil.h contains the declaration: 
+ * typedef struct _XRegion *Region; 
+ */   
+
+/*  1 if two BOXs overlap.
+ *  0 if two BOXs do not overlap.
+ *  Remember, x2 and y2 are not in the region 
+ */
+#define EXTENTCHECK(r1, r2) \
+	((r1)->x2 > (r2)->x1 && \
+	 (r1)->x1 < (r2)->x2 && \
+	 (r1)->y2 > (r2)->y1 && \
+	 (r1)->y1 < (r2)->y2)
+
+/*
+ *  update region extents
+ */
+#define EXTENTS(r,idRect){\
+            if((r)->x1 < (idRect)->extents.x1)\
+              (idRect)->extents.x1 = (r)->x1;\
+            if((r)->y1 < (idRect)->extents.y1)\
+              (idRect)->extents.y1 = (r)->y1;\
+            if((r)->x2 > (idRect)->extents.x2)\
+              (idRect)->extents.x2 = (r)->x2;\
+            if((r)->y2 > (idRect)->extents.y2)\
+              (idRect)->extents.y2 = (r)->y2;\
+        }
+
+/*
+ *   Check to see if there is enough memory in the present region.
+ */
+#define MEMCHECK(reg, rect, firstrect){\
+        if ((reg)->numRects >= ((reg)->size - 1)){\
+          (firstrect) = (BOX *) Xrealloc \
+          ((char *)(firstrect), (unsigned) (2 * (sizeof(BOX)) * ((reg)->size)));\
+          if ((firstrect) == 0)\
+            return(0);\
+          (reg)->size *= 2;\
+          (rect) = &(firstrect)[(reg)->numRects];\
+         }\
+       }
+
+/*  this routine checks to see if the previous rectangle is the same
+ *  or subsumes the new rectangle to add.
+ */
+
+#define CHECK_PREVIOUS(Reg, R, Rx1, Ry1, Rx2, Ry2)\
+               (!(((Reg)->numRects > 0)&&\
+                  ((R-1)->y1 == (Ry1)) &&\
+                  ((R-1)->y2 == (Ry2)) &&\
+                  ((R-1)->x1 <= (Rx1)) &&\
+                  ((R-1)->x2 >= (Rx2))))
+
+/*  add a rectangle to the given Region */
+#define ADDRECT(reg, r, rx1, ry1, rx2, ry2){\
+    if (((rx1) < (rx2)) && ((ry1) < (ry2)) &&\
+        CHECK_PREVIOUS((reg), (r), (rx1), (ry1), (rx2), (ry2))){\
+              (r)->x1 = (rx1);\
+              (r)->y1 = (ry1);\
+              (r)->x2 = (rx2);\
+              (r)->y2 = (ry2);\
+              EXTENTS((r), (reg));\
+              (reg)->numRects++;\
+              (r)++;\
+            }\
+        }
+
+
+
+/*  add a rectangle to the given Region */
+#define ADDRECTNOX(reg, r, rx1, ry1, rx2, ry2){\
+            if ((rx1 < rx2) && (ry1 < ry2) &&\
+                CHECK_PREVIOUS((reg), (r), (rx1), (ry1), (rx2), (ry2))){\
+              (r)->x1 = (rx1);\
+              (r)->y1 = (ry1);\
+              (r)->x2 = (rx2);\
+              (r)->y2 = (ry2);\
+              (reg)->numRects++;\
+              (r)++;\
+            }\
+        }
+
+#define EMPTY_REGION(pReg) pReg->numRects = 0
+
+#define REGION_NOT_EMPTY(pReg) pReg->numRects
+
+#define INBOX(r, x, y) \
+      ( ( ((r).x2 >  x)) && \
+        ( ((r).x1 <= x)) && \
+        ( ((r).y2 >  y)) && \
+        ( ((r).y1 <= y)) )
+
+/*
+ * number of points to buffer before sending them off
+ * to scanlines() :  Must be an even number
+ */
+#define NUMPTSTOBUFFER 200
+
+/*
+ * used to allocate buffers for points and link
+ * the buffers together
+ */
+typedef struct _POINTBLOCK {
+    XPoint pts[NUMPTSTOBUFFER];
+    struct _POINTBLOCK *next;
+} POINTBLOCK;
+
+#endif

mozilla/modules/libjar/nsIJARChannel.idl

@@ -1,39 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIChannel.idl"
-
-interface nsISimpleEnumerator;
-
-[scriptable, uuid(c7e410d1-85f2-11d3-9f63-006008a6efe9)]
-interface nsIJARChannel : nsIChannel 
-{
-
-    /**
-     * Enumerates all the entries in the JAR (the root URI).
-     * ARGUMENTS:
-     *  aRoot - a string representing the root dir to enumerate from
-     *    or null to enumerate the whole thing.
-     */
-    nsISimpleEnumerator EnumerateEntries(in string aRoot);
-
-};

mozilla/modules/libjar/nsIJARProtocolHandler.idl

@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIProtocolHandler.idl"
-
-[scriptable, uuid(92c3b42c-98c4-11d3-8cd9-0060b0fc14a3)]
-interface nsIJARProtocolHandler : nsIProtocolHandler {
-
-    /**
-     * Add any jar-specific methods here later.
-     */
-    
-};

mozilla/modules/libjar/nsIJARURI.idl

@@ -1,42 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsIURI.idl"
-
-/**
- * JAR URLs have the following syntax
- *
- * jar:<jar-file-uri>!/<jar-entry>
- *
- * EXAMPLE: jar:http://www.big.com/blue.jar!/ocean.html
- */
-[scriptable, uuid(c7e410d3-85f2-11d3-9f63-006008a6efe9)]
-interface nsIJARURI : nsIURI {
-
-    /**
-     * Returns the root URI (the one for the actual JAR file) for this JAR.
-     * eg http://www.big.com/blue.jar
-     */
-    attribute nsIURI JARFile;
-
-    /**
-     * Returns the entry specified for this JAR URI.
-     * eg ocean.html
-     */
-	attribute string JAREntry;
-};

mozilla/modules/libjar/nsJARChannel.cpp

@@ -1,690 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL. You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All Rights
- * Reserved.
- *
- */
-
-#include "nsNetUtil.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsSpecialSystemDirectory.h" 
-#include "nsJARChannel.h"
-#include "nsCRT.h"
-#include "nsIFileTransportService.h"
-#include "nsIURL.h"
-#include "nsIMIMEService.h"
-#include "nsAutoLock.h"
-#include "nsIFileStreams.h"
-#include "nsIPrincipal.h"
-#include "nsMimeTypes.h"
-
-static NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID);
-static NS_DEFINE_CID(kMIMEServiceCID, NS_MIMESERVICE_CID);
-static NS_DEFINE_CID(kZipReaderCID, NS_ZIPREADER_CID);
-static NS_DEFINE_CID(kFileChannelCID, NS_FILECHANNEL_CID);
-
-////////////////////////////////////////////////////////////////////////////////
-
-class nsJARDownloadObserver : public nsIStreamObserver 
-{
-public:
-    NS_DECL_ISUPPORTS
-    
-    NS_IMETHOD OnStartRequest(nsIChannel* jarCacheTransport,
-                              nsISupports* context) {
-        return NS_OK;
-    }
-
-    NS_IMETHOD OnStopRequest(nsIChannel* jarCacheTransport, 
-                             nsISupports* context, 
-                             nsresult status, 
-                             const PRUnichar* aMsg) {
-        nsresult rv = NS_OK;
-        nsAutoMonitor monitor(mJARChannel->mMonitor);
-
-        if (NS_SUCCEEDED(status) && mJARChannel->mJarCacheTransport) {
-            NS_ASSERTION(jarCacheTransport == (mJARChannel->mJarCacheTransport).get(),
-                         "wrong transport");
-            // after successfully downloading the jar file to the cache,
-            // start the extraction process:
-            nsCOMPtr<nsIFileChannel> jarCacheFile;
-            rv = NS_NewFileChannel(mJarCacheFile, 
-                                   PR_RDONLY,
-                                   nsnull,      // XXX content type
-                                   0,           // XXX content length
-                                   mJARChannel->mLoadGroup,
-                                   mJARChannel->mCallbacks,
-                                   mJARChannel->mLoadAttributes,
-                                   nsnull,
-                                   mJARChannel->mBufferSegmentSize,
-                                   mJARChannel->mBufferMaxSize,
-                                   getter_AddRefs(jarCacheFile));
-            if (NS_FAILED(rv)) return rv;
-
-            rv = mJARChannel->ExtractJARElement(jarCacheFile);
-        }
-        mJARChannel->mJarCacheTransport = nsnull;
-        return rv;
-    }
-
-    nsJARDownloadObserver(nsIFile* jarCacheFile, nsJARChannel* jarChannel) {
-        NS_INIT_REFCNT();
-        mJarCacheFile = jarCacheFile;
-        mJARChannel = jarChannel;
-        NS_ADDREF(mJARChannel);
-    }
-
-    virtual ~nsJARDownloadObserver() {
-        NS_RELEASE(mJARChannel);
-    }
-
-protected:
-    nsCOMPtr<nsIFile>   mJarCacheFile;
-    nsJARChannel*       mJARChannel;
-};
-
-NS_IMPL_ISUPPORTS1(nsJARDownloadObserver, nsIStreamObserver)
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsJARChannel::nsJARChannel()
-    : mCommand(nsnull),
-      mContentType(nsnull),
-      mJAREntry(nsnull),
-      mMonitor(nsnull)
-{
-    NS_INIT_REFCNT();
-}
-
-nsJARChannel::~nsJARChannel()
-{
-    if (mCommand)
-        nsCRT::free(mCommand);
-    if (mContentType)
-        nsCRT::free(mContentType);
-    if (mJAREntry)
-        nsCRT::free(mJAREntry);
-    if (mMonitor)
-        PR_DestroyMonitor(mMonitor);
-}
-
-NS_IMPL_ISUPPORTS6(nsJARChannel,
-                   nsIJARChannel,
-                   nsIChannel,
-                   nsIRequest,
-                   nsIStreamObserver,
-                   nsIStreamListener,
-                   nsIFileSystem)
-
-NS_METHOD
-nsJARChannel::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-	nsresult rv;
-
-    if (aOuter)
-        return NS_ERROR_NO_AGGREGATION;
-
-    nsJARChannel* jarChannel = new nsJARChannel();
-    if (jarChannel == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(jarChannel);
-	rv = jarChannel->QueryInterface(aIID, aResult);
-    NS_RELEASE(jarChannel);
-	return rv;
-}
- 
-nsresult 
-nsJARChannel::Init(nsIJARProtocolHandler* aHandler, 
-                   const char* command, 
-                   nsIURI* uri,
-                   nsILoadGroup* aLoadGroup, 
-                   nsIInterfaceRequestor* notificationCallbacks,
-                   nsLoadFlags loadAttributes,
-                   nsIURI* originalURI,
-                   PRUint32 bufferSegmentSize,
-                   PRUint32 bufferMaxSize)
-{
-    nsresult rv;
-	mURI = do_QueryInterface(uri, &rv);
-    if (NS_FAILED(rv)) return rv;
-	mCommand = nsCRT::strdup(command);
-    if (mCommand == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY; 
-    mOriginalURI = originalURI ? originalURI : uri;
-    mBufferSegmentSize = bufferSegmentSize;
-    mBufferMaxSize = bufferMaxSize;
-
-    rv = SetLoadAttributes(loadAttributes);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = SetLoadGroup(aLoadGroup);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = SetNotificationCallbacks(notificationCallbacks);
-    if (NS_FAILED(rv)) return rv;
-
-    mMonitor = PR_NewMonitor();
-    if (mMonitor == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-	return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIRequest methods
-
-NS_IMETHODIMP
-nsJARChannel::IsPending(PRBool* result)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsJARChannel::Cancel()
-{
-    nsresult rv;
-    nsAutoMonitor monitor(mMonitor);
-
-    if (mJarCacheTransport) {
-        rv = mJarCacheTransport->Cancel();
-        if (NS_FAILED(rv)) return rv;
-        mJarCacheTransport = nsnull;
-    }
-    if (mJarExtractionTransport) {
-        rv = mJarExtractionTransport->Cancel();
-        if (NS_FAILED(rv)) return rv;
-        mJarExtractionTransport = nsnull;
-    }
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::Suspend()
-{
-    nsresult rv;
-    nsAutoMonitor monitor(mMonitor);
-
-    if (mJarCacheTransport) {
-        rv = mJarCacheTransport->Suspend();
-        if (NS_FAILED(rv)) return rv;
-    }
-    if (mJarExtractionTransport) {
-        rv = mJarExtractionTransport->Suspend();
-        if (NS_FAILED(rv)) return rv;
-    }
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::Resume()
-{
-    nsresult rv;
-    nsAutoMonitor monitor(mMonitor);
-
-    if (mJarCacheTransport) {
-        rv = mJarCacheTransport->Resume();
-        if (NS_FAILED(rv)) return rv;
-    }
-    if (mJarExtractionTransport) {
-        rv = mJarExtractionTransport->Resume();
-        if (NS_FAILED(rv)) return rv;
-    }
-
-	return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIChannel methods
-
-NS_IMETHODIMP
-nsJARChannel::GetOriginalURI(nsIURI* *aOriginalURI)
-{
-    *aOriginalURI = mOriginalURI;
-    NS_ADDREF(*aOriginalURI);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetURI(nsIURI* *aURI)
-{
-    *aURI = mURI;
-    NS_ADDREF(*aURI);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::OpenInputStream(PRUint32 startPosition, PRInt32 readCount, 
-							  nsIInputStream* *result)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsJARChannel::OpenOutputStream(PRUint32 startPosition, nsIOutputStream* *result)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsJARChannel::AsyncOpen(nsIStreamObserver* observer, nsISupports* ctxt)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsJARChannel::AsyncRead(PRUint32 startPosition, PRInt32 readCount, 
-						nsISupports* ctxt, 
-						nsIStreamListener* listener)
-{
-    nsresult rv;
-    rv = mURI->GetJARFile(getter_AddRefs(mJARBaseURI));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = mURI->GetJAREntry(&mJAREntry);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIChannel> jarBaseChannel;
-    rv = NS_OpenURI(getter_AddRefs(jarBaseChannel),
-                    mJARBaseURI, mLoadGroup, mCallbacks, mLoadAttributes);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIFileChannel> jarBaseFile = do_QueryInterface(jarBaseChannel, &rv);
-
-    // XXX need to set a state variable here to say we're reading
-    mStartPosition = startPosition;
-    mReadCount = readCount;
-    mUserContext = ctxt;
-    mUserListener = listener;
-
-    if (NS_SUCCEEDED(rv)) {
-        // then we've already got a local jar file -- no need to download it
-        rv = ExtractJARElement(jarBaseFile);
-    }
-    else {
-        // otherwise, we need to download the jar file
-
-        nsCOMPtr<nsIFile> jarCacheFile;
-        rv = GetCacheFile(getter_AddRefs(jarCacheFile));
-        if (NS_FAILED(rv)) return rv;
-        
-        PRBool filePresent;
-        
-		rv = jarCacheFile->IsFile(&filePresent);
-        
-        if (NS_SUCCEEDED(rv) && filePresent)
-        {
-	        // then we've already got the file in the local cache -- no need to download it
-            nsCOMPtr<nsIFileChannel> fileChannel;
-            rv = nsComponentManager::CreateInstance(kFileChannelCID,
-                                                    nsnull,
-                                                    NS_GET_IID(nsIFileChannel),
-                                                    getter_AddRefs(fileChannel));
-            if (NS_FAILED(rv)) return rv;
-
-            rv = fileChannel->Init(jarCacheFile, 
-                                   PR_RDONLY,
-                                   nsnull,       // contentType
-                                   -1,           // contentLength
-                                   nsnull,       // loadGroup
-                                   nsnull,       // notificationCallbacks
-                                   nsIChannel::LOAD_NORMAL,
-                                   nsnull,       // originalURI
-                                   mBufferSegmentSize,
-                                   mBufferMaxSize);
-            if (NS_FAILED(rv)) return rv;
-
-		    rv = ExtractJARElement(fileChannel);
-			return rv;
-		}
-
-        NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv);
-        if (NS_FAILED(rv)) return rv;
-
-        nsAutoMonitor monitor(mMonitor);
-
-        // use a file transport to serve as a data pump for the download (done
-        // on some other thread)
-        nsCOMPtr<nsIChannel> jarCacheTransport;
-        rv = fts->CreateTransport(jarCacheFile, PR_RDONLY, mCommand,
-                                  mBufferSegmentSize, mBufferMaxSize,
-                                  getter_AddRefs(mJarCacheTransport));
-        if (NS_FAILED(rv)) return rv;
-
-        rv = mJarCacheTransport->SetNotificationCallbacks(mCallbacks);
-        if (NS_FAILED(rv)) return rv;
-
-        nsCOMPtr<nsIStreamObserver> downloadObserver = new nsJARDownloadObserver(jarCacheFile, this);
-        if (downloadObserver == nsnull)
-            return NS_ERROR_OUT_OF_MEMORY;
-
-        nsCOMPtr<nsIInputStream> jarBaseIn;
-        rv = jarBaseChannel->OpenInputStream(0, -1, getter_AddRefs(jarBaseIn));
-        if (NS_FAILED(rv)) return rv;
-
-        rv = mJarCacheTransport->AsyncWrite(jarBaseIn, 0, -1, nsnull, downloadObserver);
-    }
-    return rv;
-}
-
-nsresult 
-nsJARChannel::GetCacheFile(nsIFile* *cacheFile)
-{
-    // XXX change later to use the real network cache
-    nsresult rv;
-
-    nsCOMPtr<nsIFile> jarCacheFile;
-    rv = NS_GetSpecialDirectory("xpcom.currentProcess.componentDirectory",
-                                getter_AddRefs(jarCacheFile));
-    if (NS_FAILED(rv)) return rv;
-
-    jarCacheFile->Append("jarCache");
-
-    PRBool exists;
-    rv = jarCacheFile->Exists(&exists);
-    if (NS_FAILED(rv)) return rv;
-    if (!exists) {
-        rv = jarCacheFile->Create(nsIFile::DIRECTORY_TYPE, 0664);
-        if (NS_FAILED(rv)) return rv;
-    }
-
-    nsCOMPtr<nsIURL> jarBaseURL = do_QueryInterface(mJARBaseURI, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    char* jarFileName;
-    rv = jarBaseURL->GetFileName(&jarFileName);
-    if (NS_FAILED(rv)) return rv;
-    rv = jarCacheFile->Append(jarFileName);
-    nsCRT::free(jarFileName);
-    if (NS_FAILED(rv)) return rv;
-    
-    *cacheFile = jarCacheFile;
-    NS_ADDREF(*cacheFile);
-    return rv;
-}
-
-nsresult
-nsJARChannel::ExtractJARElement(nsIFileChannel* jarBaseFile)
-{
-    nsresult rv;
-
-    nsAutoMonitor monitor(mMonitor);
-
-    mJARBaseFile = jarBaseFile;
-
-    NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = fts->CreateTransportFromFileSystem(this, mCommand,
-                                            mBufferSegmentSize, mBufferMaxSize,
-                                            getter_AddRefs(mJarExtractionTransport));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = mJarExtractionTransport->SetNotificationCallbacks(mCallbacks);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = mJarExtractionTransport->AsyncRead(mStartPosition, mReadCount, nsnull, this);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsJARChannel::AsyncWrite(nsIInputStream* fromStream, PRUint32 startPosition, 
-						 PRInt32 writeCount, 
-						 nsISupports* ctxt, 
-						 nsIStreamObserver* observer)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetLoadAttributes(PRUint32* aLoadFlags)
-{
-    *aLoadFlags = mLoadAttributes;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetLoadAttributes(PRUint32 aLoadFlags)
-{
-    mLoadAttributes = aLoadFlags;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetContentType(char* *aContentType)
-{
-    nsresult rv = NS_OK;
-    if (mContentType == nsnull) {
-        char* fileName = new char[PL_strlen(mJAREntry)+1];
-        PL_strcpy(fileName, mJAREntry);
-
-        if (fileName != nsnull) {
-            PRInt32 len = nsCRT::strlen(fileName);
-            const char* ext = nsnull;
-            for (PRInt32 i = len; i >= 0; i--) {
-                if (fileName[i] == '.') {
-                    ext = &fileName[i + 1];
-                    break;
-                }
-            }
-
-            if (ext) {
-                NS_WITH_SERVICE(nsIMIMEService, mimeServ, kMIMEServiceCID, &rv);
-                if (NS_SUCCEEDED(rv)) {
-                    rv = mimeServ->GetTypeFromExtension(ext, &mContentType);
-                }
-            }
-            else 
-                rv = NS_ERROR_FAILURE;
-		
-            nsCRT::free(fileName);
-        } 
-        else {
-            rv = NS_ERROR_FAILURE;
-        }
-
-        if (NS_FAILED(rv)) {
-            mContentType = nsCRT::strdup(UNKNOWN_CONTENT_TYPE);
-            if (mContentType == nsnull)
-                rv = NS_ERROR_OUT_OF_MEMORY;
-            else
-                rv = NS_OK;
-        }
-    }
-    if (NS_SUCCEEDED(rv)) {
-        *aContentType = nsCRT::strdup(mContentType);
-        if (*aContentType == nsnull)
-            rv = NS_ERROR_OUT_OF_MEMORY;
-    }
-    return rv;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetContentType(const char *aContentType)
-{
-    if (mContentType) {
-        nsCRT::free(mContentType);
-    }
-
-    mContentType = nsCRT::strdup(aContentType);
-    if (!mContentType) return NS_ERROR_OUT_OF_MEMORY;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetContentLength(PRInt32* aContentLength)
-{
-    if (mContentLength == -1)
-        return NS_ERROR_FAILURE;
-    *aContentLength = mContentLength;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
-{
-    *aLoadGroup = mLoadGroup;
-    NS_IF_ADDREF(*aLoadGroup);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
-{
-    mLoadGroup = aLoadGroup;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetOwner(nsISupports* *aOwner)
-{
-    nsCOMPtr<nsIPrincipal> principal;
-    nsresult rv = mJAR->GetPrincipal(mJAREntry, getter_AddRefs(principal));
-    if (NS_SUCCEEDED(rv) && principal)
-        rv = principal->QueryInterface(NS_GET_IID(nsISupports), (void **)aOwner);
-    else
-        *aOwner = nsnull;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetOwner(nsISupports* aOwner)
-{
-    //XXX: is this OK?
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
-{
-    *aNotificationCallbacks = mCallbacks.get();
-    NS_IF_ADDREF(*aNotificationCallbacks);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
-{
-    mCallbacks = aNotificationCallbacks;
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIStreamObserver methods:
-
-NS_IMETHODIMP
-nsJARChannel::OnStartRequest(nsIChannel* jarExtractionTransport,
-                             nsISupports* context)
-{
-    return mUserListener->OnStartRequest(this, mUserContext);
-}
-
-NS_IMETHODIMP
-nsJARChannel::OnStopRequest(nsIChannel* jarExtractionTransport,
-                            nsISupports* context, 
-                            nsresult status, 
-                            const PRUnichar* aMsg)
-{
-    nsresult rv;
-    rv = mUserListener->OnStopRequest(this, mUserContext, status, aMsg);
-    mJarExtractionTransport = nsnull;
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIStreamListener methods:
-
-NS_IMETHODIMP
-nsJARChannel::OnDataAvailable(nsIChannel* jarCacheTransport, 
-                              nsISupports* context, 
-                              nsIInputStream *inStr, 
-                              PRUint32 sourceOffset, 
-                              PRUint32 count)
-{
-    return mUserListener->OnDataAvailable(this, mUserContext, 
-                                          inStr, sourceOffset, count);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIFileSystem methods:
-
-NS_IMETHODIMP
-nsJARChannel::Open(char* *contentType, PRInt32 *contentLength) 
-{
-	nsresult rv;
-	rv = nsComponentManager::CreateInstance(kZipReaderCID,
-                                            nsnull,
-                                            NS_GET_IID(nsIZipReader),
-                                            getter_AddRefs(mJAR));
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIFile> fs;
-    rv = mJARBaseFile->GetFile(getter_AddRefs(fs));
-    if (NS_FAILED(rv)) return rv; 
-
-	rv = mJAR->Init(fs);
-    if (NS_FAILED(rv)) return rv; 
-
-	rv = mJAR->Open();
-    if (NS_FAILED(rv)) return rv; 
-
-    // If this fails, GetOwner will fail, but otherwise we can continue.
-	mJAR->ParseManifest();
-
-    nsCOMPtr<nsIZipEntry> entry;
-	rv = mJAR->GetEntry(mJAREntry, getter_AddRefs(entry));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = entry->GetRealSize((PRUint32*)contentLength);
-    if (NS_FAILED(rv)) return rv;
-
-    return GetContentType(contentType);
-}
-
-
-NS_IMETHODIMP
-nsJARChannel::Close(nsresult status) 
-{
-    mJAR = null_nsCOMPtr();
-	return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetInputStream(nsIInputStream* *aInputStream) 
-{
-	return mJAR->GetInputStream(mJAREntry, aInputStream);
-}
- 
-NS_IMETHODIMP
-nsJARChannel::GetOutputStream(nsIOutputStream* *aOutputStream) 
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIJARChannel methods:
-
-NS_IMETHODIMP
-nsJARChannel::EnumerateEntries(const char *aRoot, nsISimpleEnumerator **_retval)
-{
-	return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/modules/libjar/nsJARChannel.h

@@ -1,115 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsJARChannel_h__
-#define nsJARChannel_h__
-
-#include "nsIJARChannel.h"
-#include "nsIStreamListener.h"
-#include "nsIJARProtocolHandler.h"
-#include "nsIJARURI.h"
-#include "nsIFileSystem.h"
-#include "nsIChannel.h"
-#include "nsIZipReader.h"
-#include "nsIChannel.h"
-#include "nsILoadGroup.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsCOMPtr.h"
-#include "nsIFile.h"
-#include "prmon.h"
-
-class nsIFileChannel;
-
-#define NS_JARCHANNEL_CID							 \
-{ /* 0xc7e410d5-0x85f2-11d3-9f63-006008a6efe9 */     \
-    0xc7e410d5,                                      \
-    0x85f2,                                          \
-    0x11d3,                                          \
-    {0x9f, 0x63, 0x00, 0x60, 0x08, 0xa6, 0xef, 0xe9} \
-}
-
-#define JAR_DIRECTORY "jarCache"
-
-class nsJARChannel : public nsIJARChannel, 
-                     public nsIStreamListener,
-                     public nsIFileSystem
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIREQUEST
-    NS_DECL_NSICHANNEL
-    NS_DECL_NSIJARCHANNEL
-    NS_DECL_NSISTREAMOBSERVER
-    NS_DECL_NSISTREAMLISTENER
-    NS_DECL_NSIFILESYSTEM
-
-    nsJARChannel();
-    virtual ~nsJARChannel();
-
-    // Define a Create method to be used with a factory:
-    static NS_METHOD
-    Create(nsISupports* aOuter, REFNSIID aIID, void **aResult);
-
-    nsresult Init(nsIJARProtocolHandler* aHandler, 
-                  const char* command, 
-                  nsIURI* uri,
-                  nsILoadGroup* aLoadGroup, 
-                  nsIInterfaceRequestor* notificationCallbacks,
-                  nsLoadFlags loadAttributes,
-                  nsIURI* originalURI,
-                  PRUint32 bufferSegmentSize,
-                  PRUint32 bufferMaxSize);
-
-    nsresult ExtractJARElement(nsIFileChannel* jarFileChannel);
-    nsresult GetCacheFile(nsIFile* *cacheFile);
-
-    friend class nsJARDownloadObserver;
-
-protected:
-	char*                               mCommand;
-	nsCOMPtr<nsIJARURI>                 mURI;
-	nsCOMPtr<nsILoadGroup>              mLoadGroup;
-	nsCOMPtr<nsIInterfaceRequestor>     mCallbacks;
-	nsCOMPtr<nsIURI>                    mOriginalURI;
-    nsLoadFlags                         mLoadAttributes;
-
-    PRUint32                            mStartPosition;
-    PRInt32                             mReadCount;
-    nsCOMPtr<nsISupports>               mUserContext;
-    nsCOMPtr<nsIStreamListener>         mUserListener;
-
-    char*                               mContentType;
-    PRInt32                             mContentLength;
-    nsCOMPtr<nsIURI>                    mJARBaseURI;
-    nsCOMPtr<nsIFileChannel>            mJARBaseFile;
-    char*                               mJAREntry;
-    nsCOMPtr<nsIZipReader>              mJAR;
-    PRUint32                            mBufferSegmentSize;
-    PRUint32                            mBufferMaxSize;
-
-    PRMonitor*                          mMonitor;
-    nsCOMPtr<nsIChannel>                mJarCacheTransport;
-    nsCOMPtr<nsIChannel>                mJarExtractionTransport;
-
-};
-
-#endif // nsJARChannel_h__

mozilla/modules/libjar/nsJARProtocolHandler.cpp

@@ -1,146 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsJARProtocolHandler.h"
-#include "nsIIOService.h"
-#include "nsCRT.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsJARURI.h"
-#include "nsIURL.h"
-#include "nsJARChannel.h"
-
-static NS_DEFINE_CID(kIOServiceCID,     NS_IOSERVICE_CID);
-static NS_DEFINE_CID(kJARUriCID,        NS_JARURI_CID);
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsJARProtocolHandler::nsJARProtocolHandler()
-{
-    NS_INIT_REFCNT();
-}
-
-nsresult
-nsJARProtocolHandler::Init()
-{
-    return NS_OK;
-}
-
-nsJARProtocolHandler::~nsJARProtocolHandler()
-{
-}
-
-NS_IMPL_ISUPPORTS2(nsJARProtocolHandler, 
-                   nsIJARProtocolHandler, 
-                   nsIProtocolHandler)
-
-NS_METHOD
-nsJARProtocolHandler::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    if (aOuter)
-        return NS_ERROR_NO_AGGREGATION;
-
-    nsJARProtocolHandler* ph = new nsJARProtocolHandler();
-    if (ph == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(ph);
-    nsresult rv = ph->Init();
-    if (NS_SUCCEEDED(rv)) {
-        rv = ph->QueryInterface(aIID, aResult);
-    }
-    NS_RELEASE(ph);
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIProtocolHandler methods:
-
-NS_IMETHODIMP
-nsJARProtocolHandler::GetScheme(char* *result)
-{
-    *result = nsCRT::strdup("jar");
-    if (*result == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARProtocolHandler::GetDefaultPort(PRInt32 *result)
-{
-    *result = -1;        // no port for JAR: URLs
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARProtocolHandler::NewURI(const char *aSpec, nsIURI *aBaseURI,
-                             nsIURI **result)
-{
-    nsresult rv;
-    nsIURI* url;
-    if (aBaseURI) {
-        rv = aBaseURI->Clone(&url);
-        if (NS_FAILED(rv)) return rv;
-        rv = url->SetRelativePath(aSpec);
-    }
-    else {
-        rv = nsJARURI::Create(nsnull, NS_GET_IID(nsIJARURI), (void**)&url);
-        if (NS_FAILED(rv)) return rv;
-        rv = url->SetSpec((char*)aSpec);
-    }
-
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(url);
-        return rv;
-    }
-
-    *result = url;
-    return rv;
-}
-
-NS_IMETHODIMP
-nsJARProtocolHandler::NewChannel(const char* verb, nsIURI* uri,
-                                 nsILoadGroup* aLoadGroup,
-                                 nsIInterfaceRequestor* notificationCallbacks,
-                                 nsLoadFlags loadAttributes,
-                                 nsIURI* originalURI,
-                                 PRUint32 bufferSegmentSize,
-                                 PRUint32 bufferMaxSize,
-                                 nsIChannel* *result)
-{
-    nsresult rv;
-    
-	nsJARChannel* channel;
-    rv = nsJARChannel::Create(nsnull, NS_GET_IID(nsIJARChannel), (void**)&channel);
-    if (NS_FAILED(rv)) return rv;
-
-	rv = channel->Init(this, verb, uri, aLoadGroup, notificationCallbacks,
-                       loadAttributes, originalURI, bufferSegmentSize, bufferMaxSize);
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(channel);
-        return rv;
-    }
-
-    *result = channel;
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/modules/libjar/nsJARProtocolHandler.h

@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsJARProtocolHandler_h___
-#define nsJARProtocolHandler_h___
-
-#include "nsIJARProtocolHandler.h"
-#include "nsIProtocolHandler.h"
-#include "nsIJARURI.h"
-
-#define NS_JARPROTOCOLHANDLER_CID					 \
-{ /* 0xc7e410d4-0x85f2-11d3-9f63-006008a6efe9 */     \
-    0xc7e410d4,                                      \
-    0x85f2,                                          \
-    0x11d3,                                          \
-    {0x9f, 0x63, 0x00, 0x60, 0x08, 0xa6, 0xef, 0xe9} \
-}
-
-
-class nsJARProtocolHandler : public nsIJARProtocolHandler
-{
-public:
-    NS_DECL_ISUPPORTS
-	NS_DECL_NSIPROTOCOLHANDLER
-
-    // nsJARProtocolHandler methods:
-    nsJARProtocolHandler();
-    virtual ~nsJARProtocolHandler();
-
-    static NS_METHOD
-    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-    nsresult Init();
-
-protected:
-};
-
-#endif /* nsJARProtocolHandler_h___ */

mozilla/modules/libjar/nsJARProtocolModule.cpp

@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#include "nsIModule.h"
-#include "nsIGenericFactory.h"
-#include "nsJARProtocolHandler.h"
-
-
-static nsModuleComponentInfo components[] = 
-{
-    { "JAR Protocol Handler", 
-       NS_JARPROTOCOLHANDLER_CID,
-       NS_NETWORK_PROTOCOL_PROGID_PREFIX "jar", 
-       nsJARProtocolHandler::Create
-    },
-};
-
-NS_IMPL_NSGETMODULE("nsJarProtocolModule", components);
-
-

mozilla/modules/libjar/nsJARURI.cpp

@@ -1,384 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsJARURI.h"
-#include "nsNetUtil.h"
-#include "nsIIOService.h"
-#include "nsFileSpec.h"
-#include "nsCRT.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsIZipReader.h"
-
-static NS_DEFINE_CID(kIOServiceCID,     NS_IOSERVICE_CID);
- 
-////////////////////////////////////////////////////////////////////////////////
- 
-nsJARURI::nsJARURI()
-    : mJAREntry(nsnull)
-{
-    NS_INIT_REFCNT();
-}
- 
-nsJARURI::~nsJARURI()
-{
-}
-
-NS_IMPL_ISUPPORTS2(nsJARURI, nsIJARURI, nsIURI)
-
-NS_METHOD
-nsJARURI::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    if (aOuter)
-        return NS_ERROR_NO_AGGREGATION;
-
-    nsJARURI* uri = new nsJARURI();
-
-    if (uri == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(uri);
-    nsresult rv = uri->Init();
-
-    if (NS_SUCCEEDED(rv)) {
-        rv = uri->QueryInterface(aIID, aResult);
-    }
-    NS_RELEASE(uri);
-
-    return rv;
-}
- 
-nsresult
-nsJARURI::Init()
-{
-    return NS_OK;
-}
-
-#define NS_JAR_SCHEME           "jar:"
-#define NS_JAR_DELIMITER        "!/"
-
-nsresult
-nsJARURI::FormatSpec(const char* entryPath, char* *result)
-{
-    nsresult rv;
-    char* jarFileSpec;
-    rv = mJARFile->GetSpec(&jarFileSpec);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCString spec(NS_JAR_SCHEME);
-    spec += jarFileSpec;
-    nsCRT::free(jarFileSpec);
-    spec += NS_JAR_DELIMITER;
-    spec += entryPath;
-    
-    *result = nsCRT::strdup(spec);
-    return *result ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsURI methods:
-
-NS_IMETHODIMP
-nsJARURI::GetSpec(char* *aSpec)
-{
-    return FormatSpec(mJAREntry, aSpec);
-}
-
-NS_IMETHODIMP
-nsJARURI::SetSpec(const char * aSpec)
-{
-    nsresult rv;
-    NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    PRUint32 startPos, endPos;
-    rv = serv->ExtractScheme(aSpec, &startPos, &endPos, nsnull);
-    if (NS_FAILED(rv)) return rv;
-
-    if (nsCRT::strncmp("jar", &aSpec[startPos], endPos - startPos - 1) != 0)
-        return NS_ERROR_MALFORMED_URI;
-
-    // Search backward from the end for the "!/" delimiter. Remember, jar URLs
-    // can nest, e.g.:
-    //    jar:jar:http://www.foo.com/bar.jar!/a.jar!/b.html
-    // This gets the b.html document from out of the a.jar file, that's 
-    // contained within the bar.jar file.
-
-    nsCAutoString jarPath(aSpec);
-    PRInt32 pos = jarPath.RFind(NS_JAR_DELIMITER);
-    if (pos == -1 || endPos + 1 > (PRUint32)pos)
-        return NS_ERROR_MALFORMED_URI;
-
-    jarPath.Cut(pos, jarPath.Length());
-    jarPath.Cut(0, endPos);
-
-    rv = serv->NewURI(jarPath, nsnull, getter_AddRefs(mJARFile));
-    if (NS_FAILED(rv)) return rv;
-
-    nsCAutoString entry(aSpec);
-    entry.Cut(0, pos + 2);      // 2 == strlen(NS_JAR_DELIMITER)
-
-    rv = serv->ResolveRelativePath(entry, nsnull, &mJAREntry);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetScheme(char * *aScheme)
-{
-    *aScheme = nsCRT::strdup("jar");
-    return *aScheme ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetScheme(const char * aScheme)
-{
-    // doesn't make sense to set the scheme of a jar: URL
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetUsername(char * *aUsername)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetUsername(const char * aUsername)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetPassword(char * *aPassword)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetPassword(const char * aPassword)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetPreHost(char * *aPreHost)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetPreHost(const char * aPreHost)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetHost(char * *aHost)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetHost(const char * aHost)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetPort(PRInt32 *aPort)
-{
-    return NS_ERROR_FAILURE;
-}
- 
-NS_IMETHODIMP
-nsJARURI::SetPort(PRInt32 aPort)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetPath(char * *aPath)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetPath(const char * aPath)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetURLParser(nsIURLParser * *aURLParser)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetURLParser(nsIURLParser * aURLParser)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::Equals(nsIURI *other, PRBool *result)
-{
-    nsresult rv;
-    *result = PR_FALSE;
-
-    nsJARURI* otherJAR;
-    rv = other->QueryInterface(NS_GET_IID(nsIJARURI), (void**)&otherJAR);
-    if (NS_FAILED(rv))
-        return NS_OK;   // not equal
-
-    nsCOMPtr<nsIURI> otherJARFile;
-    rv = otherJAR->GetJARFile(getter_AddRefs(otherJARFile));
-    if (NS_FAILED(rv)) return rv;
-
-    PRBool equal;
-    rv = mJARFile->Equals(otherJARFile, &equal);
-    if (NS_FAILED(rv)) return rv;
-    if (!equal)
-        return NS_OK;   // not equal
-
-    char* otherJAREntry;
-    rv = otherJAR->GetJAREntry(&otherJAREntry);
-    if (NS_FAILED(rv)) return rv;
-
-    *result = nsCRT::strcmp(mJAREntry, otherJAREntry) == 0;
-    nsCRT::free(otherJAREntry);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARURI::Clone(nsIURI **result)
-{
-    nsresult rv;
-
-    nsCOMPtr<nsIURI> newJARFile;
-    rv = mJARFile->Clone(getter_AddRefs(newJARFile));
-    if (NS_FAILED(rv)) return rv;
-
-    char* newJAREntry = nsCRT::strdup(mJAREntry);
-    if (newJAREntry == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    nsJARURI* uri = new nsJARURI();
-    if (uri == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(uri);
-    uri->mJARFile = newJARFile;
-    uri->mJAREntry = newJAREntry;
-    *result = uri;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetRelativePath(const char *relativePath)
-{
-    nsresult rv;
-    NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCAutoString path(mJAREntry);
-    PRInt32 pos = path.RFind("/");
-    if (pos >= 0)
-        path.Truncate(pos + 1);
-    else
-        path = "";
-
-    char* resolvedEntry;
-    rv = serv->ResolveRelativePath(relativePath, path.GetBuffer(),
-                                   &resolvedEntry);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCRT::free(mJAREntry);
-    mJAREntry = resolvedEntry;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARURI::Resolve(const char *relativePath, char **result)
-{
-    nsresult rv;
-    NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCAutoString path(mJAREntry);
-    PRInt32 pos = path.RFind("/");
-    if (pos >= 0)
-        path.Truncate(pos + 1);
-    else
-        path = "";
-
-    char* resolvedEntry;
-    rv = serv->ResolveRelativePath(relativePath, path.GetBuffer(),
-                                   &resolvedEntry);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = FormatSpec(resolvedEntry, result);
-    nsCRT::free(resolvedEntry);
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIJARUri methods:
-
-NS_IMETHODIMP
-nsJARURI::GetJARFile(nsIURI* *jarFile)
-{
-    *jarFile = mJARFile;
-    NS_ADDREF(*jarFile);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetJARFile(nsIURI* jarFile)
-{
-    mJARFile = jarFile;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetJAREntry(char* *entryPath)
-{
-    nsCAutoString entry(mJAREntry);
-    PRInt32 pos = entry.RFindCharInSet("#?;");
-    if (pos >= 0)
-        entry.Truncate(pos);
-    *entryPath = entry.ToNewCString();
-    return *entryPath ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetJAREntry(const char* entryPath)
-{
-    nsresult rv;
-    NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    if (mJAREntry)
-        nsCRT::free(mJAREntry);
-
-    rv = serv->ResolveRelativePath(entryPath, nsnull, &mJAREntry);
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/modules/libjar/nsJARURI.h

@@ -1,55 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsJARURI_h__
-#define nsJARURI_h__
-
-#include "nsIJARURI.h"
-#include "nsCOMPtr.h"
-
-#define NS_JARURI_CID					 \
-{ /* 0xc7e410d7-0x85f2-11d3-9f63-006008a6efe9 */     \
-    0xc7e410d7,                                      \
-    0x85f2,                                          \
-    0x11d3,                                          \
-    {0x9f, 0x63, 0x00, 0x60, 0x08, 0xa6, 0xef, 0xe9} \
-}
-
-class nsJARURI : public nsIJARURI
-{
-public:    
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIURI
-    NS_DECL_NSIJARURI
-
-    // nsJARURI
-    nsJARURI();
-    virtual ~nsJARURI();
-   
-    static NS_METHOD
-    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-    nsresult Init();
-    nsresult FormatSpec(const char* entryPath, char* *result);
-
-protected:
-    nsCOMPtr<nsIURI> mJARFile;
-    char *mJAREntry;
-};
-
-#endif // nsJARURI_h__

mozilla/netwerk/Makefile.in

@@ -1,45 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= \
-		cache \
-		base \
-		dns \
-		socket \
-		build \
-		protocol \
-		mime \
-		streamconv \
-		$(NULL)
-
-ifdef ENABLE_TESTS
-DIRS		+= test
-endif
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/netwerk/base/Makefile.in

@@ -1,32 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= public src
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/netwerk/base/makefile.win

@@ -1,31 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH = ..\..
-
-MODULE = necko
-
-DIRS=          \
-	public \
-	src    \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>

mozilla/netwerk/base/public/MANIFEST

@@ -1,7 +0,0 @@
-#
-# This is a list of local files which get copied to the mozilla:dist directory
-#
-
-netCore.h
-nsNetUtil.h
-nsUnixColorPrintf.h

mozilla/netwerk/base/public/MANIFEST_IDL

@@ -1,17 +0,0 @@
-#
-# This is a list of local files which get copied to the mozilla:dist directory
-#
-
-nsIStreamListener.idl
-nsIStreamObserver.idl
-nsIURI.idl
-nsIURL.idl
-nsIChannel.idl
-nsIRequest.idl
-nsISocketTransportService.idl
-nsIFileTransportService.idl
-nsIFileSystem.idl
-nsIPrompt.idl
-nsIStreamLoader.idl
-nsIURLParser.idl
-nsIProtocolProxyService.idl

mozilla/netwerk/base/public/Makefile.in

@@ -1,67 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= necko
-XPIDL_MODULE	= necko_base
-
-XPIDLSRCS	= \
-		nsIFileStreams.idl \
-		nsIRequest.idl \
-		nsIChannel.idl \
-		nsIURI.idl \
-		nsIURL.idl \
-		nsIStreamObserver.idl \
-		nsIStreamListener.idl \
-		nsIIOService.idl \
-		nsIPrompt.idl \
-		nsIProtocolHandler.idl \
-		nsIProgressEventSink.idl \
-		nsINetModRegEntry.idl \
-		nsINetModuleMgr.idl \
-		nsINetNotify.idl \
-		nsILoadGroup.idl \
-		nsIFileTransportService.idl \
-		nsISocketTransportService.idl \
-		nsIStatusCodeEventSink.idl \
-		nsIFileSystem.idl \
-		nsIStreamLoader.idl \
-		nsINetPrompt.idl \
-		nsISocketTransport.idl \
-		nsIURLParser.idl \
-		nsIProxy.idl \
-		nsIProtocolProxyService.idl \
-		$(NULL)
-
-EXPORTS		= \
-		netCore.h \
-		nsNetUtil.h \
-        nsUnixColorPrintf.h \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/netwerk/base/public/makefile.win

@@ -1,66 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-MODULE = necko
-
-DEPTH = ..\..\..
-include <$(DEPTH)/config/config.mak>
-
-EXPORTS =                           \
-        netCore.h                   \
-        nsNetUtil.h                 \
-        nsUnixColorPrintf.h         \
-        $(NULL)
-
-XPIDLSRCS =                             \
-        .\nsIFileStreams.idl            \
-        .\nsIRequest.idl                \
-        .\nsIChannel.idl                \
-        .\nsIURI.idl                    \
-        .\nsIURL.idl                    \
-        .\nsIStreamObserver.idl         \
-        .\nsIStreamListener.idl         \
-        .\nsIIOService.idl              \
-        .\nsIPrompt.idl                 \
-        .\nsIProtocolHandler.idl        \
-        .\nsIProgressEventSink.idl      \
-        .\nsINetModRegEntry.idl         \
-        .\nsINetModuleMgr.idl           \
-        .\nsINetNotify.idl              \
-        .\nsILoadGroup.idl              \
-        .\nsISocketTransportService.idl \
-        .\nsIFileTransportService.idl   \
-        .\nsIStatusCodeEventSink.idl    \
-        .\nsIFileSystem.idl             \
-        .\nsIStreamLoader.idl           \
-        .\nsINetPrompt.idl    		\
-        .\nsISocketTransport.idl        \
-	    .\nsIURLParser.idl              \
-        .\nsIProxy.idl                  \
-        .\nsIProtocolProxyService.idl   \
-        $(NULL)
-
-include <$(DEPTH)/config/rules.mak>
-
-$(DEPTH)\netwerk\dist\include: 
-        -mkdir $(DEPTH)\netwerk\dist
-        -mkdir $(DEPTH)\netwerk\dist\include
-

mozilla/netwerk/base/public/netCore.h

@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef __netCore_h__
-#define __netCore_h__
-
-#include "nsError.h"
-
- /* networking error codes */
-
-// NET RANGE:   1 -20
-// FTP RANGE:   21-30
-// HTTP RANGE:  31-40
-// DNS RANGE:   41-50 
-
-#define NS_ERROR_ALREADY_CONNECTED \
-    NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 11)
-
-#define NS_ERROR_NOT_CONNECTED \
-    NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 12)
-
-/* NS_ERROR_CONNECTION_REFUSED and NS_ERROR_NET_TIMEOUT moved to nsISocketTransportService.idl */
-
-#define NS_ERROR_IN_PROGRESS \
-    NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 15)
-
-#define NS_ERROR_OFFLINE \
-    NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 16)
-
-#undef NS_NET
-#ifdef _IMPL_NS_NET
-#ifdef XP_PC
-#define NS_NET _declspec(dllexport)
-#else  /* !XP_PC */
-#define NS_NET
-#endif /* !XP_PC */
-#else  /* !_IMPL_NS_NET */
-#ifdef XP_PC
-#define NS_NET _declspec(dllimport)
-#else  /* !XP_PC */
-#define NS_NET
-#endif /* !XP_PC */
-#endif /* !_IMPL_NS_NET */
-
-#endif // __netCore_h__

mozilla/netwerk/base/public/nsIChannel.idl

@@ -1,289 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIRequest.idl"
-
-interface nsIURI;
-interface nsIInputStream;
-interface nsIOutputStream;
-interface nsIStreamObserver;
-interface nsIStreamListener;
-interface nsILoadGroup;
-interface nsIInterfaceRequestor;
-interface nsIFile;
-
-typedef unsigned long nsLoadFlags;
-
-/**
- * nsIChannel is the abstract base class for transports and URLs.
- * It's abstract in that it doesn't provide a means to specify the
- * location/destination of the data being accessed. 
- */
-[scriptable, uuid(2d905684-8b5c-11d3-8cd9-0060b0fc14a3)]
-interface nsIChannel : nsIRequest
-{
-    /**
-     * Returns the original URL used to construct the channel.
-     */
-    readonly attribute nsIURI originalURI;
-
-    /**
-     * Returns the URL to which the channel currently refers.
-     */
-    readonly attribute nsIURI URI;
-
-    /**
-     * Opens a blocking input stream to the URL's specified source.
-     * @param startPosition - The offset from the start of the data
-     *   from which to read.
-     * @param readCount - The number of bytes to read. If -1, everything
-     *   up to the end of the data is read. If greater than the end of 
-     *   the data, the amount available is returned in the stream.
-     */
-    nsIInputStream openInputStream(in unsigned long startPosition,
-                                   in long readCount);
-
-    /**
-     * Opens a blocking output stream to the URL's specified destination.
-     * @param startPosition - The offset from the start of the data
-     *   from which to begin writing.
-     */
-    nsIOutputStream openOutputStream(in unsigned long startPosition);
-
-    /**
-     * Opens the channel asynchronously. The nsIStreamObserver's OnStartRequest
-     * method is called back when the channel actually becomes open, providing 
-     * the content type. Its OnStopRequest method is called when the channel
-     * becomes closed.
-     */
-    void asyncOpen(in nsIStreamObserver observer, 
-                   in nsISupports ctxt);
-
-    /**
-     * Reads asynchronously from the URL's specified source. Notifications
-     * are provided to the stream listener on the thread of the specified
-     * event queue.
-     * The startPosition argument designates the offset in the source where
-     * the data will be read.
-     * If the readCount == -1 then all the available data is delivered to
-     * the stream listener.
-     */
-    void asyncRead(in unsigned long startPosition,
-                   in long readCount,
-                   in nsISupports ctxt,
-                   in nsIStreamListener listener);
-
-    /**
-     * Writes asynchronously to the URL's specified destination. Notifications
-     * are provided to the stream observer on the thread of the specified
-     * event queue.
-     * The startPosition argument designates the offset in the destination where
-     * the data will be written.
-     * If the writeCount == -1, then all the available data in the input
-     * stream is written.
-     */
-    void asyncWrite(in nsIInputStream fromStream,
-                    in unsigned long startPosition,
-                    in long writeCount,
-                    in nsISupports ctxt,
-                    in nsIStreamObserver observer);
-
-    /**
-     * Load attribute flags. These may be or'd together.
-     *
-     * Note that more will follow for each protocol's implementation of a channel, 
-     * although channel writers have to be careful to not let the flag bits 
-     * overlap. Otherwise, users won't be able to create a single flag word
-     * of load attributes that applies to a number of different channel types.
-     */
-    const unsigned long LOAD_NORMAL     = 0;      /* no special load attributes -- use defaults */
-    const unsigned long LOAD_BACKGROUND = 1 << 0; /* don't deliver status notifications to the
-                                                   * nsIProgressEventSink, or keep this load from
-                                                   * completing the nsILoadGroup it may belong to */
-
-    const unsigned long LOAD_DOCUMENT_URI = 1 << 1;
-	const unsigned long LOAD_RETARGETED_DOCUMENT_URI = 1 << 2; /* if the end consumer for this
-																  load has been retargeted after 
-																  discovering it's content, this flag
-																  will be set */
-    //
-    // The following flags control caching behavior.  Not all protocols pay
-    // attention to all these flags, but they are applicable to more than one
-    // protocol, so they are defined here.
-    //
-
-    // Don't store data in the disk cache.  This can be used to preserve
-    // privacy, e.g. so that no https transactions are recorded, or to avoid
-    // caching a stream to disk that is already stored in a local file,
-    // e.g. the mailbox: protocol.
-    const unsigned long INHIBIT_PERSISTENT_CACHING = 1 <<  8;
-
-    // Force an end-to-end download of content data from the origin server (and
-    // any intervening proxies that sit between it and the client), e.g. this
-    // flag is used for a shift-reload.
-    const unsigned long FORCE_RELOAD               = 1 <<  9;
-
-    // Force revalidation with server (or proxy) to verify that cached content
-    // is up-to-date, e.g. by comparing last-modified date on server with that
-    // of the cached version.  For example, this flag is used when the reload
-    // button is pressed.
-    const unsigned long FORCE_VALIDATION           = 1 << 10;
-
-    // If the CACHE_AS_FILE flag is set, any stream content is stored in the
-    // cache as a single disk file.  Content will not be cached in the memory
-    // cache nor will it be stored in any other type of cache, e.g. a flat-file
-    // cache database.  This is used to implement the jar protocol handler and
-    // to provide the stream-as-file semantics required by the classic browser
-    // plugin API.
-    const unsigned long CACHE_AS_FILE              = 1 << 11;
-
-    // When cache data is potentially out of date, it can be revalidated with
-    // the origin server to see if the content needs to be reloaded.  The
-    // following four flags control how often this validation occurs.
-    // These flags are commonly used for "normal" loading.  Note that
-    // the VALIDATE_HEURISTICALLY and VALIDATE_ONCE_PER_SESSION flags can be
-    // combined to validate heuristically but no more than once per session.
-    //
-    const unsigned long VALIDATE_NEVER             = 1 << 12;
-    const unsigned long VALIDATE_ALWAYS            = 1 << 13;
-    const unsigned long VALIDATE_ONCE_PER_SESSION  = 1 << 14;
-    const unsigned long VALIDATE_HEURISTICALLY     = 1 << 15;
-    
-
-    /**
-     * Accesses the load attributes for the channel. E.g. setting the load 
-     * attributes with the LOAD_QUIET bit set causes the loading process to
-     * not deliver status notifications to the program performing the load,
-     * and to not contribute to keeping any nsILoadGroup it may be contained
-     * in from firing its OnLoadComplete notification.
-     */
-    attribute nsLoadFlags loadAttributes;
-
-    /**
-     * Returns the content MIME type of the channel if available. Note that the 
-     * content type can often be wrongly specified (wrong file extension, wrong
-     * MIME type, wrong document type stored on a server, etc.) and the caller
-     * most likely wants to verify with the actual data. 
-     */
-    attribute string contentType;
-
-    /**
-     * Returns the length of the data assiciated with the channel if available.
-     * If the length is unknown then -1 is returned.
-     */
-    readonly attribute long contentLength;
-
-    /**
-     * Accesses the owner corresponding to the entity that is 
-     * responsible for this channel. Used by security code to grant
-     * or diminish privileges to mobile code loaded from this channel. 
-     */
-    attribute nsISupports owner;
-
-    /**
-     * Accesses the load group in which the channel is a currently a member.
-     */
-    attribute nsILoadGroup loadGroup;
-
-    /**
-     * Accesses the capabilities callbacks of the channel. This is set by clients
-     * who wish to provide a means to receive progress, status and protocol-specific 
-     * notifications.
-     */
-    attribute nsIInterfaceRequestor notificationCallbacks;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * nsIInputStreamChannel is an interface that allows for the initialization
- * of a simple nsIChannel that is constructed from a single input stream and
- * associated content type. Input stream channels only allow the input stream
- * to be accessed, not the output stream.
- */
-[scriptable, uuid(bfbf843a-8b89-11d3-8cd9-0060b0fc14a3)]
-interface nsIInputStreamChannel : nsIChannel
-{
-    void init(in nsIURI uri,
-              in string contentType, 
-              in long contentLength,
-              in nsIInputStream inStr,
-              in nsILoadGroup aLoadGroup,
-              in nsIInterfaceRequestor notificationCallbacks,
-              in nsLoadFlags loadAttributes,
-              in nsIURI originalURI,
-              in unsigned long bufferSegmentSize,
-              in unsigned long bufferMaxSize);
-};
-
-%{C++
-
-#define NS_INPUTSTREAMCHANNEL_CID                    \
-{ /* 436d84f8-8b8a-11d3-8cd9-0060b0fc14a3 */         \
-    0x436d84f8,                                      \
-    0x8b8a,                                          \
-    0x11d3,                                          \
-    {0x8c, 0xd9, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
-}
-
-%}
-
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * 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(6eef6444-c7e3-11d3-8cda-0060b0fc14a3)]
-interface nsIFileChannel : nsIChannel
-{
-    void init(in nsIFile file,
-              in long mode,
-              in string contentType, 
-              in long contentLength,
-              in nsILoadGroup aLoadGroup,
-              in nsIInterfaceRequestor notificationCallbacks,
-              in nsLoadFlags loadAttributes,
-              in nsIURI originalURI,
-              in unsigned long bufferSegmentSize,
-              in unsigned long bufferMaxSize);
-    
-    readonly attribute nsIFile file;
-};
-
-%{C++
-
-#define NS_FILECHANNEL_CLASSNAME "File Channel"
-#define NS_FILECHANNEL_PROGID "component://netscape/network/file-channel"
-
-#define NS_FILECHANNEL_CID                           \
-{ /* 7036066e-c7e3-11d3-8cda-0060b0fc14a3 */         \
-    0x7036066e,                                      \
-    0xc7e3,                                          \
-    0x11d3,                                          \
-    {0x8c, 0xda, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
-}
-
-%}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/netwerk/base/public/nsIEventSinkGetter.idl

@@ -1,30 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(fb65fd70-1881-11d3-9337-00104ba0fd40)]
-interface nsIEventSinkGetter : nsISupports
-{
-    nsISupports getEventSink(in string command, in nsIIDRef eventSinkIID);
-};
-

mozilla/netwerk/base/public/nsIFileStreams.idl

@@ -1,244 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIInputStream.idl"
-#include "nsIOutputStream.idl"
-#include "nsILocalFile.idl"
-
-[scriptable, uuid(e3d56a20-c7ec-11d3-8cda-0060b0fc14a3)]
-interface nsIFileInputStream : nsIInputStream
-{
-    void init(in nsILocalFile file);
-};
-
-[scriptable, uuid(e6f68040-c7ec-11d3-8cda-0060b0fc14a3)]
-interface nsIFileOutputStream : nsIOutputStream
-{
-    void init(in nsILocalFile file, in long flags, in long mode);
-};
-
-[scriptable, uuid(e9de5df0-c7ec-11d3-8cda-0060b0fc14a3)]
-interface nsISeekableStream : nsISupports
-{
-    // correspond to PRSeekWhence values
-    const long NS_SEEK_SET = 0;
-    const long NS_SEEK_CUR = 1;
-    const long NS_SEEK_END = 2;
-    
-    void seek(in long whence, in long offset);
-    unsigned long tell();
-};
-
-[scriptable, uuid(616f5b48-da09-11d3-8cda-0060b0fc14a3)]
-interface nsIBufferedInputStream : nsIInputStream
-{
-    void init(in nsIInputStream fillFromStream,
-              in unsigned long bufferSize);
-};
-
-[scriptable, uuid(6476378a-da09-11d3-8cda-0060b0fc14a3)]
-interface nsIBufferedOutputStream : nsIOutputStream
-{
-    void init(in nsIOutputStream sinkToStream,
-              in unsigned long bufferSize);
-};
-
-%{C++
-
-////////////////////////////////////////////////////////////////////////////////
-
-#define NS_FILEINPUTSTREAM_CLASSNAME "File Input Stream"
-#define NS_FILEINPUTSTREAM_PROGID "component://netscape/network/file-input-stream"
-
-#define NS_FILEINPUTSTREAM_CID                       \
-{ /* be9a53ae-c7e9-11d3-8cda-0060b0fc14a3 */         \
-    0xbe9a53ae,                                      \
-    0xc7e9,                                          \
-    0x11d3,                                          \
-    {0x8c, 0xda, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
-}
-
-#define NS_FILEOUTPUTSTREAM_CLASSNAME "File Output Stream"
-#define NS_FILEOUTPUTSTREAM_PROGID "component://netscape/network/file-output-stream"
-
-#define NS_FILEOUTPUTSTREAM_CID                      \
-{ /* c272fee0-c7e9-11d3-8cda-0060b0fc14a3 */         \
-    0xc272fee0,                                      \
-    0xc7e9,                                          \
-    0x11d3,                                          \
-    {0x8c, 0xda, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-#define NS_BUFFEREDINPUTSTREAM_CLASSNAME "Buffered Input Stream"
-#define NS_BUFFEREDINPUTSTREAM_PROGID "component://netscape/network/buffered-input-stream"
-
-#define NS_BUFFEREDINPUTSTREAM_CID                   \
-{ /* 9226888e-da08-11d3-8cda-0060b0fc14a3 */         \
-    0x9226888e,                                      \
-    0xda08,                                          \
-    0x11d3,                                          \
-    {0x8c, 0xda, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
-}
-
-#define NS_BUFFEREDOUTPUTSTREAM_CLASSNAME "Buffered Output Stream"
-#define NS_BUFFEREDOUTPUTSTREAM_PROGID "component://netscape/network/buffered-output-stream"
-
-#define NS_BUFFEREDOUTPUTSTREAM_CID                  \
-{ /* 9868b4ce-da08-11d3-8cda-0060b0fc14a3 */         \
-    0x9868b4ce,                                      \
-    0xda08,                                          \
-    0x11d3,                                          \
-    {0x8c, 0xda, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// move to nsNetUtil.h later...
-
-#include "nsILoadGroup.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsCOMPtr.h"
-#include "nsIServiceManager.h"
-#include "nsIChannel.h"
-#include "nsILocalFile.h"
-#include "nsIInputStream.h"
-#include "nsIOutputStream.h"
-#include "prio.h"       // for read/write modes, etc.
-
-inline nsresult
-NS_NewFileChannel(nsIFile* file,
-                  PRInt32 mode,
-                  const char* contentType, 
-                  PRUint32 contentLength,
-                  nsILoadGroup* group,
-                  nsIInterfaceRequestor* notificationCallbacks,
-                  nsLoadFlags loadAttributes,
-                  nsIURI* originalURI,
-                  PRUint32 bufferSegmentSize,
-                  PRUint32 bufferMaxSize,
-                  nsIFileChannel **result)
-{
-    nsresult rv;
-    nsCOMPtr<nsIFileChannel> channel;
-    static NS_DEFINE_CID(kFileChannelCID, NS_FILECHANNEL_CID);
-    rv = nsComponentManager::CreateInstance(kFileChannelCID,
-                                            nsnull, 
-                                            NS_GET_IID(nsIFileChannel),
-                                            getter_AddRefs(channel));
-    if (NS_FAILED(rv)) return rv;
-    rv = channel->Init(file, mode, contentType, contentLength, group, 
-                       notificationCallbacks, loadAttributes, originalURI,
-                       bufferSegmentSize, bufferMaxSize);
-    if (NS_FAILED(rv)) return rv;
-
-    *result = channel;
-    NS_ADDREF(*result);
-    return NS_OK;
-}
-
-inline nsresult
-NS_NewFileInputStream(nsIFile* file, nsIInputStream* *result)
-{
-    nsresult rv;
-    nsCOMPtr<nsIFileInputStream> in;
-    static NS_DEFINE_CID(kFileInputStreamCID, NS_FILEINPUTSTREAM_CID);
-    rv = nsComponentManager::CreateInstance(kFileInputStreamCID,
-                                            nsnull, 
-                                            NS_GET_IID(nsIFileInputStream),
-                                            getter_AddRefs(in));
-    if (NS_FAILED(rv)) return rv;
-    nsCOMPtr<nsILocalFile> localFile = do_QueryInterface(file, &rv);
-    if (NS_FAILED(rv)) return rv;
-    rv = in->Init(localFile);
-    if (NS_FAILED(rv)) return rv;
-
-    *result = in;
-    NS_ADDREF(*result);
-    return NS_OK;
-}
-
-inline nsresult
-NS_NewFileOutputStream(nsIFile* file, PRInt32 flags, PRInt32 mode,
-                       nsIOutputStream* *result)
-{
-    nsresult rv;
-    nsCOMPtr<nsIFileOutputStream> out;
-    static NS_DEFINE_CID(kFileOutputStreamCID, NS_FILEOUTPUTSTREAM_CID);
-    rv = nsComponentManager::CreateInstance(kFileOutputStreamCID,
-                                            nsnull, 
-                                            NS_GET_IID(nsIFileOutputStream),
-                                            getter_AddRefs(out));
-    if (NS_FAILED(rv)) return rv;
-    nsCOMPtr<nsILocalFile> localFile = do_QueryInterface(file, &rv);
-    if (NS_FAILED(rv)) return rv;
-    rv = out->Init(localFile, flags, mode);
-    if (NS_FAILED(rv)) return rv;
-
-    *result = out;
-    NS_ADDREF(*result);
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-inline nsresult
-NS_NewBufferedInputStream(nsIInputStream* str, PRUint32 bufferSize, 
-                          nsIInputStream* *result)
-{
-    nsresult rv;
-    nsCOMPtr<nsIBufferedInputStream> in;
-    static NS_DEFINE_CID(kBufferedInputStreamCID, NS_BUFFEREDINPUTSTREAM_CID);
-    rv = nsComponentManager::CreateInstance(kBufferedInputStreamCID,
-                                            nsnull, 
-                                            NS_GET_IID(nsIBufferedInputStream),
-                                            getter_AddRefs(in));
-    if (NS_FAILED(rv)) return rv;
-    rv = in->Init(str, bufferSize);
-    if (NS_FAILED(rv)) return rv;
-
-    *result = in;
-    NS_ADDREF(*result);
-    return NS_OK;
-}
-
-inline nsresult
-NS_NewBufferedOutputStream(nsIOutputStream* str, PRUint32 bufferSize,
-                           nsIOutputStream* *result)
-{
-    nsresult rv;
-    nsCOMPtr<nsIBufferedOutputStream> out;
-    static NS_DEFINE_CID(kBufferedOutputStreamCID, NS_BUFFEREDOUTPUTSTREAM_CID);
-    rv = nsComponentManager::CreateInstance(kBufferedOutputStreamCID,
-                                            nsnull, 
-                                            NS_GET_IID(nsIBufferedOutputStream),
-                                            getter_AddRefs(out));
-    if (NS_FAILED(rv)) return rv;
-    rv = out->Init(str, bufferSize);
-    if (NS_FAILED(rv)) return rv;
-
-    *result = out;
-    NS_ADDREF(*result);
-    return NS_OK;
-}
-
-%}

mozilla/netwerk/base/public/nsIFileSystem.idl

@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-interface nsIInputStream;
-interface nsIOutputStream;
-
-[scriptable, uuid(818e1370-77c4-11d3-9395-00104ba0fd40)]
-interface nsIFileSystem : nsISupports
-{
-    void open(out string contentType,
-              out long contentLength);
-
-    void close(in nsresult status);
-    
-    readonly attribute nsIInputStream inputStream;
-
-    readonly attribute nsIOutputStream outputStream;
-};
-

mozilla/netwerk/base/public/nsIFileTransportService.idl

@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-%{C++
-#include "nsFileSpec.h"
-%}
-
-interface nsIChannel;
-interface nsIFileSystem;
-interface nsIEventSinkGetter;
-interface nsIInputStream;
-interface nsIRunnable;
-interface nsIFile;
-
-[scriptable, uuid(57211a60-8c45-11d3-93ac-00104ba0fd40)]
-interface nsIFileTransportService : nsISupports
-{
-    nsIChannel createTransport(in nsIFile file,
-                               in long mode,
-                               in string command,
-                               in unsigned long bufferSegmentSize,
-                               in unsigned long bufferMaxSize);
-
-    // This version can be used with an existing input stream to serve
-    // as a data pump:
-    nsIChannel createTransportFromStream(in nsIInputStream fromStream,
-                                         in string contentType,
-                                         in long contentLength,
-                                         in string command,
-                                         in unsigned long bufferSegmentSize,
-                                         in unsigned long bufferMaxSize);
-
-    nsIChannel createTransportFromFileSystem(in nsIFileSystem fsObj,
-                                             in string command,
-                                             in unsigned long bufferSegmentSize,
-                                             in unsigned long bufferMaxSize);
-
-    void dispatchRequest(in nsIRunnable runnable);
-    void suspend(in nsIRunnable trans);
-    void resume(in nsIRunnable trans);
-    void processPendingRequests();
-    void shutdown();
-};
-
-%{C++
-#define NS_FILETRANSPORTSERVICE_CID                  \
-{ /* 2bb2b250-ea35-11d2-931b-00104ba0fd40 */         \
-    0x2bb2b250,                                      \
-    0xea35,                                          \
-    0x11d2,                                          \
-    {0x93, 0x1b, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
-}
-%}

mozilla/netwerk/base/public/nsIIOService.idl

@@ -1,175 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-#include "nsIChannel.idl"
-
-interface nsIProtocolHandler;
-interface nsIURI;
-interface nsIInterfaceRequestor;
-interface nsIStreamObserver;
-interface nsIStreamListener;
-interface nsIEventQueue;
-interface nsIBufferInputStream;
-interface nsIInputStream;
-interface nsIBufferOutputStream;
-interface nsIFileChannel;
-interface nsILoadGroup;
-interface nsILoadGroupObserver;
-interface nsIFile;
-interface nsIInputStream;
-interface nsIOutputStream;
-
-[scriptable, uuid(ab7c3a84-d488-11d3-8cda-0060b0fc14a3)]
-interface nsIIOService : nsISupports
-{
-    /**
-     * constants for the Escape mask in the call to URLEscape
-     */
-    const short url_Scheme        = (1<<0);
-    const short url_Username      = (1<<1);
-    const short url_Password      = (1<<2);
-    const short url_Host          = (1<<3);
-    const short url_Directory     = (1<<4);
-    const short url_FileBaseName  = (1<<5);
-    const short url_FileExtension = (1<<6);
-    const short url_Param         = (1<<7);
-    const short url_Query         = (1<<8);
-    const short url_Ref           = (1<<9);
-
-    /**
-     * Returns a protocol handler for a given URI scheme.
-     */
-    nsIProtocolHandler getProtocolHandler(in string scheme);
-
-    /**
-     * This method constructs a new URI by first determining the scheme
-     * of the URI spec, and then delegating the construction of the URI
-     * to the protocol handler for that scheme. QueryInterface can be used
-     * on the resulting URI object to obtain a more specific type of URI.
-     */
-    nsIURI newURI(in string aSpec, in nsIURI aBaseURI);
-
-    /**
-     * Creates a channel for a given URI. The notificationCallbacks argument
-     * is used to obtain the appropriate callbacks for the URI's protocol from the
-     * application.
-     *
-     * @param originalURI - Specifies the original URI which caused the creation
-     * of this channel. This can occur when the construction of one channel
-     * (e.g. for resource:) causes another channel to be created on its behalf
-     * (e.g. a file: channel), or if a redirect occurs, causing the current
-     * URL to become different from the original URL. If NULL, the aURI parameter
-     * will be used as the originalURI instead.
-     */
-    nsIChannel newChannelFromURI(in string verb,
-                                 in nsIURI aURI,
-                                 in nsILoadGroup aLoadGroup,
-                                 in nsIInterfaceRequestor notificationCallbacks,
-                                 in nsLoadFlags loadAttributes,
-                                 in nsIURI originalURI,
-                                 in unsigned long bufferSegmentSize,
-                                 in unsigned long bufferMaxSize);
-
-    /**
-     * Convenience routine that first creates a URI by calling NewURI, and
-     * then passes the URI to NewChannelFromURI. 
-     */
-    nsIChannel newChannel(in string verb,
-                          in string aSpec,
-                          in nsIURI aBaseURI,
-                          in nsILoadGroup aLoadGroup,
-                          in nsIInterfaceRequestor notificationCallbacks,
-                          in nsLoadFlags loadAttributes,
-                          in nsIURI originalURI,
-                          in unsigned long bufferSegmentSize,
-                          in unsigned long bufferMaxSize);
-
-    /**
-     * Returns true if networking is in "offline" mode. When in offline mode, attempts
-     * to access the network will fail (although this is not necessarily corrolated with
-     * whether there is actually a network available -- that's hard to detect without
-     * causing the dialer to come up).
-     */
-    attribute boolean offline;
-
-    ////////////////////////////////////////////////////////////////////////////
-    // URL parsing utilities
-
-    /**
-     * Utility for protocol implementors -- extracts the scheme from a URL 
-     * string, consistently and according to spec.
-     * @param urlString - the URL string to parse
-     * @param schemeStartPos - the resulting starting position of the scheme substring
-     *        (may skip over whitespace)
-     * @param schemeEndPos - the resulting ending position of the scheme substring
-     *        (the position of the colon)
-     * @param scheme - an allocated substring containing the scheme. If this parameter
-     *        is null going into the routine, then the scheme is not allocated and
-     *        returned. Free with nsCRT::free.
-     *
-     * @return NS_OK - if successful
-     * @return NS_ERROR_MALFORMED_URI - if the urlString is not of the right form
-     */
-    void extractScheme(in string urlString,
-                       out unsigned long schemeStartPos,
-                       out unsigned long schemeEndPos,
-                       out string scheme);
-
-    /**
-     * Encode characters into % escaped hexcodes.
-     */
-    string escape(in string str, in short mask);
-
-    /**
-     * Decode % escaped hex codes into character values.
-     */
-    string unescape(in string str);
-
-    /**
-     * Get port from string.
-     */
-    long extractPort(in string str);
-
-    /**
-     * Resolves a relative path string containing "." and ".."
-     * with respect to a base path (assumed to already be resolved). 
-     * For example, resolving "../../foo/./bar/../baz.html" w.r.t.
-     * "/a/b/c/d/e/" yields "/a/b/c/foo/baz.html". Attempting to 
-     * ascend above the base results in the NS_ERROR_MALFORMED_URI
-     * exception. If basePath is null, it treats it as "/".
-     */
-    string resolveRelativePath(in string relativePath,
-                               in string basePath);
-};
-
-%{C++
-
-#define NS_IOSERVICE_CID                             \
-{ /* 9ac9e770-18bc-11d3-9337-00104ba0fd40 */         \
-    0x9ac9e770,                                      \
-    0x18bc,                                          \
-    0x11d3,                                          \
-    {0x93, 0x37, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
-}
-
-%}

mozilla/netwerk/base/public/nsILoadGroup.idl

@@ -1,104 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIRequest.idl"
-
-interface nsIChannel;
-interface nsISimpleEnumerator;
-interface nsIStreamObserver;
-interface nsIStreamListener;
-interface nsIInputStream;
-
-
-[scriptable, uuid(60fdf550-5392-11d3-9a97-0080c7cb1080)]
-interface nsILoadGroupListenerFactory : nsISupports
-{
-    nsIStreamListener createLoadGroupListener(in nsIStreamListener alistener);
-};
-
-
-/**
- * A load group maintains a collection of active URL requests. 
- */
-[scriptable, uuid(19845248-29ab-11d3-8cce-0060b0fc14a3)]
-interface nsILoadGroup : nsIRequest
-{
-    void init(in nsIStreamObserver observer);
-
-    /**
-     * Accesses the default load attributes for the group, returned as
-     * a flag word. Setting the default load attributes will cause them
-     * to be applied to each new channel inserted into the group.
-     */
-    attribute unsigned long defaultLoadAttributes;
-
-    /**
-     * Accesses the default load channel for the group.  Each time a number
-     * of channels are added to a group, the DefaultLoadChannel may be set
-     * to indicate that all of the channels are related to a particular URL.
-     */
-    attribute nsIChannel defaultLoadChannel;
-
-    /**
-     * Adds a new channel to the group. This will cause the default load
-     * attributes to be applied to that channel. If the channel added is 
-     * the first channel in the group, the group's observer's OnStartRequest
-     * method is called.
-     */
-    void addChannel(in nsIChannel channel,
-                    in nsISupports ctxt);
-
-    /**
-     * Removes a channel from the group. If the channel removed is 
-     * the last channel in the group, the group's observer's OnStopRequest
-     * method is called.
-     */
-    void removeChannel(in nsIChannel channel, 
-                       in nsISupports ctxt,
-                       in nsresult status,
-                       in wstring errorMsg);
-
-    /**
-     * Returns the channels contained directly in this group.
-     * Enumerator element type: nsIChannel.
-     */
-    readonly attribute nsISimpleEnumerator channels;
-
-    attribute nsIStreamObserver groupObserver;
-
-    attribute nsILoadGroupListenerFactory groupListenerFactory;
-
-
-	readonly attribute unsigned long activeCount;
-};
-
-%{C++
-
-#define NS_LOADGROUP_CID                             \
-{ /* e1c61582-2a84-11d3-8cce-0060b0fc14a3 */         \
-    0xe1c61582,                                      \
-    0x2a84,                                          \
-    0x11d3,                                          \
-    {0x8c, 0xce, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
-}
-
-%}

mozilla/netwerk/base/public/nsINetModRegEntry.idl

@@ -1,47 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-/* This interface defines a registry entry for the networking libraries
- * external module registry. */
- 
-#include "nsISupports.idl"
-#include "nsINetNotify.idl"
-
-interface nsIEventQueue;
-interface nsINetModRegEntry;
-interface nsINetNotify;
-
-%{ C++
-// {F126BD90-1472-11d3-A15A-0050041CAF44}
-#define NS_NETMODREGENTRY_CID \
-{ 0xf126bd90, 0x1472, 0x11d3, { 0xa1, 0x5a, 0x0, 0x50, 0x4, 0x1c, 0xaf, 0x44 } }
-%}
-
-[scriptable, uuid(9F482BD0-1476-11d3-A15A-0050041CAF44)]
-interface nsINetModRegEntry : nsISupports 
-{
-    readonly attribute nsINetNotify      syncProxy;
-    readonly attribute nsINetNotify      asyncProxy;
-    readonly attribute string            topic;
-
-	boolean equals(in nsINetModRegEntry aEntry);
-};

mozilla/netwerk/base/public/nsINetModuleMgr.idl

@@ -1,80 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-/* The nsINetModuleMgr singleton service allows external module to register
- * themselves with the networking library to receive events they want to
- * receive.
- *
- * An external module that is interested in being notified when a particular 
- * networking level event occurs would register with this service, and 
- * implement the appropriate interface(s) that correspond to the events they
- * want to receive. These interfaces are defined by networking internal
- * components (for example, http would define a notification interface that
- * the external cookies module would implement).
- */
-
-#include "nsISupports.idl"
-#include "nsIEnumerator.idl"
-#include "nsINetNotify.idl"
-
-interface nsIEventQueue;
-
-%{ C++
-
-// {4EBDAFE0-13BA-11d3-A15A-0050041CAF44}
-#define NS_NETMODULEMGR_CID \
-{ 0x4ebdafe0, 0x13ba, 0x11d3, { 0xa1, 0x5a, 0x0, 0x50, 0x4, 0x1c, 0xaf, 0x44 } }
-
-// The list of available PROGIDS to register for notification on.
-#define NS_NETWORK_MODULE_MANAGER_HTTP_REQUEST_PROGID          "component://netscape/network/moduleMgr/http/request"
-#define NS_NETWORK_MODULE_MANAGER_HTTP_RESPONSE_PROGID         "component://netscape/network/moduleMgr/http/response"
-%}
-
-[scriptable, uuid(ff9ead40-0ef2-11d3-9de6-0010a4053fd0)]
-interface nsINetModuleMgr : nsISupports {
-	
-    // Register the external module to receive notifications.
-    // 
-    // ARGUMENTS:
-    // aTopic: The internal component that the external module wants to monitor.
-    // aNotify: The external module interface methods to be called when an event is fired.
-    //
-    // RETURNS: nsresult
-	void registerModule(in string aTopic, in nsINetNotify aNotify);
-
-    // Unregister the external module. Removes the nsINetModuleMgr binding between
-    // internal component and external module.
-    //
-    // ARGUMENTS:
-    // aTopic: The internal component being monitored.
-    // aNotify: The external modules notification module.
-    //
-    // RETURNS: nsresult
-    void unregisterModule(in string aTopic, in nsINetNotify aNotify);
-
-    // Enumerates all the registered modules for the specified topic.
-    //
-    // ARGUMENTS:
-    // aTopic: the component to get all the notifiers for.
-    // aEnumerator: the array of notifiers.
-    void enumerateModules(in string aTopic, out nsISimpleEnumerator aEnumerator);
-};

mozilla/netwerk/base/public/nsINetNotify.idl

@@ -1,28 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-[uuid(4A3019E0-1CF3-11d3-A15B-0050041CAF44)]
-interface nsINetNotify : nsISupports {
-
-};

mozilla/netwerk/base/public/nsINetPrompt.idl

@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-
-
-[scriptable, uuid(edd8be01-8e0d-11d3-b7a0-c46e946292bc)]
-interface nsINetPrompt : nsISupports
-{
-    /**
-     * Puts up an alert dialog with an OK button.
-     */
-    void alert( in string url, in boolean stripurl, in wstring title, in wstring text);
-
-    /**
-     * Puts up a dialog with OK and Cancel buttons.
-     * @return true for OK, false for Cancel
-     */
-    boolean confirm( in string url, in boolean stripurl, in wstring title, in wstring text);
-
-    /**
-     * Puts up a username/password dialog with OK and Cancel buttons.
-     * @return true for OK, false for Cancel
-     */
-    boolean promptUsernameAndPassword(
-    								in string url,
-                                    in boolean stripurl,
-    								 in wstring title,
-    								   in wstring text,
-                                      out wstring user, 
-                                      out wstring pwd);
-
-    /**
-     * Puts up a password dialog with OK and Cancel buttons.
-     * @return true for OK, false for Cancel
-     */
-    boolean promptPassword(
-    						in string url,
-                            in boolean stripurl,
-    						in wstring title,
-    					   in wstring text, 
-                           out wstring pwd);
-
-    /**
-     * Puts up a prompt dialog with OK and Cancel buttons.
-     * @return true for OK, false for Cancel
-     */
-    boolean prompt(
-    						in string url,
-                            in boolean stripurl,
-    						in wstring title,
-    					   in wstring text, 
-                           out wstring pwd);
-};
-
-

mozilla/netwerk/base/public/nsIProgressEventSink.idl

@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-interface nsIURI;
-interface nsIChannel;
-
-/**
- * An instance of nsIFfpEventSink should be passed as the eventSink
- * argument of nsINetService::NewConnection for ftp URLs. It defines
- * the callbacks to the application program (the html parser).
- */
-[scriptable, uuid(dd47ee00-18c2-11d3-9337-00104ba0fd40)]
-interface nsIProgressEventSink : nsISupports
-{
-    /**
-     * Notify the EventSink that progress as occurred for the URL load.<BR>
-     */
-    void onProgress(in nsIChannel channel,
-                    in nsISupports ctxt,
-                    in unsigned long aProgress,
-                    in unsigned long aProgressMax);
-
-    /**
-     * Notify the EventSink with a status message for the URL load.<BR>
-     */
-    void onStatus(in nsIChannel channel,
-                  in nsISupports ctxt,
-                  in wstring aMsg);
-
-};

mozilla/netwerk/base/public/nsIPrompt.idl

@@ -1,102 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(a63f70c0-148b-11d3-9333-00104ba0fd40)]
-interface nsIPrompt : nsISupports
-{
-    /**
-     * Puts up an alert dialog with an OK button.
-     */
-    void alert(in wstring text);
-
-    /**
-     * Puts up a dialog with OK and Cancel buttons.
-     * @return true for OK, false for Cancel
-     */
-    boolean confirm(in wstring text);
-
-    /**
-     * Puts up a dialog with OK and Cancel buttons, and
-     * a message with a single checkbox.
-     * @return true for OK, false for Cancel
-     */
-    boolean confirmCheck(in wstring text,
-                         in wstring checkMsg,
-                         out boolean checkValue);
-
-    /**
-     * Puts up a text input dialog with OK and Cancel buttons.
-     * @return true for OK, false for Cancel
-     */
-    boolean prompt(in wstring text,
-                   in wstring defaultText, 
-                   out wstring result);
-
-    /**
-     * Puts up a username/password dialog with OK and Cancel buttons.
-     * @return true for OK, false for Cancel
-     */
-    boolean promptUsernameAndPassword(in wstring text,
-                                      out wstring user, 
-                                      out wstring pwd);
-
-    /**
-     * Puts up a password dialog with OK and Cancel buttons.
-     * @return true for OK, false for Cancel
-     */
-    boolean promptPassword(in wstring text, 
-                           in wstring title,
-                           out wstring pwd);
-    
-    /**
-     * Puts up a dialog box which has a list box of strings
-     */                                               
-    boolean select(in wstring inDialogTitle,
-                   in wstring inMsg,
-                   in  PRUint32 inCount,
-                   [array, size_is(inCount)] in wstring inList,
-                   out long outSelection);
-
-    /**
-     * Put up a universal dialog
-     */
-    void universalDialog(in wstring inTitleMessage,
-                         in wstring inDialogTitle, /* e.g., alert, confirm, prompt, prompt password */
-                         in wstring inMsg, /* main message for dialog */
-                         in wstring inCheckboxMsg, /* message for checkbox */
-                         in wstring inButton0Text, /* text for first button */
-                         in wstring inButton1Text, /* text for second button */
-                         in wstring inButton2Text, /* text for third button */
-                         in wstring inButton3Text, /* text for fourth button */
-                         in wstring inEditfield1Msg, /*message for first edit field */
-                         in wstring inEditfield2Msg, /* message for second edit field */
-                         inout wstring inoutEditfield1Value, /* initial and final value for first edit field */
-                         inout wstring inoutEditfield2Value, /* initial and final value for second edit field */
-                         in wstring inIConURL, /* url of icon to be displayed in dialog */
-                         inout boolean inoutCheckboxState, /* initial and final state of checkbox */
-                         in PRInt32 inNumberButtons, /* total number of buttons (0 to 4) */
-                         in PRInt32 inNumberEditfields, /* total number of edit fields (0 to 2) */
-                         in PRInt32 inEditField1Password, /* ??? */
-                         out PRInt32 outButtonPressed); /* number of button that was pressed (0 to 3) */
-};

mozilla/netwerk/base/public/nsIProtocolHandler.idl

@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-#include "nsIChannel.idl"
-
-interface nsIURI;
-interface nsIInterfaceRequestor;
-interface nsILoadGroup;
-
-[scriptable, uuid(15fd6940-8ea7-11d3-93ad-00104ba0fd40)]
-interface nsIProtocolHandler : nsISupports
-{
-    readonly attribute string scheme;
-
-    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.
-     */
-    nsIURI newURI(in string aSpec, in nsIURI aBaseURI);
-
-    /**
-     * Constructs a new channel for this protocol handler. 
-     *
-     * @param originalURI - Specifies the original URI which caused the creation
-     * of this channel. This can occur when the construction of one channel
-     * (e.g. for resource:) causes another channel to be created on its behalf
-     * (e.g. a file: channel), or if a redirect occurs, causing the current
-     * URL to become different from the original URL. If NULL, the aURI parameter
-     * will be used as the originalURI instead.
-     */
-    nsIChannel newChannel(in string verb,
-                          in nsIURI aURI,
-                          in nsILoadGroup aLoadGroup,
-                          in nsIInterfaceRequestor notificationCallbacks,
-                          in nsLoadFlags loadAttributes,
-                          in nsIURI originalURI,
-                          in unsigned long bufferSegmentSize,
-                          in unsigned long bufferMaxSize);
-};
-
-%{C++
-
-#define NS_NETWORK_PROTOCOL_PROGID               "component://netscape/network/protocol"
-#define NS_NETWORK_PROTOCOL_PROGID_PREFIX        NS_NETWORK_PROTOCOL_PROGID "?name="
-#define NS_NETWORK_PROTOCOL_PROGID_PREFIX_LENGTH 43     // nsCRT::strlen(NS_NETWORK_PROTOCOL_PROGID_PREFIX)
-
-// Unknown Protocol Error
-#define NS_ERROR_UNKNOWN_PROTOCOL  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 18)
-
-%}

mozilla/netwerk/base/public/nsIProtocolProxyService.idl

@@ -1,40 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-#include "nsIURI.idl"
-#include "nsIProxy.idl"
-
-%{C++
-#define NS_PROTOCOLPROXYSERVICE_CID                             \
-{ /* E9B301C0-E0E4-11d3-A1A8-0050041CAF44 */                    \
-0xe9b301c0, 0xe0e4, 0x11d3, { 0xa1, 0xa8, 0x0, 0x50, 0x4, 0x1c, 0xaf, 0x44 } }
-%}
-
-[scriptable, uuid(495CC980-E0D4-11d3-A1A8-0050041CAF44)]
-interface nsIProtocolProxyService : nsISupports
-{
-    readonly attribute PRBool proxyEnabled;
-
-    void examineForProxy(in nsIURI aURI, in nsIProxy aProxy);
-};
-

mozilla/netwerk/base/public/nsIProxy.idl

@@ -1,41 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
- /* 
-    The nsIProxy interface allows setting and getting of proxy host and port. 
-    This is for use by protocol handlers. If you are writing a protocol handler
-    and would like to support proxy behaviour then derive from this as well as
-    the nsIProtocolHandler class.
-
-    -Gagan Saksena 02/25/99
-*/
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(0492D011-CD2F-11d2-B013-006097BFC036)]
-interface nsIProxy : nsISupports
-{
-    attribute string proxyHost;
-
-    /* -1 on Set call indicates switch to default port */
-    attribute long proxyPort;
-};

mozilla/netwerk/base/public/nsIRequest.idl

@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(F2CAABA0-2F25-11d3-A164-0050041CAF44)]
-interface nsIRequest : nsISupports
-{
-    /**
-     * Returns true if the request is pending (active). Returns false 
-     * after completion or successful calling Cancel. Suspended requests
-     * are still considered pending.
-     */
-    boolean isPending();
-
-    /**
-     * Cancels the current request. This will close any open input or
-     * output streams and terminate any async requests. 
-     */
-    void cancel();
-
-    /**
-     * Suspends the current requests. This may have the effect of closing
-     * any underlying transport (in order to free up resources), although
-     * any open streams remain logically opened and will continue delivering
-     * data when the transport is resumed. 
-     */
-    void suspend();
-
-    /**
-     * Resumes the current request. This may have the effect of re-opening
-     * any underlying transport and will resume the delivery of data to 
-     * any open streams. 
-     */
-    void resume();
-};

mozilla/netwerk/base/public/nsISocketTransport.idl

@@ -1,35 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(785CA0F0-C39E-11d3-9ED6-0010A4053FD0)]
-interface nsISocketTransport : nsISupports 
-{
-	attribute boolean reuseConnection;
-
-	/**
-	 * Is used to tell the channel to stop reading data after a certain point;
-	 * needed by HTTP/1.1
-	 */
-	attribute long bytesAllowed;
-};

mozilla/netwerk/base/public/nsISocketTransportService.idl

@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-interface nsIChannel;
-interface nsIEventSinkGetter;
-
-[scriptable, uuid(05331390-6884-11d3-9382-00104ba0fd40)]
-interface nsISocketTransportService : nsISupports 
-{
-    /**
-     * Creates a transport for a specified host and port. 
-     * The eventSinkGetter is used to get the appropriate callbacks
-     * for the socket activity from the application. These include
-     * the progress and the status messages like "Contacting host.."
-     * etc. The printHost contains the actual hostname (and not the 
-     * proxy) for displaying in status messages. 
-     */
-    nsIChannel createTransport(in string host,
-                               in long port,
-                               in string printHost,
-                               in unsigned long bufferSegmentSize,
-                               in unsigned long bufferMaxSize);
-    nsIChannel createTransportOfType(in string socketType,
-                                     in string host, 
-                                     in long port,
-                                     in string printHost,
-                                     in unsigned long bufferSegmentSize,
-                                     in unsigned long bufferMaxSize);
-
-    /**
-     * Returns true if the specified transport is good enough for 
-     * being used again. The situations in which this may return false
-     * include- an error including server resets, an explicit 
-     * Connection: close header (for HTTP) and timeouts! 
-     */
-    boolean reuseTransport(in nsIChannel i_Transport);
-
-    void shutdown ();
-	void wakeup   (in nsIChannel i_Transport);
-};
-
-%{C++
-#define NS_SOCKETTRANSPORTSERVICE_CID                \
-{ /* c07e81e0-ef12-11d2-92b6-00105a1b0d64 */         \
-    0xc07e81e0,                                      \
-    0xef12,                                          \
-    0x11d2,                                          \
-    {0x92, 0xb6, 0x00, 0x10, 0x5a, 0x1b, 0x0d, 0x64} \
-}
-
-#define NS_ERROR_CONNECTION_REFUSED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 13)
-
-#define NS_ERROR_NET_TIMEOUT NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 14)
-
-%}

mozilla/netwerk/base/public/nsIStatusCodeEventSink.idl

@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-interface nsIProgressEventSink;
-interface nsIChannel;
-
-/**
- * The nsIStatusCodeEventSink is a temporary interface to allow passing 
- * status codes from the socket threads onto the UI without having to 
- * pass strings. This could eventually go away if the proxy events 
- * stuff can handle nested event loop. dougt is working on that. 
- * We could continue to use this if this seems reasonable enough. 
- */
-[scriptable, uuid(6998ff36-1dd2-11b2-9ab7-e72a0f9fdd8c)]
-interface nsIStatusCodeEventSink : nsISupports
-{
-
-    /**
-     * Notify the EventSink with a status code for the URL load.<BR>
-     * Use IOService to request converting that code to a string. 
-     */
-    void onStatus(in nsIProgressEventSink sink,
-                in nsIChannel channel,
-                in nsISupports ctxt,
-                in unsigned long aCode);
-
-};

mozilla/netwerk/base/public/nsIStreamListener.idl

@@ -1,96 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIStreamObserver.idl"
-
-interface nsIBufferInputStream;
-interface nsIInputStream;
-interface nsIBufferOutputStream;
-interface nsIEventQueue;
-
-[scriptable, uuid(1a637020-1482-11d3-9333-00104ba0fd40)]
-interface nsIStreamListener : nsIStreamObserver
-{
-    void onDataAvailable(in nsIChannel channel,
-                         in nsISupports ctxt, 
-                         in nsIInputStream inStr,
-                         in unsigned long sourceOffset,
-                         in unsigned long count);
-};
-
-/**
- * An asynchronous stream listener is used to ship data over to another thread specified
- * by the thread's event queue. The receiver stream listener is then used to receive
- * the notifications on the other thread. 
- *
- * This interface only provides the initialization needed after construction. Otherwise,
- * these objects are used simply as nsIStreamListener.
- */
-[scriptable, uuid(1b012ade-91bf-11d3-8cd9-0060b0fc14a3)]
-interface nsIAsyncStreamListener : nsIStreamListener
-{
-    /**
-     * Initializes an nsIAsyncStreamListener. 
-     * @param eventQueue - may be null indicating the calling thread's event queue
-     */
-    void init(in nsIStreamListener receiver,
-              in nsIEventQueue eventQueue);
-};
-
-/**
- * A synchronous stream listener pushes data through a pipe that ends up
- * in an input stream to be read by another thread.
- *
- * This interface only provides the initialization needed after construction. Otherwise,
- * these objects are used simply as nsIStreamListener.
- */
-[scriptable, uuid(1f9fb93e-91bf-11d3-8cd9-0060b0fc14a3)]
-interface nsISyncStreamListener : nsIStreamListener
-{
-    /**
-     * Initializes an nsISyncStreamListener. 
-     */
-    void init(out nsIInputStream inStream,
-              out nsIBufferOutputStream outStream);
-};
-
-%{C++
-
-// Use this CID to construct an nsIAsyncStreamListener
-#define NS_ASYNCSTREAMLISTENER_CID                   \
-{ /* 60047bb2-91c0-11d3-8cd9-0060b0fc14a3 */         \
-    0x60047bb2,                                      \
-    0x91c0,                                          \
-    0x11d3,                                          \
-    {0x8c, 0xd9, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
-}
-
-// Use this CID to construct an nsISyncStreamListener
-#define NS_SYNCSTREAMLISTENER_CID                    \
-{ /* 65fa5cb2-91c0-11d3-8cd9-0060b0fc14a3 */         \
-    0x65fa5cb2,                                      \
-    0x91c0,                                          \
-    0x11d3,                                          \
-    {0x8c, 0xd9, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
-}
-
-%}

mozilla/netwerk/base/public/nsIStreamLoader.idl

@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-#include "nsIChannel.idl"
-
-interface nsIURI;
-interface nsILoadGroup;
-interface nsIStreamObserver;
-interface nsIStreamLoader;
-interface nsIInterfaceRequestor;
-
-[scriptable, uuid(359F7990-D4E9-11d3-A1A5-0050041CAF44)]
-interface nsIStreamLoaderObserver : nsISupports
-{
-    void onStreamComplete(in nsIStreamLoader loader,
-                          in nsISupports ctxt,
-                          in nsresult status,
-                          in unsigned long resultLength,
-                          [size_is(resultLength)] in string result);
-};
-
-[scriptable, uuid(31d37360-8e5a-11d3-93ad-00104ba0fd40)]
-interface nsIStreamLoader : nsISupports
-{
-    void init(in nsIURI uri,
-              in nsIStreamLoaderObserver completionObserver,
-              in nsISupports ctxt,
-              in nsILoadGroup loadGroup,
-              in nsIInterfaceRequestor notificationCallbacks,
-              in nsLoadFlags loadAttributes,
-              in unsigned long bufferSegmentSize,
-              in unsigned long bufferMaxSize);
-
-    /**
-     * Gets the number of bytes read so far.
-     */
-    readonly attribute unsigned long numBytesRead;
-};
-
-%{C++
-
-#define NS_STREAMLOADER_CID                   \
-{ /* 5BA6D920-D4E9-11d3-A1A5-0050041CAF44 */         \
- 0x5ba6d920, 0xd4e9, 0x11d3, { 0xa1, 0xa5, 0x0, 0x50, 0x4, 0x1c, 0xaf, 0x44 } \
-}
-
-%}

mozilla/netwerk/base/public/nsIStreamObserver.idl

@@ -1,78 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-interface nsIEventQueue;
-interface nsIChannel;
-
-[scriptable, uuid(fd91e2e0-1481-11d3-9333-00104ba0fd40)]
-interface nsIStreamObserver : nsISupports
-{
-    void onStartRequest(in nsIChannel channel,
-                        in nsISupports ctxt);
-
-    void onStopRequest(in nsIChannel channel,
-                       in nsISupports ctxt, 
-                       in nsresult status,
-                       in wstring errorMsg);
-};
-
-/**
- * An asynchronous stream observer is used to ship data over to another thread specified
- * by the thread's event queue. The receiver stream observer is then used to receive
- * the notifications on the other thread. 
- *
- * This interface only provides the initialization needed after construction. Otherwise,
- * these objects are used simply as nsIStreamObservers.
- */
-[scriptable, uuid(a28dc590-91b3-11d3-8cd9-0060b0fc14a3)]
-interface nsIAsyncStreamObserver : nsIStreamObserver
-{
-    /**
-     * Initializes an nsIAsyncStreamObserver. 
-     * @param eventQueue - may be null indicating the calling thread's event queue
-     */
-    void init(in nsIStreamObserver receiver,
-              in nsIEventQueue eventQueue);
-};
-
-%{C++
-
-// Use this CID to construct an nsIAsyncStreamObserver
-#define NS_ASYNCSTREAMOBSERVER_CID                   \
-{ /* fcc7c380-91b3-11d3-8cd9-0060b0fc14a3 */         \
-    0xfcc7c380,                                      \
-    0x91b3,                                          \
-    0x11d3,                                          \
-    {0x8c, 0xd9, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Generic status codes for OnStopRequest:
-
-#define NS_BINDING_SUCCEEDED    NS_OK
-#define NS_BINDING_FAILED       NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 1)
-#define NS_BINDING_ABORTED      NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 2)
-
-%}
-

mozilla/netwerk/base/public/nsIURI.idl

@@ -1,183 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-#include "nsIURLParser.idl"
-
-/**
- * URIs are essentially structured names for things -- anything.
- * This interface provides accessors to destructure those names.
- *
- * This interface follows Tim Berners-Lee's URI spec:
- *
- *     http://www.w3.org/Addressing/URI/URI_Overview.html
- *  
- * essentially:
- *  
- *      ftp://username:password@hostname:portnumber/pathname
- *      \ /   \               / \      / \        /\       /
- *       -     ---------------   ------   --------  -------
- *       |            |             |        |         |
- *       |            |             |        |        Path
- *       |            |             |       Port         
- *       |            |            Host
- *       |         PreHost            
- *     Scheme
- *
- * The subclass nsIURL provides a means to open an input or output              
- * stream to a URI as a source/destination, as well as providing additional     
- * accessors to destructure the path, query and reference portions typically    
- * associated with URLs.                                                        
- */
-
-%{C++
-#undef GetPort  // XXX Windows!
-#undef SetPort  // XXX Windows!
-%}
-
-[scriptable, uuid(07a22cc0-0ce5-11d3-9331-00104ba0fd40)]
-interface nsIURI : nsISupports
-{
-    /**
-     * Returns a string representation of the URI. Setting the spec 
-     * causes the new spec to be parsed, initializing the URI. Setting
-     * the spec (or any of the accessors) causes also any currently
-     * open streams on the URI's channel to be closed.
-     */
-    attribute string spec;
-
-    /**
-     * The Scheme is the protocol to which this URI refers. Setting
-     * the scheme is a special operation that builds up an equivalent
-     * URI string from the new scheme and all the other URI attributes
-     * and passes the it to the nsIOService to create a new URI for
-     * the new scheme.
-     */
-    attribute string scheme;
-
-    /**
-     * The PreHost portion includes elements like the optional 
-     * username:password, or maybe other scheme specific items. 
-     */
-    attribute string preHost;
-
-    attribute string username;
-
-    attribute string password;
-
-    /**
-     * The Host is the internet domain name to which this URI refers. 
-     * Note that it could be an IP address as well. 
-     */
-    attribute string host;
-
-    /**
-     * A return value of -1 indicates that no port value is set and the 
-     * implementor of the specific scheme will use its default port. 
-     * Similarly setting a value of -1 indicates that the default is to be used.
-     * Thus as an example:
-     *     for HTTP, Port 80 is same as a return value of -1. 
-     * However after setting a port (even if its default), the port number will
-     * appear in the ToNewCString function.
-     */
-    attribute long port;
-
-    /**
-     * Note that the path includes the leading '/' Thus if no path is 
-     * available the Path accessor will return a "/" 
-     * For SetPath if none is provided, one would be prefixed to the path. 
-     */
-    attribute string path;
-
-    /**
-     * This is a handle to the Parser used to parse the URI
-     */
-    attribute nsIURLParser URLParser;
-
-    /**
-     * Note that this comparison is only on char* level. Use 
-     * the scheme specific URI to do a more thorough check. For example,
-     * in HTTP:
-     *     http://foo.com:80 == http://foo.com
-     * but this function through nsIURI alone will not return equality
-     * for this case.
-     */
-    boolean equals(in nsIURI other);
-
-    /**
-     * Clones the current URI. The newly created URI will be in a closed
-     * state even if the underlying channel of the cloned URI is open.
-     * Cloning allows the current location to be retained since once the
-     * channel is opened the URI may get redirected to a new location.
-     */
-    nsIURI clone();
-
-    /**
-     * Sets the given string to be a relative path for this URI, and 
-     * changes this to read relative. Thus for example- if this = 
-     * http://foo.com/bar/index.html, then calling SetRelativePath("/baz") will 
-     * change this to http://foo.com/baz and calling it with "baz" will
-     * change this to http://foo.com/bar/baz. 
-     */
-    void setRelativePath(in string relativePath);
-
-    /**
-     * This method resolves a relative string into an absolute URI string,
-     * using the URI as the base. 
-     *
-     * This method subsumes the deprecated method nsIIOService::MakeAbsolute.
-     */
-    string resolve(in string relativePath);
-
-};
-
-%{C++
-// Malformed URI Error
-#define NS_ERROR_MALFORMED_URI  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 10)
-
-/**
- * Protocol writers can obtain a very basic (ok, degenerate) implementation
- * of nsIURI by calling the component manager with NS_SIMPLEURI_CID. The
- * implementation returned will only parse things of the form:
- *
- *    about:cache
- *    \   / \   /
- *     ---   ---
- *      |     |
- *   Scheme  Path
- *
- * where the path is everything after the colon. Note that this is probably 
- * only useful for cases like about: or javascript: URIs. 
- *
- * *** What you most likely will want is NS_STANDARDURL_CID which is much more 
- * full featured. Look at nsIURL.idl for more details.
- */
-
-#define NS_SIMPLEURI_CID                              \
-{ /* e0da1d70-2f7b-11d3-8cd0-0060b0fc14a3 */          \
-     0xe0da1d70,                                      \
-     0x2f7b,                                          \
-     0x11d3,                                          \
-     {0x8c, 0xd0, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
-}
-
-%}

mozilla/netwerk/base/public/nsIURL.idl

@@ -1,148 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIURI.idl"
-
-interface nsIChannel;
-interface nsIEventSinkGetter;
-
-/**
- * The nsIURL interface provides convenience methods that further
- * break down the path portion of nsIURI:
- *
- * http://directory/fileBaseName.fileExtension?query
- * http://directory/fileBaseName.fileExtension#ref
- * http://directory/fileBaseName.fileExtension;param
- *       \          \                       /
- *        \          -----------------------
- *         \                   |          /
- *          \               fileName     /
- *           ----------------------------
- *                       |
- *                   filePath
- */
-[scriptable, uuid(d6116970-8034-11d3-9399-00104ba0fd40)]
-interface nsIURL : nsIURI
-{
-    ////////////////////////////////////////////////////////////////////////////
-    // The path attribute is broken down into the following attributes:
-    // filePath, param, query, and ref:
-
-    /**
-     * Returns a path including the directory and file portions of a
-     * URL. E.g. The filePath of "http://foo/bar.html#baz" is
-     * "/foo/bar.html". 
-     */
-    attribute string filePath;
-
-    /**
-     * Returns the parameters specified after the ; in the URL. 
-     *
-     */
-    attribute string param;
-
-    /**
-     * Returns the query portion (the part after the "?") of the URL.
-     * If there isn't one, an empty string is returned.
-     */
-    attribute string query;
-
-    /**
-     * Returns the reference portion (the part after the "#") of the URL.
-     * If there isn't one, an empty string is returned.
-     */
-    attribute string ref;
-
-    ////////////////////////////////////////////////////////////////////////////
-    // The filePath attribute is further broken down into the following
-    // attributes: directory, file:
-
-    /**
-     * Returns the directory portion of a URL. 
-     * If the URL denotes a path to a directory and not a file,
-     * e.g. http://foo/bar/, then the Directory attribute accesses
-     * the complete /foo/bar/ portion, and the FileName is the 
-     * empty string. If the trailing slash is omitted, then the
-     * Directory is /foo/ and the file is bar (i.e. this is a 
-     * syntactic, not a semantic breakdown of the Path).
-     * And hence dont rely on this for something to be a definitely 
-     * be a file. But you can get just the leading directory portion 
-     * for sure.
-     */
-    attribute string directory;
-
-    /**
-     * Returns the file name portion of a URL.
-     * If the URL denotes a path to a directory and not a file,
-     * e.g. http://foo/bar/, then the Directory attribute accesses
-     * the complete /foo/bar/ portion, and the FileName is the 
-     * empty string. Note that this is purely based on searching 
-     * for the last trailing slash. And hence dont rely on this to 
-     * be a definite file. 
-     */
-    attribute string fileName;
-
-    ////////////////////////////////////////////////////////////////////////////
-    // The fileName attribute is further broken down into the following
-    // attributes: fileName, fileExtension:
-
-    attribute string fileBaseName;
-
-    /**
-     * Returns the file extension portion of a filename in a url.
-     * If a file extension does not exist, the empty string is returned.
-     */
-    attribute string fileExtension;
-};
-
-%{C++
-
-/**
- * Protocol writers can obtain a default nsIURL implementation by calling the
- * component manager with NS_STANDARDURL_CID. The implementation returned will 
- * only implement the set of accessors specified by nsIURL. After obtaining the
- * instance from the component manager, the Init routine must be called on it
- * to initialize it from the user's URL spec. 
- */
-
-#define NS_STANDARDURL_CID                           \
-{ /* de9472d0-8034-11d3-9399-00104ba0fd40 */         \
-    0xde9472d0,                                      \
-    0x8034,                                          \
-    0x11d3,                                          \
-    {0x93, 0x99, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
-}
-
-%}
-
-////////////////////////////////////////////////////////////////////////////////
-
-interface nsIFile;
-
-/**
- * nsIFileURL is used for the file: protocol, and gives access to the
- * underlying nsIFile object.
- */
-interface nsIFileURL : nsIURL
-{
-    attribute nsIFile file;
-};

mozilla/netwerk/base/public/nsIURLParser.idl

@@ -1,125 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Andreas Otte
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-/**
- * nsIURLParser is the abstract base class for parsing URLs
- */
-
-[scriptable, uuid(4b4975f9-f128-47fd-b11e-88402233cbdf)]
-interface nsIURLParser : nsISupports
-{
-
-    /**
-     * Parses a URL and thinks it is parsing the scheme
-     */
-    void ParseAtScheme(in  string i_Spec, 
-                       out string o_Scheme, 
-                       out string o_Username,
-                       out string o_Password,
-                       out string o_Host, 
-                       out long o_Port, 
-                       out string o_Path);
-
-    /**
-     * Parses a URL and thinks it is parsing the prehost
-     */
-    void ParseAtPreHost(in  string i_Spec, 
-                        out string o_Username,
-                        out string o_Password,
-                        out string o_Host,
-                        out long o_Port, 
-                        out string o_Path);
-
-    /**
-     * Parses a URL and thinks it is parsing the host
-     */
-    void ParseAtHost(in  string i_Spec, 
-                     out string o_Host,
-                     out long o_Port, 
-                     out string o_Path);
-
-    /**
-     * Parses a URL and thinks it is parsing the port
-     */
-    void ParseAtPort(in  string i_Spec, 
-                     out long o_Port, 
-                     out string o_Path);
-
-    /**
-     * Parses a URL and thinks it is parsing the path
-     */
-    void ParseAtPath(in  string i_Spec, 
-                     out string o_Path);
-
-    /**
-     * Parses a URL-path and thinks it is parsing the directory
-     */
-    void ParseAtDirectory(in  string i_Path, 
-                          out string o_Directory, 
-                          out string o_FileBaseName,
-                          out string o_FileExtension,
-                          out string o_Param, 
-                          out string o_Query, 
-                          out string o_Ref);
-
-    /**
-     * Parses the URL-PreHost into its components
-     */
-    void ParsePreHost(in  string i_PreHost, 
-                      out string o_Username, 
-                      out string o_Password);
-
-    /**
-     * Parses the URL-Filename into its components
-     */
-    void ParseFileName(in  string i_FileName, 
-                       out string o_FileBaseName, 
-                       out string o_FileExtension);
-
-};
-
-%{C++
-
-#define NS_STANDARDURLPARSER_CID                     \
-{ /* dbf72351-4fd8-46f0-9dbc-fa5ba60a30c5 */         \
-    0xdbf72351,                                      \
-    0x4fd8,                                          \
-    0x46f0,                                          \
-    {0x9d, 0xbc, 0xfa, 0x5b, 0xa6, 0x0a, 0x30, 0x5c} \
-}
-
-#define NS_AUTHORITYURLPARSER_CID                    \
-{ /* 90012125-1616-4fa1-ae14-4e7fa5766eb6 */         \
-    0x90012125,                                      \
-    0x1616,                                          \
-    0x4fa1,                                          \
-    {0xae, 0x14, 0x4e, 0x7f, 0xa5, 0x76, 0x6e, 0xb6} \
-}
-
-#define NS_NOAUTHORITYURLPARSER_CID                  \
-{ /* 9eeb1b89-c87e-4404-9de6-dbd41aeaf3d7 */         \
-    0x9eeb1b89,                                      \
-    0xc87e,                                          \
-    0x4404,                                          \
-    {0x9d, 0xe6, 0xdb, 0xd4, 0x1a, 0xea, 0xf3, 0xd7} \
-}
-
-%}

mozilla/netwerk/base/public/nsNetUtil.h

@@ -1,322 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsNetUtil_h__
-#define nsNetUtil_h__
-
-#include "nsIURI.h"
-#include "netCore.h"
-#include "nsIInputStream.h"
-#include "nsIStreamListener.h"
-#include "nsILoadGroup.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsString.h"
-#include "nsIIOService.h"
-#include "nsIServiceManager.h"
-#include "nsIChannel.h"
-#include "nsIAllocator.h"
-#include "nsCOMPtr.h"
-#include "nsIHTTPProtocolHandler.h"
-#include "nsIStreamLoader.h"
-
-inline nsresult
-NS_NewURI(nsIURI* *result, const char* spec, nsIURI* baseURI = nsnull)
-{
-    nsresult rv;
-    static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
-    NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-    
-    rv = serv->NewURI(spec, baseURI, result);
-    return rv;
-}
-
-inline nsresult
-NS_NewURI(nsIURI* *result, const nsString& spec, nsIURI* baseURI = nsnull)
-{
-    char* specStr = spec.ToNewUTF8String(); // this forces a single byte char*
-    if (specStr == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    nsresult rv = NS_NewURI(result, specStr, baseURI);
-    nsAllocator::Free(specStr);
-    return rv;
-}
-
-inline nsresult
-NS_OpenURI(nsIChannel* *result, nsIURI* uri, nsILoadGroup *aGroup,
-           nsIInterfaceRequestor *capabilities = nsnull,
-           nsLoadFlags loadAttributes = nsIChannel::LOAD_NORMAL,
-           PRUint32 bufferSegmentSize = 0, 
-           PRUint32 bufferMaxSize = 0)
-{
-    nsresult rv;
-    static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
-    NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsIChannel* channel;
-    rv = serv->NewChannelFromURI("load", uri, aGroup, capabilities, 
-                                 loadAttributes, nsnull, 
-                                 bufferSegmentSize, bufferMaxSize, &channel);
-    if (NS_FAILED(rv)) return rv;
-
-    *result = channel;
-    return rv;
-}
-
-// Use this function with CAUTION. And do not use it on 
-// the UI thread. It creates a stream that blocks when
-// you Read() from it and blocking the UI thread is
-// illegal. If you don't want to implement a full
-// blown asyncrhonous consumer (via nsIStreamListener)
-// look at nsIStreamLoader instead.
-inline nsresult
-NS_OpenURI(nsIInputStream* *result, nsIURI* uri)
-{
-    nsresult rv;
-    nsIChannel* channel;
-
-    rv = NS_OpenURI(&channel, uri, nsnull);
-    if (NS_FAILED(rv)) return rv;
-
-    nsIInputStream* inStr;
-    rv = channel->OpenInputStream(0, -1, &inStr);
-    NS_RELEASE(channel);
-    if (NS_FAILED(rv)) return rv;
-
-    *result = inStr;
-    return rv;
-}
-
-inline nsresult
-NS_OpenURI(nsIStreamListener* aConsumer, nsISupports* context, nsIURI* uri, 
-           nsILoadGroup *aGroup)
-{
-    nsresult rv;
-    nsIChannel* channel;
-
-    rv = NS_OpenURI(&channel, uri, aGroup);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = channel->AsyncRead(0, -1, context, aConsumer);
-    NS_RELEASE(channel);
-    return rv;
-}
-
-inline nsresult
-NS_MakeAbsoluteURI(const char* spec, nsIURI* baseURI, char* *result)
-{
-    nsresult rv;
-    NS_ASSERTION(baseURI, "It doesn't make sense to not supply a base URI");
- 
-    if (spec == nsnull)
-        return baseURI->GetSpec(result);
-     
-    static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
-    NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
-
-    PRUint32 startPos, endPos;
-    rv = serv->ExtractScheme(spec, &startPos, &endPos, nsnull);
-    if (NS_SUCCEEDED(rv)) {
-        // if spec has a scheme, then it's already absolute
-        *result = nsCRT::strdup(spec);
-        return (*result == nsnull) ? NS_ERROR_OUT_OF_MEMORY : NS_OK;
-    }
-     
-    return baseURI->Resolve(spec, result);
-}
-
-inline nsresult
-NS_MakeAbsoluteURI(const nsString& spec, nsIURI* baseURI, nsString& result)
-{
-    char* resultStr;
-    char* specStr = spec.ToNewUTF8String();
-    if (!specStr) {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-    nsresult rv = NS_MakeAbsoluteURI(specStr, baseURI, &resultStr);
-    nsAllocator::Free(specStr);
-    if (NS_FAILED(rv)) return rv;
-
-    result = resultStr;
-    nsAllocator::Free(resultStr);
-    return rv;
-}
-
-inline nsresult
-NS_NewPostDataStream(PRBool isFile, const char *data, PRUint32 encodeFlags,
-                     nsIInputStream **result)
-{
-    nsresult rv;
-    static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
-    NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIProtocolHandler> handler;
-    rv = serv->GetProtocolHandler("http", getter_AddRefs(handler));
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIHTTPProtocolHandler> http = do_QueryInterface(handler, &rv);
-    if (NS_FAILED(rv)) return rv;
-    
-    return http->NewPostDataStream(isFile, data, encodeFlags, result);
-}
-
-inline nsresult
-NS_NewInputStreamChannel(nsIURI* uri,
-                         const char* contentType, 
-                         PRInt32 contentLength,
-                         nsIInputStream* inStr,
-                         nsILoadGroup* group,
-                         nsIInterfaceRequestor* notificationCallbacks,
-                         nsLoadFlags loadAttributes,
-                         nsIURI* originalURI,
-                         PRUint32 bufferSegmentSize,
-                         PRUint32 bufferMaxSize,
-                         nsIChannel **result)
-{
-    nsresult rv;
-    nsCOMPtr<nsIInputStreamChannel> channel;
-    static NS_DEFINE_CID(kInputStreamChannelCID, NS_INPUTSTREAMCHANNEL_CID);
-    rv = nsComponentManager::CreateInstance(kInputStreamChannelCID,
-                                            nsnull, 
-                                            NS_GET_IID(nsIInputStreamChannel),
-                                            getter_AddRefs(channel));
-    if (NS_FAILED(rv)) return rv;
-    rv = channel->Init(uri, contentType, contentLength, inStr, group, 
-                       notificationCallbacks, loadAttributes, originalURI,
-                       bufferSegmentSize, bufferMaxSize);
-    if (NS_FAILED(rv)) return rv;
-
-    *result = channel;
-    NS_ADDREF(*result);
-    return NS_OK;
-}
-
-inline nsresult
-NS_NewLoadGroup(nsIStreamObserver* obs, nsILoadGroup* *result)
-{
-    nsresult rv;
-    nsCOMPtr<nsILoadGroup> group;
-    static NS_DEFINE_CID(kLoadGroupCID, NS_LOADGROUP_CID);
-    rv = nsComponentManager::CreateInstance(kLoadGroupCID, nsnull, 
-                                            NS_GET_IID(nsILoadGroup), 
-                                            getter_AddRefs(group));
-    if (NS_FAILED(rv)) return rv;
-    rv = group->Init(obs);
-    if (NS_FAILED(rv)) return rv;
-
-    *result = group;
-    NS_ADDREF(*result);
-    return NS_OK;
-}
-
-
-inline nsresult
-NS_NewStreamLoader(nsIStreamLoader* *result,
-                   nsIURI* uri,
-                   nsIStreamLoaderObserver* observer,
-                   nsISupports* context = nsnull,
-                   nsILoadGroup* loadGroup = nsnull,
-                   nsIInterfaceRequestor* notificationCallbacks = nsnull,
-                   nsLoadFlags loadAttributes = nsIChannel::LOAD_NORMAL,
-                   PRUint32 bufferSegmentSize = 0, 
-                   PRUint32 bufferMaxSize = 0)
-{
-    nsresult rv;
-    nsCOMPtr<nsIStreamLoader> loader;
-    static NS_DEFINE_CID(kStreamLoaderCID, NS_STREAMLOADER_CID);
-    rv = nsComponentManager::CreateInstance(kStreamLoaderCID,
-                                            nsnull,
-                                            NS_GET_IID(nsIStreamLoader),
-                                            getter_AddRefs(loader));
-    if (NS_FAILED(rv)) return rv;
-    rv = loader->Init(uri, observer, context, loadGroup, notificationCallbacks, loadAttributes,
-                      bufferSegmentSize, bufferMaxSize);
-    if (NS_FAILED(rv)) return rv;
-    *result = loader;
-    NS_ADDREF(*result);
-    return rv;
-}
-
-inline nsresult
-NS_NewAsyncStreamObserver(nsIStreamObserver *receiver, nsIEventQueue *eventQueue,
-                          nsIStreamObserver **result)
-{
-    nsresult rv;
-    nsCOMPtr<nsIAsyncStreamObserver> obs;
-    static NS_DEFINE_CID(kAsyncStreamObserverCID, NS_ASYNCSTREAMOBSERVER_CID);
-    rv = nsComponentManager::CreateInstance(kAsyncStreamObserverCID,
-                                            nsnull, 
-                                            NS_GET_IID(nsIAsyncStreamObserver),
-                                            getter_AddRefs(obs));
-    if (NS_FAILED(rv)) return rv;
-    rv = obs->Init(receiver, eventQueue);
-    if (NS_FAILED(rv)) return rv;
-
-    *result = obs;
-    NS_ADDREF(*result);
-    return NS_OK;
-}
-
-inline nsresult
-NS_NewAsyncStreamListener(nsIStreamListener *receiver, nsIEventQueue *eventQueue,
-                          nsIStreamListener **result)
-{
-    nsresult rv;
-    nsCOMPtr<nsIAsyncStreamListener> lsnr;
-    static NS_DEFINE_CID(kAsyncStreamListenerCID, NS_ASYNCSTREAMLISTENER_CID);
-    rv = nsComponentManager::CreateInstance(kAsyncStreamListenerCID,
-                                            nsnull, 
-                                            NS_GET_IID(nsIAsyncStreamListener),
-                                            getter_AddRefs(lsnr));
-    if (NS_FAILED(rv)) return rv;
-    rv = lsnr->Init(receiver, eventQueue);
-    if (NS_FAILED(rv)) return rv;
-
-    *result = lsnr;
-    NS_ADDREF(*result);
-    return NS_OK;
-}
-
-inline nsresult
-NS_NewSyncStreamListener(nsIInputStream **inStream, 
-                         nsIBufferOutputStream **outStream,
-                         nsIStreamListener **listener)
-{
-    nsresult rv;
-    nsCOMPtr<nsISyncStreamListener> lsnr;
-    static NS_DEFINE_CID(kSyncStreamListenerCID, NS_SYNCSTREAMLISTENER_CID);
-    rv = nsComponentManager::CreateInstance(kSyncStreamListenerCID,
-                                            nsnull, 
-                                            NS_GET_IID(nsISyncStreamListener),
-                                            getter_AddRefs(lsnr));
-    if (NS_FAILED(rv)) return rv;
-    rv = lsnr->Init(inStream, outStream);
-    if (NS_FAILED(rv)) return rv;
-
-    *listener = lsnr;
-    NS_ADDREF(*listener);
-    return NS_OK;
-}
-
-#endif // nsNetUtil_h__

mozilla/netwerk/base/public/nsUnixColorPrintf.h

@@ -1,100 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef _nsUnixColorPrintf_h_
-#define _nsUnixColorPrintf_h_
-
-#if defined(XP_UNIX) && defined(NS_DEBUG)
-
-#define STARTGRAY       "\033[1;30m"
-#define STARTRED        "\033[1;31m"
-#define STARTGREEN      "\033[1;32m"
-#define STARTYELLOW     "\033[1;33m"
-#define STARTBLUE       "\033[1;34m"
-#define STARTMAGENTA    "\033[1;35m"
-#define STARTCYAN       "\033[1;36m"
-#define STARTUNDERLINE  "\033[4m"
-#define STARTREVERSE    "\033[7m"
-#define ENDCOLOR        "\033[0m"
-
-#define PRINTF_GRAY nsUnixColorPrintf __color_printf(STARTGREY)
-#define PRINTF_RED  nsUnixColorPrintf __color_printf(STARTRED)
-#define PRINTF_GREEN nsUnixColorPrintf __color_printf(STARTGREEN)
-#define PRINTF_YELLOW nsUnixColorPrintf __color_printf(STARTYELLOW)
-#define PRINTF_BLUE nsUnixColorPrintf __color_printf(STARTBLUE)
-#define PRINTF_MAGENTA nsUnixColorPrintf __color_printf(STARTMAGENTA)
-#define PRINTF_CYAN nsUnixColorPrintf __color_printf(STARTCYAN)
-#define PRINTF_UNDERLINE nsUnixColorPrintf __color_printf(STARTUNDERLINE)
-#define PRINTF_REVERSE nsUnixColorPrintf __color_printf(STARTREVERSE)
-
-/* 
-    The nsUnixColorPrintf is a handy set of color term codes to change
-    the color of console texts for easier spotting. As of now this is 
-    Unix and Debug only. 
-
-    Usage is simple. 
-    
-    See examples in 
-        mozilla/netwerk/protocol/http/src/nsHTTPHandler.cpp
-
-    -Gagan Saksena 11/01/99
-*/
-
-class nsUnixColorPrintf
-{
-public:
-    nsUnixColorPrintf(const char* colorCode) 
-    {
-        printf("%s",colorCode);
-    }
-    ~nsUnixColorPrintf()
-    {
-        printf("%s",ENDCOLOR);
-    }
-};
-
-#else // XP_UNIX
-
-#define STARTGRAY       ""
-#define STARTRED        ""
-#define STARTGREEN      ""
-#define STARTYELLOW     ""
-#define STARTBLUE       ""
-#define STARTMAGENTA    ""
-#define STARTCYAN       ""
-#define STARTUNDERLINE  ""
-#define STARTREVERSE    ""
-#define ENDCOLOR        ""
-
-#define PRINTF_GRAY
-#define PRINTF_RED
-#define PRINTF_GREEN
-#define PRINTF_YELLOW
-#define PRINTF_BLUE
-#define PRINTF_MAGENTA
-#define PRINTF_CYAN
-#define PRINTF_UNDERLINE
-#define PRINTF_REVERSE
-
-#endif // XP_UNIX
-#endif // nsUnixColorPrintf
-

mozilla/netwerk/base/src/Makefile.in

@@ -1,63 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= necko
-LIBRARY_NAME	= neckobase_s
-
-CPPSRCS		= \
-		nsURLHelper.cpp \
-		nsFileStreams.cpp \
-		nsBufferedStreams.cpp \
-		nsAsyncStreamListener.cpp \
-		nsSyncStreamListener.cpp \
-		nsIOService.cpp \
-		nsSocketTransport.cpp \
-		nsSocketTransportService.cpp \
-		nsFileTransport.cpp \
-		nsFileTransportService.cpp \
-		nsStdURLParser.cpp \
-		nsAuthURLParser.cpp \
-		nsNoAuthURLParser.cpp \
-		nsStdURL.cpp \
-		nsSimpleURI.cpp \
-		nsNetModuleMgr.cpp \
-		nsNetModRegEntry.cpp \
-		nsLoadGroup.cpp \
-		nsInputStreamChannel.cpp \
-		nsDirectoryIndexStream.cpp \
-		nsStreamLoader.cpp \
-		nsProtocolProxyService.cpp \
-		$(NULL)
-
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/netwerk/base/src/makefile.win

@@ -1,64 +0,0 @@
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-MODULE = necko
-
-DEPTH = ..\..\..
-include <$(DEPTH)/config/config.mak>
-
-LCFLAGS = -DWIN32_LEAN_AND_MEAN -D_IMPL_NS_NET
-
-LIBRARY_NAME=neckobase_s
-
-CPP_OBJS =                                         \
-        .\$(OBJDIR)\nsURLHelper.obj                \
-        .\$(OBJDIR)\nsFileStreams.obj              \
-        .\$(OBJDIR)\nsBufferedStreams.obj          \
-        .\$(OBJDIR)\nsAsyncStreamListener.obj      \
-        .\$(OBJDIR)\nsSyncStreamListener.obj       \
-        .\$(OBJDIR)\nsIOService.obj                \
-        .\$(OBJDIR)\nsSocketTransport.obj          \
-        .\$(OBJDIR)\nsSocketTransportService.obj   \
-        .\$(OBJDIR)\nsFileTransport.obj            \
-        .\$(OBJDIR)\nsFileTransportService.obj     \
-        .\$(OBJDIR)\nsStdURLParser.obj             \
-        .\$(OBJDIR)\nsAuthURLParser.obj            \
-        .\$(OBJDIR)\nsNoAuthURLParser.obj          \
-        .\$(OBJDIR)\nsStdURL.obj                   \
-        .\$(OBJDIR)\nsSimpleURI.obj                \
-        .\$(OBJDIR)\nsNetModuleMgr.obj             \
-        .\$(OBJDIR)\nsNetModRegEntry.obj           \
-        .\$(OBJDIR)\nsLoadGroup.obj                \
-        .\$(OBJDIR)\nsInputStreamChannel.obj       \
-        .\$(OBJDIR)\nsDirectoryIndexStream.obj     \
-        .\$(OBJDIR)\nsStreamLoader.obj             \
-        .\$(OBJDIR)\nsProtocolProxyService.obj     \
-        $(NULL)
-
-INCS = $(INCS)                  \
-        -I$(DEPTH)\dist\include \
-        $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-
-install:: $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/netwerk/base/src/nsAsyncStreamListener.cpp

@@ -1,468 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsAsyncStreamListener.h"
-#include "nsIBufferInputStream.h"
-#include "nsString.h"
-#include "nsCRT.h"
-#include "nsIEventQueueService.h"
-#include "nsIIOService.h"
-#include "nsIServiceManager.h"
-#include "nsIChannel.h"
-#include "prlog.h"
-
-static NS_DEFINE_CID(kEventQueueService, NS_EVENTQUEUESERVICE_CID);
-
-#if defined(PR_LOGGING)
-PRLogModuleInfo* gStreamEventLog = 0;
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-
-class nsStreamListenerEvent
-{
-public:
-    nsStreamListenerEvent(nsAsyncStreamObserver* listener,
-                          nsIChannel* channel, nsISupports* context);
-    virtual ~nsStreamListenerEvent();
-
-    nsresult Fire(nsIEventQueue* aEventQ);
-
-    NS_IMETHOD HandleEvent() = 0;
-
-protected:
-    static void PR_CALLBACK HandlePLEvent(PLEvent* aEvent);
-    static void PR_CALLBACK DestroyPLEvent(PLEvent* aEvent);
-
-    nsAsyncStreamObserver*      mListener;
-    nsIChannel*                 mChannel;
-    nsISupports*                mContext;
-    PLEvent *                   mEvent;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsStreamListenerEvent::nsStreamListenerEvent(nsAsyncStreamObserver* listener,
-                                             nsIChannel* channel, nsISupports* context)
-    : mListener(listener), mChannel(channel), mContext(context), mEvent(nsnull)
-{
-    MOZ_COUNT_CTOR(nsStreamListenerEvent);
-
-    NS_IF_ADDREF(mListener);
-    NS_IF_ADDREF(mChannel);
-    NS_IF_ADDREF(mContext);
-}
-
-nsStreamListenerEvent::~nsStreamListenerEvent()
-{
-    MOZ_COUNT_DTOR(nsStreamListenerEvent);
-
-    NS_IF_RELEASE(mListener);
-    NS_IF_RELEASE(mChannel);
-    NS_IF_RELEASE(mContext);
-
-    if (nsnull != mEvent)
-    {
-        delete mEvent;
-        mEvent = nsnull;
-    }
-}
-
-void PR_CALLBACK nsStreamListenerEvent::HandlePLEvent(PLEvent* aEvent)
-{
-    nsStreamListenerEvent * ev = 
-        (nsStreamListenerEvent *) PL_GetEventOwner(aEvent);
-
-    NS_ASSERTION(nsnull != ev,"null event.");
-
-    nsresult rv = ev->HandleEvent();
-    ev->mListener->SetStatus(rv);
-}
-
-void PR_CALLBACK nsStreamListenerEvent::DestroyPLEvent(PLEvent* aEvent)
-{
-    nsStreamListenerEvent * ev = 
-        (nsStreamListenerEvent *) PL_GetEventOwner(aEvent);
-
-    NS_ASSERTION(nsnull != ev,"null event.");
-
-    delete ev;
-}
-
-nsresult
-nsStreamListenerEvent::Fire(nsIEventQueue* aEventQueue) 
-{
-    NS_PRECONDITION(nsnull != aEventQueue, "nsIEventQueue for thread is null");
-
-    NS_PRECONDITION(nsnull == mEvent, "Init plevent only once.");
-    
-    mEvent = new PLEvent;
-    
-    PL_InitEvent(mEvent, 
-                 this,
-                 (PLHandleEventProc)  nsStreamListenerEvent::HandlePLEvent,
-                 (PLDestroyEventProc) nsStreamListenerEvent::DestroyPLEvent);
-
-    PRStatus status = aEventQueue->PostEvent(mEvent);
-    return status == PR_SUCCESS ? NS_OK : NS_ERROR_FAILURE;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsAsyncStreamObserver::~nsAsyncStreamObserver()
-{
-}
-
-NS_IMPL_THREADSAFE_ADDREF(nsAsyncStreamObserver)
-NS_IMPL_THREADSAFE_RELEASE(nsAsyncStreamObserver)
-NS_IMPL_QUERY_INTERFACE2(nsAsyncStreamObserver,
-                         nsIAsyncStreamObserver,
-                         nsIStreamObserver)
-
-NS_IMPL_ADDREF_INHERITED(nsAsyncStreamListener, nsAsyncStreamObserver);
-NS_IMPL_RELEASE_INHERITED(nsAsyncStreamListener, nsAsyncStreamObserver);
-
-NS_IMETHODIMP 
-nsAsyncStreamListener::QueryInterface(REFNSIID aIID, void** aInstancePtr)
-{
-  if (!aInstancePtr) return NS_ERROR_NULL_POINTER;
-  if (aIID.Equals(NS_GET_IID(nsIAsyncStreamListener))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIAsyncStreamListener*, this);
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(NS_GET_IID(nsIStreamListener))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIStreamListener*, this);
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  return nsAsyncStreamObserver::QueryInterface(aIID, aInstancePtr);
-}
-
-NS_IMETHODIMP
-nsAsyncStreamObserver::Init(nsIStreamObserver* aObserver, nsIEventQueue* aEventQ)
-{
-    nsresult rv = NS_OK;
-    mReceiver = aObserver;
-        
-    NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueService, &rv);
-    if (NS_FAILED(rv)) 
-    return rv;
-        
-    rv = eventQService->ResolveEventQueue(aEventQ, getter_AddRefs(mEventQueue));
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// OnStartRequest...
-//
-////////////////////////////////////////////////////////////////////////////////
-
-class nsOnStartRequestEvent : public nsStreamListenerEvent
-{
-public:
-    nsOnStartRequestEvent(nsAsyncStreamObserver* listener, 
-                          nsIChannel* channel, nsISupports* context)
-        : nsStreamListenerEvent(listener, channel, context) {}
-    virtual ~nsOnStartRequestEvent() {}
-
-    NS_IMETHOD HandleEvent();
-};
-
-NS_IMETHODIMP
-nsOnStartRequestEvent::HandleEvent()
-{
-#if defined(PR_LOGGING)
-  if (!gStreamEventLog)
-      gStreamEventLog = PR_NewLogModule("netlibStreamEvent");
-  PR_LOG(gStreamEventLog, PR_LOG_DEBUG,
-         ("netlibEvent: Handle Start [event=%x]", this));
-#endif
-  nsIStreamObserver* receiver = (nsIStreamObserver*)mListener->GetReceiver();
-  return receiver->OnStartRequest(mChannel, mContext);
-}
-
-NS_IMETHODIMP 
-nsAsyncStreamObserver::OnStartRequest(nsIChannel* channel, nsISupports* context)
-{
-    nsresult rv = GetStatus();
-    if (NS_FAILED(rv)) return rv;
-
-    nsOnStartRequestEvent* event = 
-        new nsOnStartRequestEvent(this, channel, context);
-    if (event == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-#if defined(PR_LOGGING)
-    PLEventQueue *equeue;
-    mEventQueue->GetPLEventQueue(&equeue);
-    char ts[80];
-    sprintf(ts, "nsAsyncStreamObserver: Start [this=%lx queue=%lx",
-            (long)this, (long)equeue);
-    if (!gStreamEventLog)
-      gStreamEventLog = PR_NewLogModule("netlibStreamEvent");
-    PR_LOG(gStreamEventLog, PR_LOG_DEBUG,
-           ("nsAsyncStreamObserver: Start [this=%x queue=%x event=%x]",
-            this, equeue, event));
-#endif
-    rv = event->Fire(mEventQueue);
-    if (NS_FAILED(rv)) goto failed;
-    return rv;
-
-  failed:
-    delete event;
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// OnStopRequest
-//
-////////////////////////////////////////////////////////////////////////////////
-
-class nsOnStopRequestEvent : public nsStreamListenerEvent
-{
-public:
-    nsOnStopRequestEvent(nsAsyncStreamObserver* listener, 
-                         nsISupports* context, nsIChannel* channel)
-        : nsStreamListenerEvent(listener, channel, context),
-          mStatus(NS_OK), mMessage(nsnull) {}
-    virtual ~nsOnStopRequestEvent();
-
-    nsresult Init(nsresult status, const PRUnichar* aMsg);
-    NS_IMETHOD HandleEvent();
-
-protected:
-    nsresult    mStatus;
-    PRUnichar*  mMessage;
-};
-
-nsOnStopRequestEvent::~nsOnStopRequestEvent()
-{
-}
-
-nsresult
-nsOnStopRequestEvent::Init(nsresult status, const PRUnichar* aMsg)
-{
-    mStatus = status;
-    mMessage = (PRUnichar*)aMsg;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsOnStopRequestEvent::HandleEvent()
-{
-#if defined(PR_LOGGING)
-  if (!gStreamEventLog)
-    gStreamEventLog = PR_NewLogModule("netlibStreamEvent");
-  PR_LOG(gStreamEventLog, PR_LOG_DEBUG,
-         ("netlibEvent: Handle Stop [event=%x]", this));
-#endif
-  nsIStreamObserver* receiver = (nsIStreamObserver*)mListener->GetReceiver();
-  nsresult rv = mListener->GetStatus();
-
-  //
-  // If the consumer returned a failure code, then pass it out in the
-  // OnStopRequest(...) notification...
-  //
-  if (NS_FAILED(rv)) {
-    mStatus = rv;
-  }
-  return receiver->OnStopRequest(mChannel, mContext, mStatus, mMessage);
-}
-
-NS_IMETHODIMP 
-nsAsyncStreamObserver::OnStopRequest(nsIChannel* channel, nsISupports* context,
-                                     nsresult aStatus,
-                                     const PRUnichar* aMsg)
-{
-    nsresult rv;
-
-    //
-    // Fire the OnStopRequest(...) regardless of what the current
-    // Status is...
-    //
-    nsOnStopRequestEvent* event = 
-        new nsOnStopRequestEvent(this, context, channel);
-    if (event == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    rv = event->Init(aStatus, aMsg);
-    if (NS_FAILED(rv)) goto failed;
-#if defined(PR_LOGGING)
-    PLEventQueue *equeue;
-    mEventQueue->GetPLEventQueue(&equeue);
-    if (!gStreamEventLog)
-      gStreamEventLog = PR_NewLogModule("netlibStreamEvent");
-    PR_LOG(gStreamEventLog, PR_LOG_DEBUG,
-           ("nsAsyncStreamObserver: Stop [this=%x queue=%x event=%x]",
-            this, equeue, event));
-#endif
-    rv = event->Fire(mEventQueue);
-    if (NS_FAILED(rv)) goto failed;
-    return rv;
-
-  failed:
-    delete event;
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// OnDataAvailable
-//
-////////////////////////////////////////////////////////////////////////////////
-
-class nsOnDataAvailableEvent : public nsStreamListenerEvent
-{
-public:
-    nsOnDataAvailableEvent(nsAsyncStreamObserver* listener, 
-                           nsIChannel* channel, nsISupports* context)
-        : nsStreamListenerEvent(listener, channel, context),
-          mIStream(nsnull), mLength(0) {}
-    virtual ~nsOnDataAvailableEvent();
-
-    nsresult Init(nsIInputStream* aIStream, PRUint32 aSourceOffset,
-                  PRUint32 aLength);
-    NS_IMETHOD HandleEvent();
-
-protected:
-    nsIInputStream*       mIStream;
-    PRUint32                    mSourceOffset;
-    PRUint32                    mLength;
-};
-
-nsOnDataAvailableEvent::~nsOnDataAvailableEvent()
-{
-    NS_RELEASE(mIStream);
-}
-
-nsresult
-nsOnDataAvailableEvent::Init(nsIInputStream* aIStream, PRUint32 aSourceOffset,
-                             PRUint32 aLength)
-{
-    mSourceOffset = aSourceOffset;
-    mLength = aLength;
-    mIStream = aIStream;
-    NS_ADDREF(mIStream);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsOnDataAvailableEvent::HandleEvent()
-{
-#if defined(PR_LOGGING)
-  if (!gStreamEventLog)
-    gStreamEventLog = PR_NewLogModule("netlibStreamEvent");
-  PR_LOG(gStreamEventLog, PR_LOG_DEBUG,
-         ("netlibEvent: Handle Data [event=%x]", this));
-#endif
-  nsIStreamListener* receiver = (nsIStreamListener*)mListener->GetReceiver();
-  nsresult rv = mListener->GetStatus();
-  //
-  // Only send OnDataAvailable(... ) notifications if all previous calls
-  // have succeeded...
-  //
-  if (NS_SUCCEEDED(rv)) {
-    rv = receiver->OnDataAvailable(mChannel, mContext,
-                                   mIStream, mSourceOffset, mLength);
-    //
-    // If the consumer fails, then cancel the transport.  This is necessary
-    // in case where the socket transport is blocked waiting for room in the
-    // pipe, but the consumer fails without consuming all the data.
-    //
-    // Unless the transport is cancelled, it will block forever, waiting for
-    // the pipe to empty...
-    //
-    if (NS_FAILED(rv)) {
-      mChannel->Cancel();
-    }
-  }
-  return rv;
-}
-
-NS_IMETHODIMP 
-nsAsyncStreamListener::OnDataAvailable(nsIChannel* channel, nsISupports* context,
-                                       nsIInputStream *aIStream, 
-                                       PRUint32 aSourceOffset,
-                                       PRUint32 aLength)
-{
-    nsresult rv = GetStatus();
-    if (NS_FAILED(rv)) return rv;
-
-    nsOnDataAvailableEvent* event = 
-        new nsOnDataAvailableEvent(this, channel, context);
-    if (event == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    rv = event->Init(aIStream, aSourceOffset, aLength);
-    if (NS_FAILED(rv)) goto failed;
-#if defined(PR_LOGGING)
-    PLEventQueue *equeue;
-    mEventQueue->GetPLEventQueue(&equeue);
-    if (!gStreamEventLog)
-      gStreamEventLog = PR_NewLogModule("netlibStreamEvent");
-    PR_LOG(gStreamEventLog, PR_LOG_DEBUG,
-           ("nsAsyncStreamObserver: Data [this=%x queue=%x event=%x]",
-            this, equeue, event));
-#endif
-    rv = event->Fire(mEventQueue);
-    if (NS_FAILED(rv)) goto failed;
-    return rv;
-
-  failed:
-    delete event;
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-NS_METHOD
-nsAsyncStreamObserver::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    if (aOuter)
-        return NS_ERROR_NO_AGGREGATION;
-    nsAsyncStreamObserver* l = new nsAsyncStreamObserver();
-    if (l == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(l);
-    nsresult rv = l->QueryInterface(aIID, aResult);
-    NS_RELEASE(l);
-    return rv;
-}
-
-NS_METHOD
-nsAsyncStreamListener::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    if (aOuter)
-        return NS_ERROR_NO_AGGREGATION;
-    nsAsyncStreamListener* l = new nsAsyncStreamListener();
-    if (l == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(l);
-    nsresult rv = l->QueryInterface(aIID, aResult);
-    NS_RELEASE(l);
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/netwerk/base/src/nsAsyncStreamListener.h

@@ -1,106 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsAsyncStreamListener_h__
-#define nsAsyncStreamListener_h__
-
-#include "nsIStreamListener.h"
-#include "nsCOMPtr.h"
-#include "nsIEventQueue.h"
-#include "nsIStreamObserver.h"
-#include "nsIStreamListener.h"
-
-////////////////////////////////////////////////////////////////////////////////
-
-class nsAsyncStreamObserver : public nsIAsyncStreamObserver
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSISTREAMOBSERVER
-    NS_DECL_NSIASYNCSTREAMOBSERVER
-
-    // nsAsyncStreamObserver methods:
-    nsAsyncStreamObserver() 
-        : mStatus(NS_OK) 
-    { 
-        NS_INIT_REFCNT();
-    }
-    
-    virtual ~nsAsyncStreamObserver();
-
-    static NS_METHOD
-    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-    nsISupports* GetReceiver()      { return mReceiver.get(); }
-    nsresult GetStatus()            { return mStatus; }
-    void SetStatus(nsresult value)  { if (NS_SUCCEEDED(mStatus)) mStatus = value; }
-
-protected:
-    nsCOMPtr<nsIEventQueue>     mEventQueue;
-    nsCOMPtr<nsIStreamObserver> mReceiver;
-    nsresult                    mStatus;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class nsAsyncStreamListener : public nsAsyncStreamObserver,
-                              public nsIAsyncStreamListener
-{
-public:
-    NS_DECL_ISUPPORTS_INHERITED
-
-    // nsIStreamListener methods:
-    NS_IMETHOD OnStartRequest(nsIChannel* channel,
-                              nsISupports* context) 
-    { 
-        return nsAsyncStreamObserver::OnStartRequest(channel, context); 
-    }
-
-    NS_IMETHOD OnStopRequest(nsIChannel* channel,
-                             nsISupports* context, 
-                             nsresult aStatus,
-                             const PRUnichar* aMsg) 
-    { 
-        return nsAsyncStreamObserver::OnStopRequest(channel, context, aStatus, aMsg); 
-    }
-
-    NS_IMETHOD OnDataAvailable(nsIChannel* channel, nsISupports* context,
-                               nsIInputStream *aIStream, 
-                               PRUint32 aSourceOffset,
-                               PRUint32 aLength);
-
-    // nsIAsyncStreamListener methods:
-    NS_IMETHOD Init(nsIStreamListener* aListener, nsIEventQueue* aEventQ) {
-        return nsAsyncStreamObserver::Init(aListener, aEventQ);
-    }
-
-    // nsAsyncStreamListener methods:
-    nsAsyncStreamListener() {}
-
-    static NS_METHOD
-    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-#endif // nsAsyncStreamListener_h__

mozilla/netwerk/base/src/nsAuthURLParser.cpp

@@ -1,497 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Andreas Otte.
- *
- * Contributor(s): 
- */
-
-#include "nsAuthURLParser.h"
-#include "nsURLHelper.h"
-#include "nsCRT.h"
-#include "nsString.h"
-#include "prprf.h"
-
-NS_IMPL_THREADSAFE_ISUPPORTS(nsAuthURLParser, NS_GET_IID(nsIURLParser))
-
-nsAuthURLParser::~nsAuthURLParser()
-{
-}
-
-
-NS_METHOD
-nsAuthURLParser::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    if (aOuter)
-        return NS_ERROR_NO_AGGREGATION;
-    nsAuthURLParser* p = new nsAuthURLParser();
-    if (p == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(p);
-    nsresult rv = p->QueryInterface(aIID, aResult);
-    NS_RELEASE(p);
-    return rv;
-}
-
-nsresult
-nsAuthURLParser::ParseAtScheme(const char* i_Spec, char* *o_Scheme, 
-                               char* *o_Username, char* *o_Password, 
-                               char* *o_Host, PRInt32 *o_Port, char* *o_Path)
-{
-    nsresult rv = NS_OK;
-
-    NS_PRECONDITION( (nsnull != i_Spec), "Parse called on empty url!");
-    if (!i_Spec)
-        return NS_ERROR_MALFORMED_URI;
-
-    int len = PL_strlen(i_Spec);
-    if (len >= 2 && *i_Spec == '/' && *(i_Spec+1) == '/') // No Scheme
-    {
-        rv = ParseAtPreHost(i_Spec, o_Username, o_Password, o_Host, o_Port, 
-                            o_Path);
-        return rv;
-    }
-
-    static const char delimiters[] = "/:@?"; //this order is optimized.
-    char* brk = PL_strpbrk(i_Spec, delimiters);
-
-    if (!brk) // everything is a host
-    {
-        rv = ExtractString((char*)i_Spec, o_Host, len);
-        ToLowerCase(*o_Host);
-        return rv;
-    } else
-        len = PL_strlen(brk);
-
-    switch (*brk)
-    {
-    case '/' :
-    case '?' :
-        // If the URL starts with a slash then everything is a path
-        if (brk == i_Spec)
-        {
-            rv = ParseAtPath(brk, o_Path);
-            return rv;
-        }
-        else // The first part is host, so its host/path
-        {
-            rv = ExtractString((char*)i_Spec, o_Host, (brk - i_Spec));
-            if (NS_FAILED(rv))
-                return rv;
-            ToLowerCase(*o_Host);
-            rv = ParseAtPath(brk, o_Path);
-            return rv;
-        }
-        break;
-    case ':' :
-        if (len >= 2 && *(brk+1) == '/')  {
-            // Standard http://... or malformed http:/...
-            rv = ExtractString((char*)i_Spec, o_Scheme, (brk - i_Spec));
-            if (NS_FAILED(rv))
-                return rv;
-            ToLowerCase(*o_Scheme);
-            rv = ParseAtPreHost(brk+1, o_Username, o_Password, o_Host,
-                                o_Port, o_Path);
-            return rv;
-        } else {
-            // Could be host:port, so try conversion to number
-            PRInt32 port = ExtractPortFrom(brk+1);
-            if (port > 0)
-            {
-                rv = ExtractString((char*)i_Spec, o_Host, (brk - i_Spec));
-                if (NS_FAILED(rv))
-                    return rv;
-                ToLowerCase(*o_Host);
-                rv = ParseAtPort(brk+1, o_Port, o_Path);
-                return rv;
-            } else {
-                // No, it's not a number try scheme:host...    
-                rv = ExtractString((char*)i_Spec, o_Scheme, 
-                                       (brk - i_Spec));
-                if (NS_FAILED(rv))
-                    return rv;
-                ToLowerCase(*o_Scheme);
-                rv = ParseAtPreHost(brk+1, o_Username, o_Password, o_Host,
-                                    o_Port, o_Path);
-                return rv;
-            }
-        }
-        break;
-    case '@' :
-        rv = ParseAtPreHost(i_Spec, o_Username, o_Password, o_Host,
-                            o_Port, o_Path);
-        return rv;
-        break;
-    default:
-        NS_ASSERTION(0, "This just can't be!");
-        break;
-    }
-    return NS_OK;
-}
-
-nsresult
-nsAuthURLParser::ParseAtPreHost(const char* i_Spec, char* *o_Username, 
-                                char* *o_Password, char* *o_Host,
-                                PRInt32 *o_Port, char* *o_Path)
-{
-    nsresult rv = NS_OK;
-    // Skip leading two slashes
-    char* fwdPtr= (char*) i_Spec;
-    if (fwdPtr && (*fwdPtr != '\0') && (*fwdPtr == '/'))
-        fwdPtr++;
-    if (fwdPtr && (*fwdPtr != '\0') && (*fwdPtr == '/'))
-        fwdPtr++;
-
-    static const char delimiters[] = "/:@?"; 
-    char* brk = PL_strpbrk(fwdPtr, delimiters);
-	char* brk2 = nsnull;
-
-    if (!brk) 
-    {
-        rv = ParseAtHost(fwdPtr, o_Host, o_Port, o_Path);
-        return rv;
-    }
-
-    char* e_PreHost = nsnull;
-    switch (*brk)
-    {
-    case ':' :
-         // this maybe the : of host:port or username:password
-         // look if the next special char is @
-         brk2 = PL_strpbrk(brk+1, delimiters);
- 
-         if (!brk2) 
-         {
-             rv = ParseAtHost(fwdPtr, o_Host, o_Port, o_Path);
-             return rv;
-         }
-         switch (*brk2)
-         {
-         case '@' :
-             rv = ExtractString(fwdPtr, &e_PreHost, (brk2 - fwdPtr));
-             if (NS_FAILED(rv)) {
-                 CRTFREEIF(e_PreHost);
-                 return rv;
-             }
-             rv = ParsePreHost(e_PreHost,o_Username,o_Password);
-             CRTFREEIF(e_PreHost);
-             if (NS_FAILED(rv))
-                 return rv;
- 
-             rv = ParseAtHost(brk2+1, o_Host, o_Port, o_Path);
-             break;
-         default:
-             rv = ParseAtHost(fwdPtr, o_Host, o_Port, o_Path);
-             return rv;
-         }
-         break;
-	case '@' :
-        rv = ExtractString(fwdPtr, &e_PreHost, (brk - fwdPtr));
-        if (NS_FAILED(rv)) {
-            CRTFREEIF(e_PreHost);
-            return rv;
-        }
-        rv = ParsePreHost(e_PreHost,o_Username,o_Password);
-        CRTFREEIF(e_PreHost);
-        if (NS_FAILED(rv))
-            return rv;
-
-        rv = ParseAtHost(brk+1, o_Host, o_Port, o_Path);
-        break; 
-    default:
-        rv = ParseAtHost(fwdPtr, o_Host, o_Port, o_Path);
-    }
-    return rv;
-}
-
-nsresult
-nsAuthURLParser::ParseAtHost(const char* i_Spec, char* *o_Host,
-                             PRInt32 *o_Port, char* *o_Path)
-{
-    nsresult rv = NS_OK;
-
-    int len = PL_strlen(i_Spec);
-    static const char delimiters[] = ":/?"; //this order is optimized.
-    char* brk = PL_strpbrk(i_Spec, delimiters);
-    if (!brk) // everything is a host
-    {
-        rv = ExtractString((char*)i_Spec, o_Host, len);
-        ToLowerCase(*o_Host);
-        return rv;
-    }
-
-    switch (*brk)
-    {
-    case '/' :
-    case '?' :
-        // Get the Host, the rest is Path
-        rv = ExtractString((char*)i_Spec, o_Host, (brk - i_Spec));
-        if (NS_FAILED(rv))
-            return rv;
-        ToLowerCase(*o_Host);
-        rv = ParseAtPath(brk, o_Path);
-        return rv;
-        break;
-    case ':' :
-        // Get the Host
-        rv = ExtractString((char*)i_Spec, o_Host, (brk - i_Spec));
-        if (NS_FAILED(rv))
-            return rv;
-        ToLowerCase(*o_Host);
-        rv = ParseAtPort(brk+1, o_Port, o_Path);
-        return rv;
-        break;
-    default:
-        NS_ASSERTION(0, "This just can't be!");
-        break;
-    }
-    return NS_OK;
-}
-
-nsresult
-nsAuthURLParser::ParseAtPort(const char* i_Spec, PRInt32 *o_Port, 
-                             char* *o_Path)
-{
-    nsresult rv = NS_OK;
-    static const char delimiters[] = "/?"; //this order is optimized.
-    char* brk = PL_strpbrk(i_Spec, delimiters);
-    if (!brk) // everything is a Port
-    {
-        *o_Port = ExtractPortFrom(i_Spec);
-        if (*o_Port <= 0)
-            return NS_ERROR_MALFORMED_URI;
-        else
-            return NS_OK;
-    }
-
-    switch (*brk)
-    {
-    case '/' :
-    case '?' :
-        // Get the Port, the rest is Path
-        *o_Port = ExtractPortFrom(i_Spec);
-        if (*o_Port <= 0)
-            return NS_ERROR_MALFORMED_URI;
-        rv = ParseAtPath(brk, o_Path);
-        return rv;
-        break;
-    default:
-        NS_ASSERTION(0, "This just can't be!");
-        break;
-    }
-    return NS_OK;
-}
-
-nsresult
-nsAuthURLParser::ParseAtPath(const char* i_Spec, char* *o_Path)
-{
-    // Just write the path and check for a starting /
-    nsCAutoString dir;
-    if ('/' != *i_Spec)
-        dir += "/";
-    
-    dir += i_Spec;
-
-    *o_Path = dir.ToNewCString();
-    return (*o_Path ? NS_OK : NS_ERROR_OUT_OF_MEMORY);
-}
-
-nsresult
-nsAuthURLParser::ParseAtDirectory(const char* i_Path, char* *o_Directory, 
-                           char* *o_FileBaseName, char* *o_FileExtension,
-                           char* *o_Param, char* *o_Query, char* *o_Ref)
-{
-    // Cleanout
-    CRTFREEIF(*o_Directory);
-    CRTFREEIF(*o_FileBaseName);
-    CRTFREEIF(*o_FileExtension);
-    CRTFREEIF(*o_Param);
-    CRTFREEIF(*o_Query);
-    CRTFREEIF(*o_Ref);
-
-    nsresult rv = NS_OK;
-
-    // Parse the Path into its components
-    if (!i_Path) 
-    {
-        DupString(o_Directory, "/");
-        return (o_Directory ? NS_OK : NS_ERROR_OUT_OF_MEMORY);
-    }
-
-    char* dirfile = nsnull;
-    char* options = nsnull;
-
-    int len = PL_strlen(i_Path);
-
-    /* Factor out the optionpart with ;?# */
-    static const char delimiters[] = ";?#"; // for param, query and ref
-    char* brk = PL_strpbrk(i_Path, delimiters);
-
-    if (!brk) // Everything is just path and filename
-    {
-        DupString(&dirfile, i_Path); 
-    } 
-    else 
-    {
-        int dirfileLen = brk - i_Path;
-        ExtractString((char*)i_Path, &dirfile, dirfileLen);
-        len -= dirfileLen;
-        ExtractString((char*)i_Path + dirfileLen, &options, len);
-        brk = options;
-    }
-
-    /* now that we have broken up the path treat every part differently */
-    /* first dir+file */
-
-    char* file;
-
-    int dlen = PL_strlen(dirfile);
-    if (dlen == 0)
-    {
-        DupString(o_Directory, "/");
-        file = dirfile;
-    } else {
-        CoaleseDirs(dirfile);
-        // Get length again
-        dlen = PL_strlen(dirfile);
-
-        // First find the last slash
-        file = PL_strrchr(dirfile, '/');
-        if (!file) 
-        {
-            DupString(o_Directory, "/");
-            file = dirfile;
-        }
-
-        // If its not the same as the first slash then extract directory
-        if (file != dirfile)
-        {
-            ExtractString(dirfile, o_Directory, (file - dirfile)+1);
-        } else {
-            DupString(o_Directory, "/");
-        }
-    }
-
-    /* Extract FileBaseName and FileExtension */
-    if (dlen > 0) {
-        // Look again if there was a slash
-        char* slash = PL_strrchr(dirfile, '/');
-        char* e_FileName = nsnull;
-        if (slash) {
-            if (dirfile+dlen-1>slash)
-                ExtractString(slash+1, &e_FileName, dlen-(slash-dirfile+1));
-        } else {
-            // Use the full String as Filename
-            ExtractString(dirfile, &e_FileName, dlen);
-        } 
-
-        rv = ParseFileName(e_FileName,o_FileBaseName,o_FileExtension);
-
-        CRTFREEIF(e_FileName);
-    }
-
-    // Now take a look at the options. "#" has precedence over "?"
-    // which has precedence over ";"
-    if (options) {
-        // Look for "#" first. Everything following it is in the ref
-        brk = PL_strchr(options, '#');
-        if (brk) {
-            int pieceLen = len - (brk + 1 - options);
-            ExtractString(brk+1, o_Ref, pieceLen);
-            len -= pieceLen + 1;
-            *brk = '\0';
-        }
-
-        // Now look for "?"
-        brk = PL_strchr(options, '?');
-        if (brk) {
-            int pieceLen = len - (brk + 1 - options);
-            ExtractString(brk+1, o_Query, pieceLen);
-            len -= pieceLen + 1;
-            *brk = '\0';
-        }
-
-        // Now look for ';'
-        brk = PL_strchr(options, ';');
-        if (brk) {
-            int pieceLen = len - (brk + 1 - options);
-            ExtractString(brk+1, o_Param, pieceLen);
-            len -= pieceLen + 1;
-            *brk = '\0';
-        }
-    }
-
-    nsCRT::free(dirfile);
-    nsCRT::free(options);
-    return rv;
-}
-
-nsresult
-nsAuthURLParser::ParsePreHost(const char* i_PreHost, char* *o_Username, 
-                              char* *o_Password)
-{
-    nsresult rv = NS_OK;
-
-    if (!i_PreHost) {
-        *o_Username = nsnull;
-        *o_Password = nsnull;
-        return rv;
-    }
-
-    // Search for :
-    static const char delimiters[] = ":"; 
-    char* brk = PL_strpbrk(i_PreHost, delimiters);
-    if (brk) 
-    {
-        rv = ExtractString((char*)i_PreHost, o_Username, (brk - i_PreHost));
-        if (NS_FAILED(rv))
-            return rv;
-        rv = ExtractString(brk+1, o_Password, 
-             (i_PreHost+PL_strlen(i_PreHost) - brk - 1));
-    } else {
-        CRTFREEIF(*o_Password);
-        rv = DupString(o_Username, i_PreHost);
-    }
-    return rv;
-}
-
-nsresult
-nsAuthURLParser::ParseFileName(const char* i_FileName, char* *o_FileBaseName, 
-                               char* *o_FileExtension)
-{
-    nsresult rv = NS_OK;
-
-    if (!i_FileName) {
-        *o_FileBaseName = nsnull;
-        *o_FileExtension = nsnull;
-        return rv;
-    }
-
-    // Search for FileExtension
-    // Search for last .
-    // Ignore . at the beginning
-    char* brk = PL_strrchr(i_FileName+1, '.');
-    if (brk) 
-    {
-        rv = ExtractString((char*)i_FileName, o_FileBaseName, 
-                          (brk - i_FileName));
-        if (NS_FAILED(rv))
-            return rv;
-        rv = ExtractString(brk + 1, o_FileExtension, 
-                          (i_FileName+PL_strlen(i_FileName) - brk - 1));
-     } else {
-         rv = DupString(o_FileBaseName, i_FileName);
-     }
-    return rv;
-}

mozilla/netwerk/base/src/nsAuthURLParser.h

@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsAuthURLParser_h__
-#define nsAuthURLParser_h__
-
-#include "nsIURLParser.h"
-#include "nsIURI.h"
-#include "nsAgg.h"
-#include "nsCRT.h"
-
-class nsAuthURLParser : public nsIURLParser
-{
-public:
-    NS_DECL_ISUPPORTS
-    ///////////////////////////////////////////////////////////////////////////
-    // nsAuthURLParser methods:
-    nsAuthURLParser() {
-        NS_INIT_REFCNT();
-    }
-    virtual ~nsAuthURLParser();
-
-    static NS_METHOD
-    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-    ///////////////////////////////////////////////////////////////////////////
-    // nsIURLParser methods:
-    NS_DECL_NSIURLPARSER
-
-};
-
-#endif // nsAuthURLParser_h__

mozilla/netwerk/base/src/nsBufferedStreams.cpp

@@ -1,318 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsBufferedStreams.h"
-#include "nsCRT.h"
-
-////////////////////////////////////////////////////////////////////////////////
-// nsBufferedStream
-
-nsBufferedStream::nsBufferedStream()
-    : mBuffer(nsnull),
-      mBufferStartOffset(0),
-      mCursor(0), 
-      mFillPoint(0),
-      mStream(nsnull)
-{
-    NS_INIT_REFCNT();
-}
-
-nsBufferedStream::~nsBufferedStream()
-{
-    Close();
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsBufferedStream, 
-                              nsIBaseStream,
-                              nsISeekableStream);
-
-nsresult
-nsBufferedStream::Init(nsIBaseStream* stream, PRUint32 bufferSize)
-{
-    NS_ASSERTION(stream, "need to supply a stream");
-    NS_ASSERTION(mStream == nsnull, "already inited");
-    mStream = stream;
-    NS_ADDREF(mStream);
-    mBufferSize = bufferSize;
-    mBufferStartOffset = 0;
-    mCursor = 0;
-    mBuffer = new char[bufferSize];
-    if (mBuffer == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBufferedStream::Close()
-{
-    nsresult rv = NS_OK;
-    if (mStream) {
-        rv = mStream->Close();
-        NS_RELEASE(mStream);
-        mStream = nsnull;
-        delete[] mBuffer;
-        mBuffer = nsnull;
-        mBufferSize = 0;
-        mBufferStartOffset = 0;
-        mCursor = 0;
-    }
-    return rv;
-}
-
-NS_IMETHODIMP
-nsBufferedStream::Seek(PRInt32 whence, PRInt32 offset)
-{
-    if (mStream == nsnull)
-        return NS_BASE_STREAM_CLOSED;
-    
-    // If the underlying stream isn't a random access store, then fail early.
-    // We could possibly succeed for the case where the seek position denotes
-    // something that happens to be read into the buffer, but that would make
-    // the failure data-dependent.
-    nsresult rv;
-    nsCOMPtr<nsISeekableStream> ras = do_QueryInterface(mStream, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    PRInt32 absPos;
-    switch (whence) {
-      case nsISeekableStream::NS_SEEK_SET:
-        absPos = offset;
-        break;
-      case nsISeekableStream::NS_SEEK_CUR:
-        absPos = mBufferStartOffset + mCursor + offset;
-        break;
-      case nsISeekableStream::NS_SEEK_END:
-        absPos = -1;
-        break;
-      default:
-        NS_NOTREACHED("bogus seek whence parameter");
-        return NS_ERROR_UNEXPECTED;
-    }
-
-    if ((PRInt32)mBufferStartOffset <= absPos
-        && absPos < (PRInt32)(mBufferStartOffset + mFillPoint)) {
-        mCursor = absPos - mBufferStartOffset;
-        return NS_OK;
-    }
-
-    rv = Flush();
-    if (NS_FAILED(rv)) return rv;
-
-    rv = ras->Seek(whence, offset);
-    if (NS_FAILED(rv)) return rv;
-
-    if (absPos == -1) {
-        // then we had the SEEK_END case, above
-        rv = ras->Tell(&mBufferStartOffset);
-        if (NS_FAILED(rv)) return rv;
-    }
-    else {
-        mBufferStartOffset = absPos;
-    }
-    mCursor = 0;
-    mFillPoint = 0;
-    return Fill();
-}
-
-NS_IMETHODIMP
-nsBufferedStream::Tell(PRUint32 *result)
-{
-    if (mStream == nsnull)
-        return NS_BASE_STREAM_CLOSED;
-    
-    *result = mBufferStartOffset + mCursor;
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsBufferedInputStream
-
-NS_IMPL_ISUPPORTS_INHERITED2(nsBufferedInputStream, 
-                             nsBufferedStream,
-                             nsIInputStream,
-                             nsIBufferedInputStream);
-
-NS_METHOD
-nsBufferedInputStream::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    NS_ENSURE_NO_AGGREGATION(aOuter);
-
-    nsBufferedInputStream* stream = new nsBufferedInputStream();
-    if (stream == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(stream);
-    nsresult rv = stream->QueryInterface(aIID, aResult);
-    NS_RELEASE(stream);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsBufferedInputStream::Init(nsIInputStream* stream, PRUint32 bufferSize)
-{
-    return nsBufferedStream::Init(stream, bufferSize);
-}
-
-NS_IMETHODIMP
-nsBufferedInputStream::Close()
-{
-    return nsBufferedStream::Close();
-}
-
-NS_IMETHODIMP
-nsBufferedInputStream::Available(PRUint32 *result)
-{
-    *result = mFillPoint - mCursor;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsBufferedInputStream::Read(char * buf, PRUint32 count, PRUint32 *result)
-{
-    nsresult rv = NS_OK;
-    PRUint32 read = 0;
-    while (count > 0) {
-        PRUint32 amt = PR_MIN(count, mFillPoint - mCursor);
-        if (amt > 0) {
-            nsCRT::memcpy(buf, mBuffer + mCursor, amt);
-            read += amt;
-            count -= amt;
-            mCursor += amt;
-        }
-        else {
-            rv = Fill();
-            if (NS_FAILED(rv)) break;
-        }
-    }
-    *result = read;
-    return (read > 0 || rv == NS_BASE_STREAM_CLOSED) ? NS_OK : rv;
-}
-
-NS_IMETHODIMP
-nsBufferedInputStream::Fill()
-{
-    nsresult rv;
-    PRUint32 rem = mFillPoint - mCursor;
-    if (rem > 0) {
-        // slide the remainder down to the start of the buffer
-        // |<------------->|<--rem-->|<--->|
-        // b               c         f     s
-        nsCRT::memcpy(mBuffer, mBuffer + mCursor, rem);
-    }
-    mBufferStartOffset += mCursor;
-    mFillPoint = rem;
-    mCursor = 0;
-
-    PRUint32 amt;
-    rv = Source()->Read(mBuffer + mFillPoint, mBufferSize - mFillPoint, &amt);
-    if (NS_FAILED(rv)) return rv;
-
-    mFillPoint += amt;
-    return amt > 0 ? NS_OK : NS_BASE_STREAM_CLOSED;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsBufferedOutputStream
-
-NS_IMPL_ISUPPORTS_INHERITED2(nsBufferedOutputStream, 
-                             nsBufferedStream,
-                             nsIOutputStream,
-                             nsIBufferedOutputStream);
- 
-NS_METHOD
-nsBufferedOutputStream::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    NS_ENSURE_NO_AGGREGATION(aOuter);
-
-    nsBufferedOutputStream* stream = new nsBufferedOutputStream();
-    if (stream == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(stream);
-    nsresult rv = stream->QueryInterface(aIID, aResult);
-    NS_RELEASE(stream);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsBufferedOutputStream::Init(nsIOutputStream* stream, PRUint32 bufferSize)
-{
-    mFillPoint = bufferSize;   // always fill to the end for buffered output streams
-    return nsBufferedStream::Init(stream, bufferSize);
-}
-
-NS_IMETHODIMP
-nsBufferedOutputStream::Close()
-{
-    nsresult rv1, rv2;
-    rv1 = Flush();
-    // If we fail to Flush all the data, then we close anyway and drop the
-    // remaining data in the buffer. We do this because it's what Unix does
-    // for fclose and close. However, we report the error from Flush anyway.
-    rv2 = nsBufferedStream::Close();
-    if (NS_FAILED(rv1)) return rv1;
-    return rv2;
-}
-
-NS_IMETHODIMP
-nsBufferedOutputStream::Write(const char *buf, PRUint32 count, PRUint32 *result)
-{
-    nsresult rv = NS_OK;
-    PRUint32 written = 0;
-    while (count > 0) {
-        PRUint32 amt = PR_MIN(count, mFillPoint - mCursor);
-        if (amt > 0) {
-            nsCRT::memcpy(mBuffer + mCursor, buf, amt);
-            written += amt;
-            count -= amt;
-            mCursor += amt;
-        }
-        else {
-            rv = Flush();
-            if (NS_FAILED(rv)) break;
-        }
-    }
-    *result = written;
-    return (written > 0) ? NS_OK : rv;
-}
-
-NS_IMETHODIMP
-nsBufferedOutputStream::Flush(void)
-{
-    nsresult rv;
-    PRUint32 amt;
-    rv = Sink()->Write(mBuffer, mCursor, &amt);
-    if (NS_FAILED(rv)) return rv;
-    mBufferStartOffset += amt;
-    if (mCursor == amt) {
-        mCursor = 0;
-        return NS_OK;   // flushed everything
-    }
-
-    // slide the remainder down to the start of the buffer
-    // |<-------------->|<---|----->|
-    // b                a    c      s
-    PRUint32 rem = mCursor - amt;
-    nsCRT::memcpy(mBuffer, mBuffer + amt, rem);
-    mCursor = rem;
-    return NS_ERROR_FAILURE;        // didn't flush all
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/netwerk/base/src/nsBufferedStreams.h

@@ -1,117 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsBufferedStreams_h__
-#define nsBufferedStreams_h__
-
-#include "nsIFileStreams.h"
-#include "nsIInputStream.h"
-#include "nsIOutputStream.h"
-#include "nsCOMPtr.h"
-
-////////////////////////////////////////////////////////////////////////////////
-
-class nsBufferedStream : public nsIBaseStream, 
-                         public nsISeekableStream
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIBASESTREAM
-    NS_DECL_NSISEEKABLESTREAM
-
-    nsBufferedStream();
-    virtual ~nsBufferedStream();
-
-protected:
-    nsresult Init(nsIBaseStream* stream, PRUint32 bufferSize);
-    NS_IMETHOD Fill() = 0;
-    NS_IMETHOD Flush() = 0;
-
-protected:
-    PRUint32                    mBufferSize;
-    char*                       mBuffer;
-    // mBufferStartOffset is the offset relative to the start of mStream:
-    PRUint32                    mBufferStartOffset;
-    // mCursor is the read cursor for input streams, or write cursor for
-    // output streams, and is relative to mBufferStartOffset:
-    PRUint32                    mCursor;
-    // mFillPoint is the amount available in the buffer for input streams,
-    // or the end of the buffer for output streams, and is relative to 
-    // mBufferStartOffset:
-    PRUint32                    mFillPoint;
-    nsIBaseStream*              mStream;        // cast to appropriate subclass
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class nsBufferedInputStream : public nsBufferedStream,
-                              public nsIBufferedInputStream
-{
-public:
-    NS_DECL_ISUPPORTS_INHERITED
-    NS_DECL_NSIBASESTREAM
-    NS_DECL_NSIINPUTSTREAM
-    NS_DECL_NSIBUFFEREDINPUTSTREAM
-
-    nsBufferedInputStream() : nsBufferedStream() {}
-    virtual ~nsBufferedInputStream() {}
-
-    static NS_METHOD
-    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-    nsIInputStream* Source() { 
-        return (nsIInputStream*)mStream;
-    }
-
-protected:
-    NS_IMETHOD Fill();
-    NS_IMETHOD Flush() { return NS_OK; } // no-op for input streams
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class nsBufferedOutputStream : public nsBufferedStream, 
-                               public nsIBufferedOutputStream
-{
-public:
-    NS_DECL_ISUPPORTS_INHERITED
-    NS_DECL_NSIBASESTREAM
-    NS_DECL_NSIOUTPUTSTREAM
-    NS_DECL_NSIBUFFEREDOUTPUTSTREAM
-
-    nsBufferedOutputStream() : nsBufferedStream() {}
-    virtual ~nsBufferedOutputStream() {}
-
-    static NS_METHOD
-    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-    nsIOutputStream* Sink() { 
-        return (nsIOutputStream*)mStream;
-    }
-
-protected:
-    NS_IMETHOD Fill() { return NS_OK; } // no-op for output streams
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-#endif // nsBufferedStreams_h__

mozilla/netwerk/base/src/nsDirectoryIndexStream.cpp

@@ -1,272 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-
-/*
-
-  The converts a filesystem directory into an "HTTP index" stream per
-  Lou Montulli's original spec:
-
-    http://www.area.com/~roeber/file_format.html
-
- */
-
-#include "nsEscape.h"
-#include "nsDirectoryIndexStream.h"
-#include "nsXPIDLString.h"
-#include "prio.h"
-#include "prlog.h"
-#include "prlong.h"
-#ifdef PR_LOGGING
-static PRLogModuleInfo* gLog;
-#endif
-
-nsDirectoryIndexStream::nsDirectoryIndexStream()
-    : mOffset(0)
-{
-    NS_INIT_REFCNT();
-
-#ifdef PR_LOGGING
-    if (! gLog)
-        gLog = PR_NewLogModule("nsDirectoryIndexStream");
-#endif
-
-    PR_LOG(gLog, PR_LOG_DEBUG,
-           ("nsDirectoryIndexStream[%p]: created", this));
-}
-
-nsresult
-nsDirectoryIndexStream::Init(nsIFile* aDir)
-{
-    nsresult rv;
-    PRBool isDir;
-    rv = aDir->IsDirectory(&isDir);
-    if (NS_FAILED(rv)) return rv;
-    NS_PRECONDITION(isDir, "not a directory");
-    if (!isDir)
-        return NS_ERROR_ILLEGAL_VALUE;
-
-#ifdef PR_LOGGING
-    if (PR_LOG_TEST(gLog, PR_LOG_DEBUG)) {
-        nsXPIDLCString path;
-        aDir->GetPath(getter_Copies(path));
-        PR_LOG(gLog, PR_LOG_DEBUG,
-               ("nsDirectoryIndexStream[%p]: initialized on %s",
-                this, (const char*) path));
-    }
-#endif
-
-    mDir = aDir;
-
-    // Sigh. We have to allocate on the heap because there are no
-    // assignment operators defined.
-    rv = mDir->GetDirectoryEntries(getter_AddRefs(mIter));
-    if (NS_FAILED(rv)) return rv;
-
-    mBuf = "200: filename content-length last-modified file-type\n";
-    return NS_OK;
-}
-
-nsDirectoryIndexStream::~nsDirectoryIndexStream()
-{
-    PR_LOG(gLog, PR_LOG_DEBUG,
-           ("nsDirectoryIndexStream[%p]: destroyed", this));
-}
-
-nsresult
-nsDirectoryIndexStream::Create(nsIFile* aDir, nsIInputStream** aResult)
-{
-    nsDirectoryIndexStream* result = new nsDirectoryIndexStream();
-    if (! result)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    nsresult rv;
-    rv = result->Init(aDir);
-    if (NS_FAILED(rv)) {
-        delete result;
-        return rv;
-    }
-
-    *aResult = result;
-    NS_ADDREF(*aResult);
-    return NS_OK;
-}
-
-NS_IMPL_ISUPPORTS2(nsDirectoryIndexStream,
-                   nsIInputStream,
-                   nsIBaseStream)
-
-NS_IMETHODIMP
-nsDirectoryIndexStream::Close()
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDirectoryIndexStream::Available(PRUint32* aLength)
-{
-    // Lie, and tell the caller that the stream is endless (until we
-    // actually don't have anything left).
-    PRBool more;
-    nsresult rv = mIter->HasMoreElements(&more);
-    if (NS_FAILED(rv)) return rv; 
-    if (more) {
-        *aLength = PRUint32(-1);
-        return NS_OK;
-    }
-    else {
-        *aLength = 0;
-        return NS_OK;
-    }
-}
-
-NS_IMETHODIMP
-nsDirectoryIndexStream::Read(char* aBuf, PRUint32 aCount, PRUint32* aReadCount)
-{
-    PRUint32 nread = 0;
-
-    // If anything is enqueued (or left-over) in mBuf, then feed it to
-    // the reader first.
-    while (mOffset < mBuf.Length() && aCount != 0) {
-        *(aBuf++) = char(mBuf.CharAt(mOffset++));
-        --aCount;
-        ++nread;
-    }
-
-    // Room left?
-    if (aCount > 0) {
-        mOffset = 0;
-        mBuf.Truncate();
-
-        // Okay, now we'll suck stuff off of our iterator into the mBuf...
-        while (PRUint32(mBuf.Length()) < aCount) {
-            PRBool more;
-            nsresult rv = mIter->HasMoreElements(&more);
-            if (NS_FAILED(rv)) return rv; 
-            if (!more) break;
-            
-            nsCOMPtr<nsISupports> cur;
-            rv = mIter->GetNext(getter_AddRefs(cur));
-            nsCOMPtr<nsIFile> current = do_QueryInterface(cur, &rv);
-            if (NS_FAILED(rv)) return rv; 
-
-#ifdef PR_LOGGING
-            if (PR_LOG_TEST(gLog, PR_LOG_DEBUG)) {
-                nsXPIDLCString path;
-                current->GetPath(getter_Copies(path));
-                PR_LOG(gLog, PR_LOG_DEBUG,
-                       ("nsDirectoryIndexStream[%p]: iterated %s",
-                        this, (const char*) path));
-            }
-#endif
-
-        // rjc: don't return hidden files/directories!
-        PRBool hidden;
-        rv = current->IsHidden(&hidden);
-        if (NS_FAILED(rv)) return rv; 
-        if (hidden) {
-            PR_LOG(gLog, PR_LOG_DEBUG,
-                   ("nsDirectoryIndexStream[%p]: skipping hidden file/directory",
-                    this));
-            continue;
-        }
-				
-				 PRInt64 fileSize;
-				 PRInt64 fileInfoModifyTime;
-				 rv = current->GetFileSize( &fileSize );
-				 if (NS_FAILED(rv)) return rv; 
-				 
-				 PROffset32 fileInfoSize;
-				 LL_L2I( fileInfoSize,fileSize );
-				 
-				 rv = current->GetLastModificationDate( &fileInfoModifyTime );	
-				 if (NS_FAILED(rv)) return rv; 
-            mBuf += "201: ";
-
-            // The "filename" field
-            {
-                char* leafname;
-                rv = current->GetLeafName(&leafname);
-                if (NS_FAILED(rv)) return rv; 
-                if (leafname) {
-                    char* escaped = nsEscape(leafname, url_Path);
-                    if (escaped) {
-                        mBuf += escaped;
-                        mBuf.Append(' ');
-                        nsCRT::free(escaped);
-                    }
-                    nsCRT::free(leafname);
-                }
-            }
-
-            // The "content-length" field
-            mBuf.Append(fileInfoSize, 10);
-            mBuf.Append(' ');
-
-            // The "last-modified" field
-            PRExplodedTime tm;
-            PR_ExplodeTime(fileInfoModifyTime, PR_GMTParameters, &tm);
-            {
-                char buf[64];
-                PR_FormatTimeUSEnglish(buf, sizeof(buf), "%a,%%20%d%%20%b%%20%Y%%20%H:%M:%S%%20GMT ", &tm);
-                mBuf.Append(buf);
-            }
-
-            // The "file-type" field
-            PRBool isFile;
-            rv = current->IsFile(&isFile);
-            if (NS_FAILED(rv)) return rv; 
-            if (isFile) {
-                mBuf += "FILE ";
-            }
-            else {
-                PRBool isDir;
-                rv = current->IsDirectory(&isDir);
-                if (NS_FAILED(rv)) return rv; 
-                if (isDir) {
-                    mBuf += "DIRECTORY ";
-                }
-                else {
-                    PRBool isLink;
-                    rv = current->IsSymlink(&isLink);
-                    if (NS_FAILED(rv)) return rv; 
-                    if (isLink) {
-                        mBuf += "SYMBOLIC-LINK ";
-                    }
-                }
-            }
-
-            mBuf.Append('\n');
-        }
-
-        // ...and once we've either run out of directory entries, or
-        // filled up the buffer, then we'll push it to the reader.
-        while (mOffset < mBuf.Length() && aCount != 0) {
-            *(aBuf++) = char(mBuf.CharAt(mOffset++));
-            --aCount;
-            ++nread;
-        }
-    }
-
-    *aReadCount = nread;
-    return NS_OK;
-}

mozilla/netwerk/base/src/nsDirectoryIndexStream.h

@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsDirectoryIndexStream_h__
-#define nsDirectoryIndexStream_h__
-
-#include "nsIFile.h"
-#include "nsString.h"
-#include "nsIInputStream.h"
-#include "nsCOMPtr.h"
-
-class nsDirectoryIndexStream : public nsIInputStream
-{
-protected:
-    nsCAutoString mBuf;
-    PRInt32 mOffset;
-
-    nsCOMPtr<nsIFile> mDir;
-    nsCOMPtr<nsISimpleEnumerator> mIter;
-
-    nsDirectoryIndexStream();
-    nsresult Init(nsIFile* aDir);
-    virtual ~nsDirectoryIndexStream();
-
-public:
-    static nsresult
-    Create(nsIFile* aDir, nsIInputStream** aStreamResult);
-
-    // nsISupportsInterface
-    NS_DECL_ISUPPORTS
-
-    // nsIBaseStream interface
-    NS_DECL_NSIBASESTREAM
-
-    // nsIInputStream interface
-    NS_DECL_NSIINPUTSTREAM
-};
-
-#endif // nsDirectoryIndexStream_h__
-

mozilla/netwerk/base/src/nsFileStreams.cpp

@@ -1,209 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsFileStreams.h"
-#include "nsILocalFile.h"
-#include "prerror.h"
-
-////////////////////////////////////////////////////////////////////////////////
-// nsFileStream
-
-nsFileStream::nsFileStream()
-    : mFD(nsnull)
-{
-    NS_INIT_REFCNT();
-}
-
-nsFileStream::~nsFileStream()
-{
-    Close();
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsFileStream, 
-                              nsIBaseStream,
-                              nsISeekableStream);
-
-NS_IMETHODIMP
-nsFileStream::Close()
-{
-    if (mFD) {
-        PR_Close(mFD);
-        mFD = nsnull;
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFileStream::Seek(PRInt32 whence, PRInt32 offset)
-{
-    if (mFD == nsnull)
-        return NS_BASE_STREAM_CLOSED;
-
-    PRInt32 cnt = PR_Seek(mFD, offset, (PRSeekWhence)whence);
-    if (cnt == -1) {
-        return NS_ErrorAccordingToNSPR();
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFileStream::Tell(PRUint32 *result)
-{
-    if (mFD == nsnull)
-        return NS_BASE_STREAM_CLOSED;
-
-    PRInt32 cnt = PR_Seek(mFD, 0, PR_SEEK_CUR);
-    if (cnt == -1) {
-        return NS_ErrorAccordingToNSPR();
-    }
-    *result = cnt;
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsFileInputStream
-
-NS_IMPL_ISUPPORTS_INHERITED2(nsFileInputStream, 
-                             nsFileStream,
-                             nsIInputStream,
-                             nsIFileInputStream);
-
-NS_METHOD
-nsFileInputStream::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    NS_ENSURE_NO_AGGREGATION(aOuter);
-
-    nsFileInputStream* stream = new nsFileInputStream();
-    if (stream == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(stream);
-    nsresult rv = stream->QueryInterface(aIID, aResult);
-    NS_RELEASE(stream);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsFileInputStream::Init(nsILocalFile* file)
-{
-    NS_ASSERTION(mFD == nsnull, "already inited");
-    return file->OpenNSPRFileDesc(PR_RDONLY, 0, &mFD);
-}
-
-NS_IMETHODIMP
-nsFileInputStream::Close()
-{
-    return nsFileStream::Close();
-}
-
-NS_IMETHODIMP
-nsFileInputStream::Available(PRUint32 *result)
-{
-    if (mFD == nsnull)
-        return NS_BASE_STREAM_CLOSED;
-
-    PRInt32 avail = PR_Available(mFD);
-    if (avail == -1) {
-        return NS_ErrorAccordingToNSPR();
-    }
-    *result = avail;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFileInputStream::Read(char * buf, PRUint32 count, PRUint32 *result)
-{
-    if (mFD == nsnull)
-        return NS_BASE_STREAM_CLOSED;
-
-    PRInt32 cnt = PR_Read(mFD, buf, count);
-    if (cnt == -1) {
-        return NS_ErrorAccordingToNSPR();
-    }
-    *result = cnt;
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsFileOutputStream
-
-NS_IMPL_ISUPPORTS_INHERITED2(nsFileOutputStream, 
-                             nsFileStream,
-                             nsIOutputStream,
-                             nsIFileOutputStream);
- 
-NS_METHOD
-nsFileOutputStream::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    NS_ENSURE_NO_AGGREGATION(aOuter);
-
-    nsFileOutputStream* stream = new nsFileOutputStream();
-    if (stream == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(stream);
-    nsresult rv = stream->QueryInterface(aIID, aResult);
-    NS_RELEASE(stream);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsFileOutputStream::Init(nsILocalFile* file, PRInt32 flags, PRInt32 mode)
-{
-    NS_ASSERTION(mFD == nsnull, "already inited");
-    if (mFD != nsnull)
-        return NS_ERROR_FAILURE;
-    return file->OpenNSPRFileDesc(flags, mode, &mFD);
-}
-
-NS_IMETHODIMP
-nsFileOutputStream::Close()
-{
-    return nsFileStream::Close();
-}
-
-NS_IMETHODIMP
-nsFileOutputStream::Write(const char *buf, PRUint32 count, PRUint32 *result)
-{
-    if (mFD == nsnull)
-        return NS_BASE_STREAM_CLOSED;
-
-    PRInt32 cnt = PR_Write(mFD, buf, count);
-    if (cnt == -1) {
-        return NS_ErrorAccordingToNSPR();
-    }
-    *result = cnt;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFileOutputStream::Flush(void)
-{
-    if (mFD == nsnull)
-        return NS_BASE_STREAM_CLOSED;
-
-    PRInt32 cnt = PR_Sync(mFD);
-    if (cnt == -1) {
-        return NS_ErrorAccordingToNSPR();
-    }
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/netwerk/base/src/nsFileStreams.h

@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsFileStreams_h__
-#define nsFileStreams_h__
-
-#include "nsIFileStreams.h"
-#include "nsIFile.h"
-#include "nsIInputStream.h"
-#include "nsIOutputStream.h"
-#include "nsCOMPtr.h"
-
-////////////////////////////////////////////////////////////////////////////////
-
-class nsFileStream : public nsIBaseStream, 
-                     public nsISeekableStream
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIBASESTREAM
-    NS_DECL_NSISEEKABLESTREAM
-
-    nsFileStream();
-    virtual ~nsFileStream();
-
-protected:
-    PRFileDesc*         mFD;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class nsFileInputStream : public nsFileStream,
-                          public nsIFileInputStream
-{
-public:
-    NS_DECL_ISUPPORTS_INHERITED
-    NS_DECL_NSIBASESTREAM
-    NS_DECL_NSIINPUTSTREAM
-    NS_DECL_NSIFILEINPUTSTREAM
-
-    nsFileInputStream() : nsFileStream() {}
-    virtual ~nsFileInputStream() {}
-
-    static NS_METHOD
-    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class nsFileOutputStream : public nsFileStream,
-                           public nsIFileOutputStream
-{
-public:
-    NS_DECL_ISUPPORTS_INHERITED
-    NS_DECL_NSIBASESTREAM
-    NS_DECL_NSIOUTPUTSTREAM
-    NS_DECL_NSIFILEOUTPUTSTREAM
-
-    nsFileOutputStream() : nsFileStream() {}
-    virtual ~nsFileOutputStream() {}
-
-    static NS_METHOD
-    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-#endif // nsFileStreams_h__

mozilla/netwerk/base/src/nsFileTransport.h

@@ -1,145 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsFileTransport_h__
-#define nsFileTransport_h__
-
-#include "nsIChannel.h"
-#include "nsIRunnable.h"
-#include "nsFileSpec.h"
-#include "prlock.h"
-#include "nsIEventQueueService.h"
-#include "nsIPipe.h"
-#include "nsILoadGroup.h"
-#include "nsCOMPtr.h"
-#include "nsIStreamListener.h"
-#include "nsIProgressEventSink.h"
-#include "nsIBufferInputStream.h"
-#include "nsIBufferOutputStream.h"
-#include "nsIFileSystem.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIFile.h"
-#include "prlog.h"
-
-class nsIInterfaceRequestor;
-
-class nsFileTransport : public nsIChannel, 
-                        public nsIRunnable,
-                        public nsIPipeObserver
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIREQUEST
-    NS_DECL_NSICHANNEL
-    NS_DECL_NSIPIPEOBSERVER
-    NS_DECL_NSIRUNNABLE
-
-    nsFileTransport();
-    // Always make the destructor virtual: 
-    virtual ~nsFileTransport();
-
-    // Define a Create method to be used with a factory:
-    static NS_METHOD
-    Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult);
-    
-    nsresult Init(nsIFile* file,
-                  PRInt32 mode,
-                  const char* command,
-                  PRUint32 bufferSegmentSize,
-                  PRUint32 bufferMaxSize);
-    nsresult Init(nsIInputStream* fromStream, 
-                  const char* contentType,
-                  PRInt32 contentLength,
-                  const char* command,
-                  PRUint32 bufferSegmentSize,
-                  PRUint32 bufferMaxSize);
-    nsresult Init(nsIFileSystem* fsObj,
-                  const char* command,
-                  PRUint32 bufferSegmentSize,
-                  PRUint32 bufferMaxSize);
-
-    void Process(void);
-    void DoClose(void);
-
-    enum State {
-        CLOSED,
-        OPENING,
-        OPENED,
-        START_READ,
-        READING,
-        END_READ,
-        START_WRITE,
-        WRITING,
-        END_WRITE,
-        CLOSING
-    };
-
-    enum Command {
-        NONE,
-        INITIATE_READ,
-        INITIATE_WRITE
-    };
-
-protected:
-    nsCOMPtr<nsIFile>                   mFile;
-    nsCOMPtr<nsIInterfaceRequestor>     mCallbacks;
-    nsCOMPtr<nsIProgressEventSink>      mProgress;
-    nsCOMPtr<nsIFileSystem>             mFileObject;
-    char*                               mContentType;
-    PRUint32                            mBufferSegmentSize;
-    PRUint32                            mBufferMaxSize;
-
-    nsCOMPtr<nsIStreamObserver>         mOpenObserver;
-    nsCOMPtr<nsISupports>               mOpenContext;
-
-    nsCOMPtr<nsISupports>               mContext;
-    State                               mState;
-    Command                             mCommand;
-    PRBool                              mSuspended;
-    PRMonitor*                          mMonitor;
-
-    // state variables:
-    nsresult                            mStatus;
-    PRUint32                            mOffset;
-    PRInt32                             mTotalAmount;
-    PRInt32                             mTransferAmount;
-
-    // reading state varialbles:
-    nsCOMPtr<nsIStreamListener>         mListener;
-    nsCOMPtr<nsIInputStream>            mSource;
-    nsCOMPtr<nsIBufferInputStream>      mBufferInputStream;
-    nsCOMPtr<nsIBufferOutputStream>     mBufferOutputStream;
-
-    // writing state variables:
-    nsCOMPtr<nsIStreamObserver>         mObserver;
-    nsCOMPtr<nsIOutputStream>           mSink;
-    char*                               mBuffer;
-
-#ifdef PR_LOGGING
-    char*                               mSpec;
-#endif
-};
-
-#define NS_FILE_TRANSPORT_DEFAULT_SEGMENT_SIZE   (2*1024)
-#define NS_FILE_TRANSPORT_DEFAULT_BUFFER_SIZE    (8*1024)
-
-#endif // nsFileTransport_h__

mozilla/netwerk/base/src/nsFileTransportService.cpp

@@ -1,200 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsFileTransport.h"
-#include "nsFileTransportService.h"
-#include "nsIURL.h"
-#include "nsCRT.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsIProgressEventSink.h"
-#include "nsIThreadPool.h"
-#include "nsISupportsArray.h"
-#include "nsFileSpec.h"
-#include "nsAutoLock.h"
-
-static NS_DEFINE_CID(kStandardURLCID,            NS_STANDARDURL_CID);
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsFileTransportService::nsFileTransportService()
-{
-    NS_INIT_REFCNT();
-}
-
-#define NS_FILE_TRANSPORT_WORKER_STACK_SIZE     (64 * 1024) /* (8*1024) */
-
-nsresult
-nsFileTransportService::Init()
-{
-    nsresult rv;
-    rv = NS_NewThreadPool(getter_AddRefs(mPool), 
-                          NS_FILE_TRANSPORT_WORKER_COUNT_MIN,
-                          NS_FILE_TRANSPORT_WORKER_COUNT_MAX,
-                          NS_FILE_TRANSPORT_WORKER_STACK_SIZE);
-    return rv;
-}
-
-nsFileTransportService::~nsFileTransportService()
-{
-    mPool->Shutdown();
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsFileTransportService, nsFileTransportService);
-
-NS_IMETHODIMP
-nsFileTransportService::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    if (aOuter)
-        return NS_ERROR_NO_AGGREGATION;
-
-    nsFileTransportService* ph = new nsFileTransportService();
-    if (ph == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(ph);
-    nsresult rv = ph->Init();
-    if (NS_SUCCEEDED(rv)) {
-        rv = ph->QueryInterface(aIID, aResult);
-    }
-    NS_RELEASE(ph);
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-NS_IMETHODIMP
-nsFileTransportService::CreateTransport(nsIFile* file,
-                                        PRInt32 mode,
-                                        const char* command,
-                                        PRUint32 bufferSegmentSize,
-                                        PRUint32 bufferMaxSize,
-                                        nsIChannel** result)
-{
-    nsresult rv;
-    nsFileTransport* trans = new nsFileTransport();
-    if (trans == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(trans);
-    rv = trans->Init(file, mode, command, bufferSegmentSize, bufferMaxSize);
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(trans);
-        return rv;
-    }
-    *result = trans;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFileTransportService::CreateTransportFromStream(nsIInputStream *fromStream,
-                                                  const char* contentType,
-                                                  PRInt32 contentLength,
-                                                  const char *command,
-                                                  PRUint32 bufferSegmentSize,
-                                                  PRUint32 bufferMaxSize,
-                                                  nsIChannel** result)
-{
-    nsresult rv;
-    nsFileTransport* trans = new nsFileTransport();
-    if (trans == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(trans);
-    rv = trans->Init(fromStream, contentType, contentLength, command, 
-                     bufferSegmentSize, bufferMaxSize);
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(trans);
-        return rv;
-    }
-    *result = trans;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFileTransportService::CreateTransportFromFileSystem(nsIFileSystem *fsObj,
-                                                      const char *command,
-                                                      PRUint32 bufferSegmentSize,
-                                                      PRUint32 bufferMaxSize,
-                                                      nsIChannel **result)
-{
-    nsresult rv;
-    nsFileTransport* trans = new nsFileTransport();
-    if (trans == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(trans);
-    rv = trans->Init(fsObj, command, bufferSegmentSize, bufferMaxSize);
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(trans);
-        return rv;
-    }
-    *result = trans;
-    return NS_OK;
-}
-
-nsresult
-nsFileTransportService::ProcessPendingRequests(void)
-{
-    return mPool->ProcessPendingRequests();
-}
-
-nsresult
-nsFileTransportService::Shutdown(void)
-{
-    return mPool->Shutdown();
-}
-
-nsresult
-nsFileTransportService::DispatchRequest(nsIRunnable* runnable)
-{
-    return mPool->DispatchRequest(runnable);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsresult
-nsFileTransportService::Suspend(nsIRunnable* request)
-{
-    nsresult rv;
-    nsAutoCMonitor mon(this);   // protect mSuspended
-    if (mSuspended == nsnull) {
-        rv = NS_NewISupportsArray(getter_AddRefs(mSuspended));
-        if (NS_FAILED(rv)) return rv;
-    }
-    return mSuspended->AppendElement(request) ? NS_OK : NS_ERROR_FAILURE;  // XXX this method incorrectly returns a bool
-}
-
-nsresult
-nsFileTransportService::Resume(nsIRunnable* request)
-{
-    nsresult rv;
-    nsAutoCMonitor mon(this);   // protect mSuspended
-    if (mSuspended == nsnull)
-        return NS_ERROR_FAILURE;
-    // XXX RemoveElement returns a bool instead of nsresult!
-    PRBool removed = mSuspended->RemoveElement(request);
-    rv = removed ? NS_OK : NS_ERROR_FAILURE;
-    if (NS_FAILED(rv)) return rv;
-
-    // restart the request
-    rv = mPool->DispatchRequest(request);
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/netwerk/base/src/nsFileTransportService.h

@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsFileTransportService_h___
-#define nsFileTransportService_h___
-
-#include "nsIFileTransportService.h"
-#include "nsIThreadPool.h"
-#include "nsISupportsArray.h"
-
-#define NS_FILE_TRANSPORT_WORKER_COUNT_MIN  1
-#define NS_FILE_TRANSPORT_WORKER_COUNT_MAX  16
-
-class nsFileTransportService : public nsIFileTransportService
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIFILETRANSPORTSERVICE
-
-    // nsFileTransportService methods:
-    nsFileTransportService();
-    virtual ~nsFileTransportService();
-
-    static NS_METHOD
-    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-    nsresult Init();
-
-protected:
-    nsCOMPtr<nsIThreadPool>     mPool;
-    nsCOMPtr<nsISupportsArray>  mOpened;
-    nsCOMPtr<nsISupportsArray>  mSuspended;
-};
-
-#endif /* nsFileTransportService_h___ */

mozilla/netwerk/base/src/nsIOService.cpp

@@ -1,385 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIOService.h"
-#include "nsIProtocolHandler.h"
-#include "nscore.h"
-#include "nsString2.h"
-#include "nsIServiceManager.h"
-#include "nsIEventQueueService.h"
-#include "nsIFileTransportService.h"
-#include "nsIURI.h"
-#include "nsIStreamListener.h"
-#include "prprf.h"
-#include "nsLoadGroup.h"
-#include "nsInputStreamChannel.h"
-#include "nsXPIDLString.h" 
-
-static NS_DEFINE_CID(kFileTransportService, NS_FILETRANSPORTSERVICE_CID);
-static NS_DEFINE_CID(kEventQueueService, NS_EVENTQUEUESERVICE_CID);
-static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
-static NS_DEFINE_CID(kDNSServiceCID, NS_DNSSERVICE_CID);
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsIOService::nsIOService()
-    : mOffline(PR_FALSE)
-{
-    NS_INIT_REFCNT();
-}
-
-nsresult
-nsIOService::Init()
-{
-    nsresult rv = NS_OK;
-    // We need to get references to these services so that we can shut them
-    // down later. If we wait until the nsIOService is being shut down,
-    // GetService will fail at that point.
-    rv = nsServiceManager::GetService(kSocketTransportServiceCID,
-                                      NS_GET_IID(nsISocketTransportService),
-                                      getter_AddRefs(mSocketTransportService));
-
-    if (NS_FAILED(rv)) return rv;
-    rv = nsServiceManager::GetService(kFileTransportService,
-                                      NS_GET_IID(nsIFileTransportService),
-                                      getter_AddRefs(mFileTransportService));
-    if (NS_FAILED(rv)) return rv;
-    rv = nsServiceManager::GetService(kDNSServiceCID,
-                                      NS_GET_IID(nsIDNSService),
-                                      getter_AddRefs(mDNSService));
-    return rv;
-}
-
-nsIOService::~nsIOService()
-{
-    (void)SetOffline(PR_TRUE);
-}
-
-NS_METHOD
-nsIOService::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    nsresult rv;
-    if (aOuter)
-        return NS_ERROR_NO_AGGREGATION;
-
-    nsIOService* _ios = new nsIOService();
-    if (_ios == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(_ios);
-    rv = _ios->Init();
-    if (NS_FAILED(rv)) {
-        delete _ios;
-        return rv;
-    }
-    rv = _ios->QueryInterface(aIID, aResult);
-    NS_RELEASE(_ios);
-    return rv;
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsIOService, nsIIOService);
-
-////////////////////////////////////////////////////////////////////////////////
-
-#define MAX_SCHEME_LENGTH       64      // XXX big enough?
-
-#define MAX_NET_PROGID_LENGTH   (MAX_SCHEME_LENGTH + NS_NETWORK_PROTOCOL_PROGID_PREFIX_LENGTH + 1)
-
-NS_IMETHODIMP
-nsIOService::GetProtocolHandler(const char* scheme, nsIProtocolHandler* *result)
-{
-    nsresult rv;
-
-    NS_ASSERTION(NS_NETWORK_PROTOCOL_PROGID_PREFIX_LENGTH
-                 == nsCRT::strlen(NS_NETWORK_PROTOCOL_PROGID_PREFIX),
-                 "need to fix NS_NETWORK_PROTOCOL_PROGID_PREFIX_LENGTH");
-
-    // XXX we may want to speed this up by introducing our own protocol 
-    // scheme -> protocol handler mapping, avoiding the string manipulation
-    // and service manager stuff
-
-    char buf[MAX_NET_PROGID_LENGTH];
-    nsCAutoString progID(NS_NETWORK_PROTOCOL_PROGID_PREFIX);
-    progID += scheme;
-    progID.ToLowerCase();
-    progID.ToCString(buf, MAX_NET_PROGID_LENGTH);
-
-    rv = nsServiceManager::GetService(buf, NS_GET_IID(nsIProtocolHandler), (nsISupports **)result);
-    if (NS_FAILED(rv)) 
-        return NS_ERROR_UNKNOWN_PROTOCOL;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsIOService::ExtractScheme(const char* inURI, PRUint32 *startPos, PRUint32 *endPos,
-                           char* *scheme)
-{
-    // search for something up to a colon, and call it the scheme
-    NS_ASSERTION(inURI, "null pointer");
-    if (!inURI) return NS_ERROR_NULL_POINTER;
-
-    const char* uri = inURI;
-
-    // skip leading white space
-    while (nsString::IsSpace(*uri))
-        uri++;
-
-    PRUint32 start = uri - inURI;
-    if (startPos) {
-        *startPos = start;
-    }
-
-    PRUint32 length = 0;
-    char c;
-    while ((c = *uri++) != '\0') {
-        if (c == ':') {
-            if (endPos) {
-                *endPos = start + length + 1;
-            }
-
-            if (scheme) {
-                char* str = (char*)nsAllocator::Alloc(length + 1);
-                if (str == nsnull)
-                    return NS_ERROR_OUT_OF_MEMORY;
-                nsCRT::memcpy(str, &inURI[start], length);
-                str[length] = '\0';
-                *scheme = str;
-            }
-            return NS_OK;
-        }
-        else if (nsString::IsAlpha(c)) {
-            length++;
-        }
-        else 
-            break;
-    }
-    return NS_ERROR_MALFORMED_URI;
-}
-
-nsresult
-nsIOService::NewURI(const char* aSpec, nsIURI* aBaseURI,
-                    nsIURI* *result, nsIProtocolHandler* *hdlrResult)
-{
-    nsresult rv;
-    nsIURI* base;
-    char* scheme;
-    rv = ExtractScheme(aSpec, nsnull, nsnull, &scheme);
-    if (NS_SUCCEEDED(rv)) {
-        // then aSpec is absolute
-        // ignore aBaseURI in this case
-        base = nsnull;
-    }
-    else {
-        // then aSpec is relative
-        if (aBaseURI == nsnull)
-            return NS_ERROR_MALFORMED_URI;
-        rv = aBaseURI->GetScheme(&scheme);
-        if (NS_FAILED(rv)) return rv;
-        base = aBaseURI;
-    }
-    
-    nsCOMPtr<nsIProtocolHandler> handler;
-    rv = GetProtocolHandler(scheme, getter_AddRefs(handler));
-    nsCRT::free(scheme);
-    if (NS_FAILED(rv)) return rv;
-
-    if (hdlrResult) {
-        *hdlrResult = handler;
-        NS_ADDREF(*hdlrResult);
-    }
-    return handler->NewURI(aSpec, base, result);
-}
-
-NS_IMETHODIMP
-nsIOService::NewURI(const char* aSpec, nsIURI* aBaseURI,
-                    nsIURI* *result)
-{
-    return NewURI(aSpec, aBaseURI, result, nsnull);
-}
-
-NS_IMETHODIMP
-nsIOService::NewChannelFromURI(const char* verb, nsIURI *aURI,
-                               nsILoadGroup *aGroup,
-                               nsIInterfaceRequestor* notificationCallbacks,
-                               nsLoadFlags loadAttributes,
-                               nsIURI* originalURI,
-                               PRUint32 bufferSegmentSize,
-                               PRUint32 bufferMaxSize,
-                               nsIChannel **result)
-{
-    nsresult rv;
-
-    nsXPIDLCString scheme;
-    rv = aURI->GetScheme(getter_Copies(scheme));
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIProtocolHandler> handler;
-    rv = GetProtocolHandler((const char*)scheme, getter_AddRefs(handler));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = handler->NewChannel(verb, aURI, aGroup, notificationCallbacks,
-                             loadAttributes, originalURI, 
-                             bufferSegmentSize, bufferMaxSize, result);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsIOService::NewChannel(const char* verb, const char *aSpec,
-                        nsIURI *aBaseURI,
-                        nsILoadGroup *aGroup,
-                        nsIInterfaceRequestor* notificationCallbacks,
-                        nsLoadFlags loadAttributes,
-                        nsIURI* originalURI,
-                        PRUint32 bufferSegmentSize,
-                        PRUint32 bufferMaxSize,
-                        nsIChannel **result)
-{
-    nsresult rv;
-    nsCOMPtr<nsIURI> uri;
-    nsCOMPtr<nsIProtocolHandler> handler;
-    rv = NewURI(aSpec, aBaseURI, getter_AddRefs(uri), getter_AddRefs(handler));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = handler->NewChannel(verb, uri, aGroup, notificationCallbacks,
-                             loadAttributes, originalURI, 
-                             bufferSegmentSize, bufferMaxSize, result);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsIOService::GetOffline(PRBool *offline)
-{
-    *offline = mOffline;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsIOService::SetOffline(PRBool offline)
-{
-    mOffline = offline;
-    if (offline) {
-        // be sure to try and shutdown both (even if the first fails)
-        nsresult rv1 = NS_OK;
-        nsresult rv2 = NS_OK;
-        if (mSocketTransportService)
-            rv1 = mSocketTransportService->Shutdown();
-        if (mDNSService)
-            rv2 = mDNSService->Shutdown();
-        if (NS_FAILED(rv1)) return rv1;
-        if (NS_FAILED(rv2)) return rv2;
-    }
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// URL parsing utilities
-
-NS_IMETHODIMP
-nsIOService::Escape(const char *str, PRInt16 mask, char** result)
-{
-    nsCAutoString esc_str;
-    nsresult rv = nsURLEscape((char*)str,mask,esc_str);
-    CRTFREEIF(*result);
-    if (NS_FAILED(rv))
-        return rv;
-    *result = esc_str.ToNewCString();
-    if (!*result)
-        return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsIOService::Unescape(const char *str, char **result)
-{
-    return nsURLUnescape((char*)str,result);
-}
-
-NS_IMETHODIMP
-nsIOService::ExtractPort(const char *str, PRInt32 *result)
-{
-    PRInt32 returnValue = -1;
-    *result = (0 < PR_sscanf(str, "%d", &returnValue)) ? returnValue : -1;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsIOService::ResolveRelativePath(const char *relativePath, const char* basePath,
-                                 char **result)
-{
-    nsCAutoString name;
-    nsCAutoString path(basePath);
-
-    PRUnichar last = path.Last();
-    PRBool needsDelim = !(last == '/' || last == '\\' || last == '\0');
-
-    PRBool end = PR_FALSE;
-    char c;
-    while (!end) {
-        c = *relativePath++;
-        switch (c) {
-          case '\0':
-          case '#':
-          case ';':
-          case '?':
-            end = PR_TRUE;
-            // fall through...
-          case '/':
-          case '\\':
-            // delimiter found
-            if (name.Equals("..")) {
-                // pop path
-                PRInt32 pos = path.RFind("/");
-                if (pos > 0) {
-                    path.Truncate(pos + 1);
-                    path += name;
-                }
-                else {
-                    return NS_ERROR_MALFORMED_URI;
-                }
-            }
-            else if (name.Equals(".") || name.Equals("")) {
-                // do nothing
-            }
-            else {
-                // append name to path
-                if (needsDelim)
-                    path += "/";
-                path += name;
-                needsDelim = PR_TRUE;
-            }
-            name = "";
-            break;
-
-          default:
-            // append char to name
-            name += c;
-        }
-    }
-    // append anything left on relativePath (e.g. #..., ;..., ?...)
-    if (c != '\0')
-        path += --relativePath;
-
-    *result = path.ToNewCString();
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/netwerk/base/src/nsIOService.h

@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsIOService_h__
-#define nsIOService_h__
-
-#include "nsIIOService.h"
-#include "nsString2.h"
-#include "nsISocketTransportService.h" 
-#include "nsIFileTransportService.h" 
-#include "nsIDNSService.h" 
-#include "nsCOMPtr.h"
-#include "nsURLHelper.h"
-
-class nsIOService : public nsIIOService
-{
-public:
-    NS_DECL_ISUPPORTS
-
-    // nsIIOService methods:
-    NS_DECL_NSIIOSERVICE
-
-    // nsIOService methods:
-    nsIOService();
-    virtual ~nsIOService();
-
-    static NS_METHOD
-    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-    nsresult Init();
-    nsresult NewURI(const char* aSpec, nsIURI* aBaseURI,
-                    nsIURI* *result, nsIProtocolHandler* *hdlrResult);
-
-protected:
-    PRBool      mOffline;
-    nsCOMPtr<nsISocketTransportService> mSocketTransportService;
-    nsCOMPtr<nsIFileTransportService>   mFileTransportService;
-    nsCOMPtr<nsIDNSService>             mDNSService;
-};
-
-#endif // nsIOService_h__

mozilla/netwerk/base/src/nsInputStreamChannel.cpp

@@ -1,381 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsInputStreamChannel.h"
-#include "nsCOMPtr.h"
-#include "nsIIOService.h"
-#include "nsIServiceManager.h"
-#include "nsIMIMEService.h"
-#include "nsIFileTransportService.h"
-#include "netCore.h"
-
-static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
-static NS_DEFINE_CID(kMIMEServiceCID, NS_MIMESERVICE_CID);
-static NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID);
-
-////////////////////////////////////////////////////////////////////////////////
-// nsInputStreamChannel methods:
-
-nsInputStreamChannel::nsInputStreamChannel()
-    : mContentType(nsnull), mContentLength(-1), mLoadAttributes(LOAD_NORMAL)
-{
-    NS_INIT_REFCNT(); 
-}
-
-nsInputStreamChannel::~nsInputStreamChannel()
-{
-    if (mContentType) nsCRT::free(mContentType);
-}
-
-NS_METHOD
-nsInputStreamChannel::Create(nsISupports *aOuter, REFNSIID aIID,
-                             void **aResult)
-{
-    nsInputStreamChannel* channel = new nsInputStreamChannel();
-    if (channel == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(channel);
-    nsresult rv = channel->QueryInterface(aIID, aResult);
-    NS_RELEASE(channel);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::Init(nsIURI* uri, 
-                           const char* contentType,
-                           PRInt32 contentLength, 
-                           nsIInputStream* in,
-                           nsILoadGroup *aGroup,
-                           nsIInterfaceRequestor* notificationCallbacks,
-                           nsLoadFlags loadAttributes,
-                           nsIURI* originalURI,
-                           PRUint32 bufferSegmentSize,
-                           PRUint32 bufferMaxSize)
-{
-    nsresult rv;
-    mOriginalURI = originalURI ? originalURI : uri;
-    mURI = uri;
-    mContentLength = contentLength;
-    mBufferSegmentSize = bufferSegmentSize;
-    mBufferMaxSize = bufferMaxSize;
-
-    rv = SetLoadAttributes(loadAttributes);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = SetLoadGroup(aGroup);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = SetNotificationCallbacks(notificationCallbacks);
-    if (NS_FAILED(rv)) return rv;
-
-    if (contentType) { 
-        mContentType = nsCRT::strdup(contentType);
-        const char *constContentType = mContentType;
-        if (!constContentType) return NS_ERROR_OUT_OF_MEMORY;
-        char* semicolon = PL_strchr(constContentType, ';');
-        CBufDescriptor cbd(constContentType,
-                           PR_TRUE,
-                           semicolon ? (semicolon-constContentType) + 1: PL_strlen(constContentType), // capacity 
-                           semicolon ? (semicolon-constContentType) : PL_strlen(constContentType)); 
-        nsCAutoString(cbd).ToLowerCase(); 
-    } 
-    mInputStream = in;
-    return NS_OK;
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS5(nsInputStreamChannel, 
-                              nsIInputStreamChannel,
-                              nsIChannel,
-                              nsIRequest,
-                              nsIStreamObserver,
-                              nsIStreamListener);
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIRequest methods:
-
-NS_IMETHODIMP
-nsInputStreamChannel::IsPending(PRBool *result)
-{
-    if (mFileTransport)
-        return mFileTransport->IsPending(result);
-    *result = PR_FALSE;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::Cancel(void)
-{
-    if (mFileTransport)
-        return mFileTransport->Cancel();
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::Suspend(void)
-{
-    if (mFileTransport)
-        return mFileTransport->Suspend();
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::Resume(void)
-{
-    if (mFileTransport)
-        return mFileTransport->Resume();
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIChannel methods:
-
-NS_IMETHODIMP
-nsInputStreamChannel::GetOriginalURI(nsIURI * *aURI)
-{
-    *aURI = mOriginalURI;
-    NS_IF_ADDREF(*aURI);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::GetURI(nsIURI * *aURI)
-{
-    *aURI = mURI;
-    NS_IF_ADDREF(*aURI);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::AsyncOpen(nsIStreamObserver *observer, nsISupports* ctxt)
-{
-    if (mFileTransport)
-        return NS_ERROR_IN_PROGRESS;
-
-    nsresult rv;
-    NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = fts->CreateTransportFromStream(mInputStream, mContentType, mContentLength,
-                                        "load", mBufferSegmentSize, mBufferMaxSize,
-                                        getter_AddRefs(mFileTransport));
-    if (NS_FAILED(rv)) return rv;
-
-    return mFileTransport->AsyncOpen(observer, ctxt);
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::OpenInputStream(PRUint32 startPosition, PRInt32 readCount,
-                                      nsIInputStream **result)
-{
-    // if we had seekable streams, we could seek here:
-    NS_ASSERTION(startPosition == 0, "Can't seek in nsInputStreamChannel");
-    *result = mInputStream;
-    NS_ADDREF(*result);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::OpenOutputStream(PRUint32 startPosition, nsIOutputStream **_retval)
-{
-    // we don't do output
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::AsyncRead(PRUint32 startPosition, PRInt32 readCount,
-                                nsISupports *ctxt, nsIStreamListener *listener)
-{
-    nsresult rv;
-
-    mRealListener = listener;
-
-    if (mLoadGroup) {
-        nsCOMPtr<nsILoadGroupListenerFactory> factory;
-        //
-        // Create a load group "proxy" listener...
-        //
-        rv = mLoadGroup->GetGroupListenerFactory(getter_AddRefs(factory));
-        if (factory) {
-            nsIStreamListener *newListener;
-            rv = factory->CreateLoadGroupListener(mRealListener, &newListener);
-            if (NS_SUCCEEDED(rv)) {
-                mRealListener = newListener;
-                NS_RELEASE(newListener);
-            }
-        }
-
-        rv = mLoadGroup->AddChannel(this, nsnull);
-        if (NS_FAILED(rv)) return rv;
-    }
-
-    if (mFileTransport == nsnull) {
-        NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv);
-        if (NS_FAILED(rv)) return rv;
-
-        rv = fts->CreateTransportFromStream(mInputStream, mContentType, mContentLength,
-                                            "load", mBufferSegmentSize, mBufferMaxSize,
-                                            getter_AddRefs(mFileTransport));
-        if (NS_FAILED(rv)) return rv;
-    }
-
-    return mFileTransport->AsyncRead(startPosition, readCount, ctxt, this);
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::AsyncWrite(nsIInputStream *fromStream, PRUint32 startPosition,
-                                 PRInt32 writeCount, nsISupports *ctxt,
-                                 nsIStreamObserver *observer)
-{
-    // we don't do output
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes)
-{
-    *aLoadAttributes = mLoadAttributes;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes)
-{
-    mLoadAttributes = aLoadAttributes;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::GetContentType(char * *aContentType)
-{
-    *aContentType = nsCRT::strdup(mContentType);
-    if (*aContentType == nsnull) {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::SetContentType(const char *aContentType)
-{
-    if (mContentType) {
-        nsCRT::free(mContentType);
-    }
-    mContentType = nsCRT::strdup(aContentType);
-    if (aContentType == nsnull) {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::GetContentLength(PRInt32 *aContentLength)
-{
-    *aContentLength = mContentLength;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
-{
-    *aLoadGroup = mLoadGroup.get();
-    NS_IF_ADDREF(*aLoadGroup);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
-{
-    mLoadGroup = aLoadGroup;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::GetOwner(nsISupports* *aOwner)
-{
-    *aOwner = mOwner.get();
-    NS_IF_ADDREF(*aOwner);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::SetOwner(nsISupports* aOwner)
-{
-    mOwner = aOwner;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
-{
-  *aNotificationCallbacks = mCallbacks.get();
-  NS_IF_ADDREF(*aNotificationCallbacks);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
-{
-  mCallbacks = aNotificationCallbacks;
-  return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIStreamListener methods:
-////////////////////////////////////////////////////////////////////////////////
-
-NS_IMETHODIMP
-nsInputStreamChannel::OnStartRequest(nsIChannel* transportChannel, nsISupports* context)
-{
-    NS_ASSERTION(mRealListener, "No listener...");
-    return mRealListener->OnStartRequest(this, context);
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::OnStopRequest(nsIChannel* transportChannel, nsISupports* context,
-                                    nsresult aStatus, const PRUnichar* aMsg)
-{
-    nsresult rv;
-
-    rv = mRealListener->OnStopRequest(this, context, aStatus, aMsg);
-
-    if (mLoadGroup) {
-        if (NS_SUCCEEDED(rv)) {
-            mLoadGroup->RemoveChannel(this, context, aStatus, aMsg);
-        }
-    }
-
-    // Release the reference to the consumer stream listener...
-    mRealListener = null_nsCOMPtr();
-    mFileTransport = null_nsCOMPtr();
-    return rv;
-}
-
-NS_IMETHODIMP
-nsInputStreamChannel::OnDataAvailable(nsIChannel* transportChannel, nsISupports* context,
-                                      nsIInputStream *aIStream, PRUint32 aSourceOffset,
-                                      PRUint32 aLength)
-{
-    return mRealListener->OnDataAvailable(this, context, aIStream,
-                                          aSourceOffset, aLength);
-}
-
-////////////////////////////////////////////////////////////////////////////////