This commit was manufactured by cvs2svn to create branch

'HttpConnnectionMagic_20010417_BRANCH'.

git-svn-id: svn://10.0.0.236/branches/HttpConnnectionMagic_20010417_BRANCH@94214 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/gfx/src/gtk/nsFontMetricsGTK.h

@@ -1,219 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * ex: set tabstop=8 softtabstop=2 shiftwidth=2 expandtab:
- *
- * 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 nsFontMetricsGTK_h__
-#define nsFontMetricsGTK_h__
-
-#include "nsDeviceContextGTK.h"
-#include "nsIFontMetrics.h"
-#include "nsIFontEnumerator.h"
-#include "nsFont.h"
-#include "nsString.h"
-#include "nsUnitConversion.h"
-#include "nsIDeviceContext.h"
-#include "nsCRT.h"
-#include "nsCOMPtr.h"
-#include "nsRenderingContextGTK.h"
-#include "nsICharRepresentable.h"
-
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-
-#undef FONT_HAS_GLYPH
-#define FONT_HAS_GLYPH(map, char) IS_REPRESENTABLE(map, char)
-
-typedef struct nsFontCharSetInfo nsFontCharSetInfo;
-
-typedef gint (*nsFontCharSetConverter)(nsFontCharSetInfo* aSelf,
-  XFontStruct* aFont, const PRUnichar* aSrcBuf, PRInt32 aSrcLen,
-  char* aDestBuf, PRInt32 aDestLen);
-
-struct nsFontCharSet;
-struct nsFontFamily;
-struct nsFontNode;
-struct nsFontStretch;
-
-class nsFontGTKUserDefined;
-class nsFontMetricsGTK;
-
-class nsFontGTK
-{
-public:
-  nsFontGTK();
-  virtual ~nsFontGTK();
-  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-
-  void LoadFont(void);
-  PRBool IsEmptyFont(GdkFont*);
-
-  inline int SupportsChar(PRUnichar aChar)
-    { return mFont && FONT_HAS_GLYPH(mMap, aChar); };
-
-  virtual GdkFont* GetGDKFont(void);
-  virtual PRBool   GetGDKFontIs10646(void);
-  virtual gint GetWidth(const PRUnichar* aString, PRUint32 aLength) = 0;
-  virtual gint DrawString(nsRenderingContextGTK* aContext,
-                          nsDrawingSurfaceGTK* aSurface, nscoord aX,
-                          nscoord aY, const PRUnichar* aString,
-                          PRUint32 aLength) = 0;
-#ifdef MOZ_MATHML
-  // bounding metrics for a string 
-  // remember returned values are not in app units 
-  // - to emulate GetWidth () above
-  virtual nsresult
-  GetBoundingMetrics(const PRUnichar*   aString,
-                     PRUint32           aLength,
-                     nsBoundingMetrics& aBoundingMetrics) = 0;
-#endif
-
-  PRUint32*              mMap;
-  nsFontCharSetInfo*     mCharSetInfo;
-  char*                  mName;
-  nsFontGTKUserDefined*  mUserDefinedFont;
-  PRUint16               mSize;
-  PRInt16                mBaselineAdjust;
-
-protected:
-  GdkFont*               mFont;
-  PRBool                 mAlreadyCalledLoadFont;
-};
-
-class nsFontMetricsGTK : public nsIFontMetrics
-{
-public:
-  nsFontMetricsGTK();
-  virtual ~nsFontMetricsGTK();
-
-  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-
-  NS_DECL_ISUPPORTS
-
-  NS_IMETHOD  Init(const nsFont& aFont, nsIAtom* aLangGroup,
-                   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  GetNormalLineHeight(nscoord &aHeight);
-  NS_IMETHOD  GetLeading(nscoord &aLeading);
-  NS_IMETHOD  GetEmHeight(nscoord &aHeight);
-  NS_IMETHOD  GetEmAscent(nscoord &aAscent);
-  NS_IMETHOD  GetEmDescent(nscoord &aDescent);
-  NS_IMETHOD  GetMaxHeight(nscoord &aHeight);
-  NS_IMETHOD  GetMaxAscent(nscoord &aAscent);
-  NS_IMETHOD  GetMaxDescent(nscoord &aDescent);
-  NS_IMETHOD  GetMaxAdvance(nscoord &aAdvance);
-  NS_IMETHOD  GetFont(const nsFont *&aFont);
-  NS_IMETHOD  GetLangGroup(nsIAtom** aLangGroup);
-  NS_IMETHOD  GetFontHandle(nsFontHandle &aHandle);
-  
-  virtual nsresult GetSpaceWidth(nscoord &aSpaceWidth);
-
-  nsFontGTK*  FindFont(PRUnichar aChar);
-  nsFontGTK*  FindUserDefinedFont(PRUnichar aChar);
-  nsFontGTK*  FindStyleSheetSpecificFont(PRUnichar aChar);
-  nsFontGTK*  FindStyleSheetGenericFont(PRUnichar aChar);
-  nsFontGTK*  FindLangGroupPrefFont(nsIAtom* aLangGroup, PRUnichar aChar);
-  nsFontGTK*  FindLangGroupFont(nsIAtom* aLangGroup, PRUnichar aChar, nsCString* aName);
-  nsFontGTK*  FindAnyFont(PRUnichar aChar);
-  nsFontGTK*  FindSubstituteFont(PRUnichar aChar);
-
-  nsFontGTK*  SearchNode(nsFontNode* aNode, PRUnichar aChar);
-  nsFontGTK*  TryAliases(nsCString* aName, PRUnichar aChar);
-  nsFontGTK*  TryFamily(nsCString* aName, PRUnichar aChar);
-  nsFontGTK*  TryNode(nsCString* aName, PRUnichar aChar);
-  nsFontGTK*  TryNodes(nsAWritableCString &aFFREName, PRUnichar aChar);
-  nsFontGTK*  TryLangGroup(nsIAtom* aLangGroup, nsCString* aName, PRUnichar aChar);
-
-  nsFontGTK*  AddToLoadedFontsList(nsFontGTK* aFont);
-  nsFontGTK*  PickASizeAndLoad(nsFontStretch* aStretch,
-                               nsFontCharSetInfo* aCharSet, 
-                               PRUnichar aChar,
-                               const char *aName);
-
-  static nsresult FamilyExists(const nsString& aFontName);
-
-  //friend struct nsFontGTK;
-
-  nsFontGTK   **mLoadedFonts;
-  PRUint16    mLoadedFontsAlloc;
-  PRUint16    mLoadedFontsCount;
-
-  nsFontGTK   *mSubstituteFont;
-
-  nsCStringArray mFonts;
-  PRUint16       mFontsIndex;
-  nsVoidArray    mFontIsGeneric;
-
-  nsCAutoString     mDefaultFont;
-  nsCString         *mGeneric;
-  nsCOMPtr<nsIAtom> mLangGroup;
-  nsCAutoString     mUserDefined;
-
-  PRUint8 mTriedAllGenerics;
-  PRUint8 mIsUserDefined;
-
-protected:
-  void RealizeFont();
-
-  nsIDeviceContext    *mDeviceContext;
-  nsFont              *mFont;
-  nsFontGTK           *mWesternFont;
-
-  nscoord             mLeading;
-  nscoord             mEmHeight;
-  nscoord             mEmAscent;
-  nscoord             mEmDescent;
-  nscoord             mMaxHeight;
-  nscoord             mMaxAscent;
-  nscoord             mMaxDescent;
-  nscoord             mMaxAdvance;
-  nscoord             mXHeight;
-  nscoord             mSuperscriptOffset;
-  nscoord             mSubscriptOffset;
-  nscoord             mStrikeoutSize;
-  nscoord             mStrikeoutOffset;
-  nscoord             mUnderlineSize;
-  nscoord             mUnderlineOffset;
-  nscoord             mSpaceWidth;
-
-  PRUint16            mPixelSize;
-  PRUint8             mStretchIndex;
-  PRUint8             mStyleIndex;
-  nsFontCharSetConverter mDocConverterType;
-};
-
-class nsFontEnumeratorGTK : public nsIFontEnumerator
-{
-public:
-  nsFontEnumeratorGTK();
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIFONTENUMERATOR
-};
-
-#endif

mozilla/modules/libpr0n/src/imgLoader.cpp

@@ -0,0 +1,389 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ * 
+ * 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) 2001 Netscape Communications Corporation.
+ * All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+
+#include "imgLoader.h"
+
+#include "nsCOMPtr.h"
+
+#include "nsIChannel.h"
+#include "nsIHTTPChannel.h"
+#include "nsIIOService.h"
+#include "nsILoadGroup.h"
+#include "nsIProxyObjectManager.h"
+#include "nsIServiceManager.h"
+#include "nsIStreamListener.h"
+#include "nsIURI.h"
+#include "nsXPIDLString.h"
+
+#include "imgCache.h"
+#include "imgRequest.h"
+#include "imgRequestProxy.h"
+
+#include "ImageLogging.h"
+
+NS_IMPL_ISUPPORTS1(imgLoader, imgILoader)
+
+imgLoader::imgLoader()
+{
+  NS_INIT_ISUPPORTS();
+  /* member initializers and constructor code */
+}
+
+imgLoader::~imgLoader()
+{
+  /* destructor code */
+}
+
+/* imgIRequest loadImage (in nsIURI uri, in nsILoadGroup aLoadGroup, in imgIDecoderObserver aObserver, in nsISupports cx); */
+NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, nsILoadGroup *aLoadGroup, imgIDecoderObserver *aObserver, nsISupports *cx, imgIRequest **_retval)
+{
+  NS_ASSERTION(aURI, "imgLoader::LoadImage -- NULL URI pointer");
+
+  if (!aURI)
+    return NS_ERROR_NULL_POINTER;
+
+#if defined(PR_LOGGING)
+  nsXPIDLCString spec;
+  aURI->GetSpec(getter_Copies(spec));
+  LOG_SCOPE_WITH_PARAM(gImgLog, "imgLoader::LoadImage", "aURI", spec.get());
+#endif
+
+  imgRequest *request = nsnull;
+
+  nsCOMPtr<nsICacheEntryDescriptor> entry;
+  imgCache::Get(aURI, &request, getter_AddRefs(entry)); // addrefs request
+
+  if (request && entry && aLoadGroup) {
+    /* this isn't exactly what I want here.  This code will re-doom every
+       cache hit in a document while it is force reloading.  So for multiple
+       copies of an image on a page, when you force reload, this will cause
+       you to get seperate loads for each copy of the image... this sucks.
+    */
+    PRUint32 flags = 0;
+    PRBool doomRequest = PR_FALSE;
+    aLoadGroup->GetLoadFlags(&flags);
+    if (flags & nsIRequest::LOAD_BYPASS_CACHE)
+      doomRequest = PR_TRUE;
+    else {
+      nsCOMPtr<nsIRequest> r;
+      aLoadGroup->GetDefaultLoadRequest(getter_AddRefs(r));
+      if (r) {
+        r->GetLoadFlags(&flags);
+        if (flags & nsIRequest::LOAD_BYPASS_CACHE)
+          doomRequest = PR_TRUE;
+      }
+    }
+
+    if (doomRequest) {
+      entry->Doom(); // doom this thing.
+      entry = nsnull;
+      NS_RELEASE(request);
+      request = nsnull;
+    }
+  }
+
+  if (!request) {
+    /* no request from the cache.  do a new load */
+    LOG_SCOPE(gImgLog, "imgLoader::LoadImage |cache miss|");
+
+    nsCOMPtr<nsIIOService> ioserv(do_GetService("@mozilla.org/network/io-service;1"));
+    if (!ioserv) return NS_ERROR_FAILURE;
+
+    nsCOMPtr<nsIChannel> newChannel;
+    ioserv->NewChannelFromURI(aURI, getter_AddRefs(newChannel));
+    if (!newChannel) return NS_ERROR_FAILURE;
+
+    if (aLoadGroup) {
+      PRUint32 flags;
+      aLoadGroup->GetLoadFlags(&flags);
+      newChannel->SetLoadFlags(flags);
+    }
+
+    NS_NEWXPCOM(request, imgRequest);
+    if (!request) return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(request);
+
+    PR_LOG(gImgLog, PR_LOG_DEBUG,
+           ("[this=%p] imgLoader::LoadImage -- Created new imgRequest [request=%p]\n", this, request));
+
+#ifdef MOZ_NEW_CACHE
+    imgCache::Put(aURI, request, getter_AddRefs(entry));
+
+    request->Init(newChannel, entry);
+#else
+    request->Init(newChannel, nsnull);
+#endif
+
+    PR_LOG(gImgLog, PR_LOG_DEBUG,
+           ("[this=%p] imgLoader::LoadImage -- Calling channel->AsyncOpen()\n", this));
+
+    // create the proxy listener
+    ProxyListener *pl = new ProxyListener(NS_STATIC_CAST(nsIStreamListener *, request));
+    if (!pl) {
+      NS_RELEASE(request);
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+
+    NS_ADDREF(pl);
+
+    // set the referrer if this is an HTTP request
+    nsCOMPtr<nsIHTTPChannel> httpChannel(do_QueryInterface(newChannel));
+    if (aLoadGroup && httpChannel) {
+      nsresult rv;
+      // Get the defloadRequest from the loadgroup
+      nsCOMPtr<nsIRequest> defLoadRequest;
+      rv = aLoadGroup->GetDefaultLoadRequest(getter_AddRefs(defLoadRequest));
+
+      if (NS_SUCCEEDED(rv) && defLoadRequest) {
+        nsCOMPtr<nsIChannel> reqChannel(do_QueryInterface(defLoadRequest));
+
+        if (reqChannel) {
+          // Get the referrer from the loadchannel
+          nsCOMPtr<nsIURI> referrer;
+          rv = reqChannel->GetURI(getter_AddRefs(referrer));
+          if (NS_SUCCEEDED(rv)) {
+            // Set the referrer
+            httpChannel->SetReferrer(referrer,
+                                     nsIHTTPChannel::REFERRER_INLINES);
+          }   
+        }
+      }
+    }
+
+    /* XXX Are we calling AsyncOpen() too early?  Is it possible for
+       AsyncOpen to result in an OnStartRequest to the channel before
+       we call CreateNewProxyForRequest() ?
+     */
+    nsresult asyncOpenResult = newChannel->AsyncOpen(NS_STATIC_CAST(nsIStreamListener *, pl), nsnull);
+
+    NS_RELEASE(pl);
+
+    if (NS_FAILED(asyncOpenResult)) {
+      /* If AsyncOpen fails, then we want to hand back a request proxy
+         object that has a canceled load.
+       */
+      LOG_MSG(gImgLog, "imgLoader::LoadImage", "async open failed.");
+
+      nsresult rv = CreateNewProxyForRequest(request, aLoadGroup, aObserver,
+                                             cx, _retval);
+      if (NS_SUCCEEDED(rv)) {
+        request->OnStartRequest(newChannel, nsnull);
+        request->OnStopRequest(newChannel, nsnull, NS_BINDING_ABORTED);
+      }
+
+      NS_RELEASE(request);
+      
+      return asyncOpenResult;
+    }
+
+  } else {
+    /* request found in cache.  use it */
+    LOG_MSG_WITH_PARAM(gImgLog, "imgLoader::LoadImage |cache hit|", "request", request);
+  }
+
+  LOG_MSG(gImgLog, "imgLoader::LoadImage", "creating proxy request.");
+
+  nsresult rv = CreateNewProxyForRequest(request, aLoadGroup, aObserver, cx, _retval);
+
+  NS_RELEASE(request);
+
+  return rv;
+}
+
+/* imgIRequest loadImageWithChannel(in nsIChannel, in imgIDecoderObserver aObserver, in nsISupports cx, out nsIStreamListener); */
+NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderObserver *aObserver, nsISupports *cx, nsIStreamListener **listener, imgIRequest **_retval)
+{
+  NS_ASSERTION(channel, "imgLoader::LoadImageWithChannel -- NULL channel pointer");
+
+  imgRequest *request = nsnull;
+
+  nsCOMPtr<nsIURI> uri;
+  channel->GetOriginalURI(getter_AddRefs(uri));
+
+  nsCOMPtr<nsICacheEntryDescriptor> entry;
+  imgCache::Get(uri, &request, getter_AddRefs(entry)); // addrefs request
+
+  if (request) {
+    // we have this in our cache already.. cancel the current (document) load
+
+    /* XXX If |*listener| is null when we return here, the caller should 
+       probably cancel the channel instead of us doing it here.
+    */
+    channel->Cancel(NS_BINDING_ABORTED); // this should fire an OnStopRequest
+
+    *listener = nsnull; // give them back a null nsIStreamListener
+  } else {
+    NS_NEWXPCOM(request, imgRequest);
+    if (!request) return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(request);
+
+    imgCache::Put(uri, request, getter_AddRefs(entry));
+
+    request->Init(channel, entry);
+
+    ProxyListener *pl = new ProxyListener(NS_STATIC_CAST(nsIStreamListener *, request));
+    if (!pl) {
+      NS_RELEASE(request);
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+
+    NS_ADDREF(pl);
+
+    *listener = NS_STATIC_CAST(nsIStreamListener*, pl);
+    NS_ADDREF(*listener);
+
+    NS_RELEASE(pl);
+  }
+
+  nsCOMPtr<nsILoadGroup> loadGroup;
+  channel->GetLoadGroup(getter_AddRefs(loadGroup));
+
+  nsresult rv = CreateNewProxyForRequest(request, loadGroup, aObserver, cx, _retval);
+
+  NS_RELEASE(request);
+
+  return rv;
+}
+
+
+
+nsresult
+imgLoader::CreateNewProxyForRequest(imgRequest *aRequest, nsILoadGroup *aLoadGroup,
+                                    imgIDecoderObserver *aObserver, nsISupports *cx,
+                                    imgIRequest **_retval)
+{
+  LOG_SCOPE_WITH_PARAM(gImgLog, "imgLoader::CreateNewProxyForRequest", "imgRequest", aRequest);
+
+  /* XXX If we move decoding onto seperate threads, we should save off the
+     calling thread here and pass it off to |proxyRequest| so that it call
+     proxy calls to |aObserver|.
+  */
+
+  imgRequestProxy *proxyRequest;
+  NS_NEWXPCOM(proxyRequest, imgRequestProxy);
+  if (!proxyRequest) return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(proxyRequest);
+
+  // init adds itself to imgRequest's list of observers
+  nsresult rv = proxyRequest->Init(aRequest, aLoadGroup, aObserver, cx);
+  if (NS_FAILED(rv)) {
+    NS_RELEASE(proxyRequest);
+    return rv;
+  }
+
+  *_retval = NS_STATIC_CAST(imgIRequest*, proxyRequest);
+  NS_ADDREF(*_retval);
+
+  NS_RELEASE(proxyRequest);
+
+  return NS_OK;
+}
+
+
+
+/**
+ * proxy stream listener class used to handle multipart/x-mixed-replace
+ */
+
+#include "nsIRequest.h"
+#include "nsIStreamConverterService.h"
+#include "nsXPIDLString.h"
+
+NS_IMPL_ISUPPORTS2(ProxyListener, nsIStreamListener, nsIRequestObserver)
+
+ProxyListener::ProxyListener(nsIStreamListener *dest) :
+  mDestListener(dest)
+{
+  NS_INIT_ISUPPORTS();
+  /* member initializers and constructor code */
+}
+
+ProxyListener::~ProxyListener()
+{
+  /* destructor code */
+}
+
+
+/** nsIRequestObserver methods **/
+
+/* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */
+NS_IMETHODIMP ProxyListener::OnStartRequest(nsIRequest *aRequest, nsISupports *ctxt)
+{
+  if (!mDestListener)
+    return NS_ERROR_FAILURE;
+
+  nsCOMPtr<nsIChannel> channel(do_QueryInterface(aRequest));
+  if (channel) {
+    nsXPIDLCString contentType;
+    nsresult rv = channel->GetContentType(getter_Copies(contentType));
+
+    if (contentType.get()) {
+     /* If multipart/x-mixed-replace content, we'll insert a MIME decoder
+        in the pipeline to handle the content and pass it along to our
+        original listener.
+      */
+      if (NS_LITERAL_CSTRING("multipart/x-mixed-replace").Equals(contentType)) {
+
+        nsCOMPtr<nsIStreamConverterService> convServ(do_GetService("@mozilla.org/streamConverters;1", &rv));
+        if (NS_SUCCEEDED(rv)) {
+          nsCOMPtr<nsIStreamListener> toListener(mDestListener);
+          nsCOMPtr<nsIStreamListener> fromListener;
+
+          rv = convServ->AsyncConvertData(NS_LITERAL_STRING("multipart/x-mixed-replace").get(),
+                                          NS_LITERAL_STRING("*/*").get(),
+                                          toListener,
+                                          nsnull,
+                                          getter_AddRefs(fromListener));
+          if (NS_SUCCEEDED(rv))
+            mDestListener = fromListener;
+        }
+      }
+    }
+  }
+
+  return mDestListener->OnStartRequest(aRequest, ctxt);
+}
+
+/* void onStopRequest (in nsIRequest request, in nsISupports ctxt, in nsresult status); */
+NS_IMETHODIMP ProxyListener::OnStopRequest(nsIRequest *aRequest, nsISupports *ctxt, nsresult status)
+{
+  if (!mDestListener)
+    return NS_ERROR_FAILURE;
+
+  return mDestListener->OnStopRequest(aRequest, ctxt, status);
+}
+
+/** nsIStreamListener methods **/
+
+/* void onDataAvailable (in nsIRequest request, in nsISupports ctxt, in nsIInputStream inStr, in unsigned long sourceOffset, in unsigned long count); */
+NS_IMETHODIMP ProxyListener::OnDataAvailable(nsIRequest *aRequest, nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count)
+{
+  if (!mDestListener)
+    return NS_ERROR_FAILURE;
+
+  return mDestListener->OnDataAvailable(aRequest, ctxt, inStr, sourceOffset, count);
+}

mozilla/xpcom/ds/Makefile.in

@@ -1,134 +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		= xpcom
-XPIDL_MODULE	= xpcom_ds
-LIBRARY_NAME	= xpcomds_s
-REQUIRES	= unicharutil string
-
-CSRCS = \
-		pldhash.c \
-		plvector.c \
-		$(NULL)
-
-CPPSRCS		= \
-		nsArena.cpp \
-		nsAtomTable.cpp \
-		nsAtomService.cpp \
-		nsAVLTree.cpp \
-		nsByteBuffer.cpp \
-		nsCRT.cpp \
-		nsConjoiningEnumerator.cpp \
-		nsDeque.cpp \
-		nsEmptyEnumerator.cpp \
-		nsEnumeratorUtils.cpp \
-		nsFixedSizeAllocator.cpp \
-		nsHashtable.cpp \
-		nsHashtableEnumerator.cpp \
-		nsObserver.cpp \
-		nsObserverList.cpp \
-		nsObserverService.cpp \
-		nsProperties.cpp \
-		nsPersistentProperties.cpp \
-		nsQuickSort.cpp \
-		nsSizeOfHandler.cpp \
-		nsStaticNameTable.cpp \
-		nsStatistics.cpp \
-		nsStringMap.cpp \
-		nsSupportsArray.cpp \
-		nsSupportsArrayEnumerator.cpp \
-		nsSupportsPrimitives.cpp \
-		nsUnicharBuffer.cpp \
-		nsVoidArray.cpp \
-		nsVoidBTree.cpp \
-		nsTextFormatter.cpp \
-		nsTimelineService.cpp \
-		$(NULL)
-
-EXPORTS		= \
-		nsAVLTree.h \
-		nsAtomService.h \
-		nsCppSharedAllocator.h \
-		nsCRT.h \
-		nsDeque.h \
-		nsEnumeratorUtils.h \
-		nsFixedSizeAllocator.h \
-		nsHashtable.h \
-		nsHashtableEnumerator.h \
-		nsIArena.h \
-		nsIByteBuffer.h \
-		nsIObserverList.h \
-		nsISimpleEnumerator.h \
-		nsISizeOfHandler.h \
-		nsIUnicharBuffer.h \
-		nsInt64.h \
-		nsQuickSort.h \
-		nsStaticNameTable.h \
-		nsStatistics.h \
-		nsStringMap.h \
-		nsSupportsArray.h \
-		nsSupportsPrimitives.h \
-		nsTime.h \
-		nsUnitConversion.h \
-		nsVector.h \
-		nsVoidArray.h \
-		nsVoidBTree.h \
-		pldhash.h \
-		plvector.h \
-		nsTextFormatter.h \
-		$(NULL)			
-
-XPIDLSRCS	= \
-		nsIAtom.idl \
-		nsIAtomService.idl \
-		nsICollection.idl \
-		nsIEnumerator.idl \
-		nsIObserver.idl \
-		nsIObserverService.idl \
-		nsIPersistentProperties2.idl \
-		nsIProperties.idl \
-		nsISerializable.idl \
-		nsIStopwatch.idl \
-		nsISupportsArray.idl \
-		nsISupportsIterators.idl \
-		nsISupportsPrimitives.idl \
-		nsITimelineService.idl \
-		$(NULL)
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
-# Force use of PIC
-FORCE_USE_PIC	= 1
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
-

mozilla/xpcom/ds/nsStringMap.cpp

@@ -1,300 +0,0 @@
-/* 
- * The contents of this file are subject to the Mozilla 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/MPL/
- * 
- * 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 Communicator client code.
- * 
- * The Initial Developer of the Original Code is James L. Nance
- * Portions created by James L. Nance are Copyright (C) 2001
- * James L. Nance.  All  Rights Reserved.
- * 
- * Contributor(s): Patricia Jewell Nance, Jesse Jacob Nance
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-// #define TEST_PATRICIA
-
-#if defined(TEST_PATRICIA)
-#   include "stdlib.h"
-#   include "stdio.h"
-#   include "string.h"
-#   define PRBool bool
-#   define PRUint32 unsigned int
-#   define PRInt32  int
-#   define PR_CALLBACK
-#   define PLArenaPool int
-#   define PL_FinishArenaPool(a)
-#   define PL_InitArenaPool(a, b, c, d)
-#   define PL_ArenaAllocate(a, size) malloc(size)
-#   define PR_TRUE true
-#   define PR_FALSE false
-
-    struct nsCRT {
-        static int strlen(const char *a) {return ::strlen(a);}
-        static int memcmp(const void *a, const void *b, PRUint32 c) {
-            return ::memcmp(a,b,c);
-        }
-    };
-#else
-#   include "nsCRT.h"
-#endif
-
-#include "nsStringMap.h"
-
-const char nsStringMap::zero_str[] = "\0";
-
-nsStringMap::~nsStringMap()
-{
-    // Get rid of the arena memory
-    PL_FinishArenaPool(&mPool);
-}
-
-nsStringMap::nsStringMap() : numEntries(0)
-{
-    // Initialize the head
-    head.l   = head.r = &head;
-    head.bit = ~0;
-    head.key = zero_str;
-    head.len = 1;
-    head.obj = 0;
-
-    // Initialize the arena.  Guess that a 512 byte block size is good
-    PL_InitArenaPool(&mPool, "nsStringMap", 512, sizeof(void*));
-}
-
-void
-nsStringMap::Reset()
-{
-    // Initialize the head
-    head.l   = head.r = &head;
-    head.bit = ~0;
-    head.key = zero_str;
-    head.len = 1;
-    head.obj = 0;
-
-    // Reinitialize the Arena
-    PL_FinishArenaPool(&mPool);
-    PL_InitArenaPool(&mPool, "nsStringMap", 512, sizeof(void*));
-}
-
-void
-nsStringMap::Reset(nsStringMapEnumFunc destroyFunc, void *aClosure)
-{
-    Enumerate(destroyFunc, aClosure);
-    Reset();
-}
-
-nsStringMap::Patricia *
-nsStringMap::newNode()
-{
-    return (Patricia*) PL_ArenaAllocate(&mPool, sizeof(Patricia));
-}
-
-nsStringMap::Patricia *
-nsStringMap::searchDown(BitTester &key)
-{
-    // The head node only branches to the left, so we can optimize here.
-    Patricia *x = head.l;
-
-    PRUint32 lastBits;
-
-    do {
-        lastBits = x->bit;
-
-        if(key.isset(lastBits))
-            x = x->r;
-        else
-            x = x->l;
-
-    } while(lastBits > x->bit);
-
-    return x;
-}
-
-void*
-nsStringMap::Get(const char *str, PRUint32 slen)
-{
-    BitTester key(str, slen);
-
-    Patricia *t = searchDown(key);
-
-    if(!key.memcmp(t->key, t->len)) {
-        return t->obj;
-    }
-
-    return 0;
-}
-
-void*
-nsStringMap::Get(const char *str)
-{
-    BitTester key(str);
-
-    Patricia *t = searchDown(key);
-
-    if(!key.memcmp(t->key, t->len)) {
-        return t->obj;
-    }
-
-    return 0;
-}
-
-PRBool
-nsStringMap::Put(const char *str, void *obj, PRBool copy)
-{
-    PRUint32 slen = nsCRT::strlen(str);
-    return Put(str, slen, obj, copy);
-}
-
-PRBool
-nsStringMap::Put(const char *str, PRUint32 slen, void *obj, PRBool copy)
-{
-    if(copy) {
-        PRUint32 mask  = sizeof(double) - 1;
-        PRUint32 asize = (slen+mask) & ~mask;
-        char *tstr = (char*) PL_ArenaAllocate(&mPool, asize);
-        memcpy(tstr, str, slen);
-        str = tstr;
-    }
-
-    BitTester key(str, slen);
-
-    Patricia *t = searchDown(key);
-
-    if(!key.memcmp(t->key, t->len)) {
-        t->obj = obj;
-        return PR_TRUE;
-    }
-
-    // This is somewhat ugly.  We need to find the maximum bit position that
-    // differs, but this is complicated by the fact that we have random length
-    // data.  Assume that data past the end of the string is 0.
-    const PRUint32 klen = key.datalen();
-    const PRUint32 tlen = t->len;
-    PRUint32   bpos;
-    if(klen>tlen) {
-        bpos = 8 * klen - 1;
-        while(!BitTester::isset_checked(str, bpos)) --bpos;
-    } else if(tlen>klen) {
-        bpos = 8 * tlen - 1;
-        while(!BitTester::isset_checked(t->key, bpos)) --bpos;
-    } else /* equal */ {
-        bpos = 8 * tlen - 1;
-        while(BitTester::bitsequal(t->key, str, bpos)) --bpos;
-    }
-
-    Patricia *p, *x = &head;
-
-    do {
-        p = x;
-        x = key.isset(x->bit) ? x->r : x->l;
-    } while(x->bit > bpos && p->bit > x->bit);
-
-    t = newNode();
-
-    if(!t) {
-        return PR_FALSE;
-    }
-
-    t->key = str;
-    t->len = key.datalen();
-    t->obj = obj;
-    t->bit = bpos;
-
-    if(key.isset(t->bit)) {
-        t->r = t;
-        t->l = x;
-    } else {
-        t->r = x;
-        t->l = t;
-    }
-
-    if(key.isset(p->bit)) {
-        p->r = t;
-    } else {
-        p->l = t;
-    }
-
-    return PR_TRUE;
-}
-
-void
-nsStringMap::enumerate_recurse(
-nsStringMapEnumFunc aEnumFunc, void* aClosure, Patricia *node)
-{
-    aEnumFunc(node->key, node->obj, aClosure);
-    if(node->l && node->l->bit<node->bit)
-        enumerate_recurse(aEnumFunc, aClosure, node->l);
-    if(node->r && node->r->bit<node->bit)
-        enumerate_recurse(aEnumFunc, aClosure, node->r);
-}
-
-void
-nsStringMap::Enumerate(nsStringMapEnumFunc aEnumFunc, void *aClosure)
-{
-    // We dont want to process head, its a sentinal
-    if(head.l && head.l->bit<head.bit)
-        enumerate_recurse(aEnumFunc, aClosure, head.l);
-    if(head.r && head.r->bit<head.bit)
-        enumerate_recurse(aEnumFunc, aClosure, head.r);
-}
-
-#if defined(TEST_PATRICIA)
-
-PRBool etest(const char *key, void *data, void *closure)
-{
-    printf("%s\n", key);
-    return PR_TRUE;
-}
-
-int main()
-{
-    nsStringMap map;
-    const char *strings[] = {
-      "I am number 1 string",
-      "I am number 2 string",
-      "I am number 3 string",
-      "a different string",
-      "a similar string",
-      "I am a very long string and I want to make sure we can handle this",
-      "I am a very long string and I want to make sure we can handle this too",
-      0
-    };
-
-    int idx;
-    for(idx=0; strings[idx]; ++idx) {
-        map.Put(strings[idx], (void*)(1+idx));
-    }
-
-    printf("Lookup Test\n");
-    while(--idx>=0) {
-        void *ptr = map.Get(strings[idx]);
-        printf("%d: %s\n", (long)ptr, strings[idx]);
-    }
-
-    printf("\nEnumeration Test\n");
-
-    map.Enumerate(etest, 0);
-
-    return 0;
-}
-
-#endif

mozilla/xpcom/ds/nsStringMap.h

@@ -1,112 +0,0 @@
-#ifndef nsStringMap_h__
-#define nsStringMap_h__
-
-/* 
- * The contents of this file are subject to the Mozilla 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/MPL/
- * 
- * 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 Communicator client code.
- * 
- * The Initial Developer of the Original Code is James L. Nance
- * Portions created by James L. Nance are Copyright (C) 2001
- * James L. Nance.  All  Rights Reserved.
- * 
- * Contributor(s): Patricia Jewell Nance, Jesse Jacob Nance
- * 
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-#if !defined(TEST_PATRICIA)
-#   include "nscore.h"
-#   include "prtypes.h"
-#   include "plarena.h"
-#endif
-
-typedef PRBool (*PR_CALLBACK nsStringMapEnumFunc) (
-    const char *aKey, void *aData, void *aClosure);
-
-class nsStringMap
-{
-public:
-    nsStringMap();
-    ~nsStringMap();
-    PRBool Put(const char *str, PRUint32 slen, void *obj, PRBool copy=PR_FALSE);
-    PRBool Put(const char *str, void *obj, PRBool copy=PR_FALSE);
-    void*  Get(const char *str);
-    void*  Get(const char *str, PRUint32 slen);
-    void   Reset();
-    void   Reset(nsStringMapEnumFunc destroyFunc, void *aClosure = 0);
-    void   Enumerate(nsStringMapEnumFunc aEnumFunc, void *aClosure = 0);
-
-    struct Patricia {
-        Patricia   *l, *r;
-        PRUint32    bit;    // Bit position for l/r comp
-        const char *key;
-        PRUint32    len;
-        void       *obj;
-    };
-
-    // The BitTester class is used to test a particular bit position in an
-    // array of characters.  It does not assign any special meaning to 0
-    // characters.  Bits past the end of the array are treated as 0
-    class BitTester {
-        const PRUint32 slen;
-        const char    *cstr;
-    public:
-        BitTester(const char *s) : slen(nsCRT::strlen(s)), cstr(s) {}
-        BitTester(const char *s, PRUint32 l) : slen(l), cstr(s) {}
-
-        PRInt32 memcmp(const char *ostr, PRUint32 olen) {
-            if(olen==slen) {
-                return ::memcmp((void*)cstr, ostr, slen);
-            } else {
-                return olen - slen;
-            }
-        }
-
-        PRUint32 datalen() const {return slen;}
-
-        static PRBool isset_checked(const char *str, PRUint32 idx) {
-            return (str[idx/8] & (1<<(idx & 7))) != 0;
-        }
-
-        static PRBool
-        bitsequal(const char *str1, const char*str2, PRUint32 idx) {
-            return (str1[idx/8] & (1<<(idx&7)))==(str2[idx/8] & (1<<(idx&7)));
-        }
-
-        PRBool isset(PRUint32 idx) {
-            const PRUint32 base = idx/8;
-            if(base>=slen) return 0;
-            return (cstr[base] & (1<<(idx & 7))) != 0;
-        }
-    };
-
-private:
-    PLArenaPool mPool;
-    Patricia *newNode();
-    Patricia *searchDown(BitTester&);
-    void enumerate_recurse(nsStringMapEnumFunc, void*, Patricia*);
-    Patricia head; // Sentinal node
-    PRInt32  numEntries;
-    static const char zero_str[];
-};
-
-#endif