more cleanup

git-svn-id: svn://10.0.0.236/branches/alecf_urlbarcleanup@89710 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/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

mozilla/xpfe/components/urlbarhistory/Makefile.in

@@ -0,0 +1,31 @@
+#
+# 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/xpfe/components/urlbarhistory/makefile.win

@@ -0,0 +1,26 @@
+#!nmake
+#
+# 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=..\..\..
+
+DIRS=public src
+
+include <$(DEPTH)\config\rules.mak>

mozilla/xpfe/components/urlbarhistory/public/MANIFEST_IDL

@@ -0,0 +1 @@
+nsIUrlbarHistory.idl

mozilla/xpfe/components/urlbarhistory/public/Makefile.in

@@ -0,0 +1,35 @@
+#
+# 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		= appcomps
+XPIDL_MODULE	= urlbarhistory
+
+XPIDLSRCS	= nsIUrlbarHistory.idl        \
+                  $(NULL)
+
+include $(topsrcdir)/config/rules.mk

mozilla/xpfe/components/urlbarhistory/public/makefile.win

@@ -0,0 +1,30 @@
+#!nmake
+#
+# 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=urlbarhistory
+
+XPIDLSRCS =                   \
+    .\nsIUrlbarHistory.idl          \
+    $(NULL)
+
+include <$(DEPTH)\config\rules.mak>

mozilla/xpfe/components/urlbarhistory/public/nsIUrlbarHistory.idl

@@ -0,0 +1,52 @@
+/* -*- 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) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): Radha Kulkarni (radha@netscape.com)
+ *                 Jason Eager    (jce2@po.cwru.edu)
+ */
+ 
+#include "nsISupports.idl"
+#include "nsIFactory.idl"
+
+
+%{C++
+#define NS_URLBARHISTORY_CID \
+{0x74254499, 0x171a, 0x11d4, {0x98, 0x70, 0x0, 0xc0, 0x4f, 0xa0, 0x2f, 0x40}}
+
+
+#define NS_URLBARHISTORY_CONTRACTID "@mozilla.org/browser/urlbarhistory;1"
+#define NS_URLBARAUTOCOMPLETE_CONTRACTID "@mozilla.org/autocompleteSession;1?type=urlbar"
+#define UBHISTORY_MAX_ENTRIES = 15;
+%}
+
+[scriptable, uuid(74254499-171a-11d4-9870-00c04fa02f40)]
+interface nsIUrlbarHistory: nsISupports
+{
+  /**
+   * Get the size of the History list
+   */
+   readonly attribute long count;
+
+  /**
+   * clear the History contents
+   */
+   void clearHistory();
+    
+
+};

mozilla/xpfe/components/urlbarhistory/src/Makefile.in

@@ -0,0 +1,40 @@
+#
+# 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		= appcomps
+LIBRARY_NAME	= urlbarhistory_s
+REQUIRES	= xpcom string rdf pref js necko
+
+CPPSRCS		= nsUrlbarHistory.cpp
+
+# 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/xpfe/components/urlbarhistory/src/makefile.win

@@ -0,0 +1,40 @@
+#!nmake
+#
+# 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=appcomps
+LIBRARY_NAME=urlbarhistory_s
+
+CPP_OBJS=                               \
+ .\$(OBJDIR)\nsUrlbarHistory.obj        \
+ $(NULL)
+
+LCFLAGS = \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/xpfe/components/urlbarhistory/src/nsUBHistoryModule.cpp

@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 8; 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 Communicator client 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):  Radha Kulkarni radha@netscape.com
+ */
+
+#include "nsIModule.h"
+#include "nsIGenericFactory.h"
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "nsIUrlbarHistory.h"
+
+#include "nsUrlbarHistory.h"
+
+// Factory Constructors
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsUrlbarHistory)
+
+///////////////////////////////////////////////////////////////////////////////
+// Module implementation for the history library
+
+static nsModuleComponentInfo gUBHistoryModuleInfo[] = 
+{
+   { "nsUrlbarHistory", NS_URLBARHISTORY_CID,
+      NS_URLBARHISTORY_CONTRACTID, nsUrlbarHistoryConstructor },
+   { "nsUrlbarHistory", NS_URLBARHISTORY_CID,
+      NS_URLBARAUTOCOMPLETE_CONTRACTID, nsUrlbarHistoryConstructor }
+};
+
+NS_IMPL_NSGETMODULE("Urlbar History Module", gUBHistoryModuleInfo)

mozilla/xpfe/components/urlbarhistory/src/nsUrlbarHistory.cpp

@@ -0,0 +1,677 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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 the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications, Inc.  Portions created by Netscape are
+ * Copyright (C) 1999, Mozilla.  All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Radha Kulkarni <radha@netscape.com>
+ * 
+ */
+
+// Local Includes 
+#include "nsUrlbarHistory.h"
+
+// Helper Classes
+#include "nsXPIDLString.h"
+
+// Interfaces Needed
+#include "nsString.h"
+#include "nsIAutoCompleteResults.h"
+#include "nsISimpleEnumerator.h"
+#include "nsIPref.h"
+#include "nsIServiceManager.h"
+#include "nsIRDFService.h"
+#include "nsIRDFContainer.h"
+#include "nsIRDFContainerUtils.h"
+#include "nsIURL.h"
+
+
+static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
+static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
+static NS_DEFINE_CID(kRDFCUtilsCID, NS_RDFCONTAINERUTILS_CID);
+static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID);
+
+static char * ignoreArray[] = {
+		"http://",
+	    "ftp://",
+		"www.",
+		"http://www.",
+		"https://",
+		"https://www.",
+		"keyword:",
+		"://",
+		"//",
+		"\\",
+		":\\",
+		"file:///",
+		".com",
+		".org",
+		".net",
+		".",
+		"?",
+		"&",
+		"="
+	};
+static nsIRDFResource * kNC_CHILD;
+static nsIRDFResource * kNC_URLBARHISTORY;
+static nsIRDFService * gRDFService;
+static nsIRDFContainerUtils * gRDFCUtils;
+
+#define PREF_AUTOCOMPLETE_ENABLED "browser.urlbar.autocomplete.enabled"
+
+
+
+//*****************************************************************************
+//***    nsUrlbarHistory: Object Management
+//*****************************************************************************
+
+nsUrlbarHistory::nsUrlbarHistory()
+{
+   NS_INIT_REFCNT();
+   PRInt32 cnt = sizeof(ignoreArray)/sizeof(char *);
+   for(PRInt32 i=0; i< cnt; i++) 
+     mIgnoreArray.AppendString(NS_ConvertASCIItoUCS2(ignoreArray[i]));
+   
+   nsresult res;
+
+   res = nsServiceManager::GetService(kRDFServiceCID, NS_GET_IID(nsIRDFService),
+                                      (nsISupports **)&gRDFService);
+   res = nsServiceManager::GetService(kRDFCUtilsCID, NS_GET_IID(nsIRDFContainerUtils),
+                                      (nsISupports **)&gRDFCUtils);
+   if (gRDFService) {
+	   //printf("$$$$ Got RDF SERVICE $$$$\n");
+     res = gRDFService->GetDataSource("rdf:localstore", getter_AddRefs(mDataSource));
+
+	 res = gRDFService->GetResource("http://home.netscape.com/NC-rdf#child", &kNC_CHILD);
+	 res = gRDFService->GetResource("nc:urlbar-history", &kNC_URLBARHISTORY);
+   }
+   
+   nsCOMPtr<nsIPref> prefs = do_GetService(kPrefServiceCID, &res);
+   if (NS_SUCCEEDED(res)) {
+       prefs->GetBoolPref(PREF_AUTOCOMPLETE_ENABLED, &mEnabled);
+       prefs->AddObserver(PREF_AUTOCOMPLETE_ENABLED, this);
+   }
+   
+}
+
+
+nsUrlbarHistory::~nsUrlbarHistory()
+{
+	//Entries are now in RDF
+    //ClearHistory();
+    
+	mDataSource = nsnull;
+    
+    NS_IF_RELEASE(gRDFService);
+    NS_IF_RELEASE(gRDFCUtils);
+	NS_IF_RELEASE(kNC_URLBARHISTORY);
+	NS_IF_RELEASE(kNC_CHILD);
+
+}
+
+//*****************************************************************************
+//    nsUrlbarHistory: nsISupports
+//*****************************************************************************
+
+NS_IMPL_ADDREF(nsUrlbarHistory)
+NS_IMPL_RELEASE(nsUrlbarHistory)
+
+NS_INTERFACE_MAP_BEGIN(nsUrlbarHistory)
+   NS_INTERFACE_MAP_ENTRY(nsIAutoCompleteSession)
+   NS_INTERFACE_MAP_ENTRY(nsIUrlbarHistory)
+   NS_INTERFACE_MAP_ENTRY(nsIObserver)
+   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIUrlbarHistory)
+NS_INTERFACE_MAP_END
+
+//*****************************************************************************
+//    nsUrlbarHistory: nsISHistory
+//*****************************************************************************
+	NS_IMETHODIMP
+nsUrlbarHistory::ClearHistory()
+{
+  /* Get the elements in the data source through the container
+   */
+  nsCOMPtr<nsIRDFContainer> container;
+  gRDFCUtils->MakeSeq(mDataSource,
+                      kNC_URLBARHISTORY,
+                      getter_AddRefs(container));
+ 
+  NS_ENSURE_TRUE(container, NS_ERROR_FAILURE);
+
+  /* Remove all the elements, back to front, to avoid O(n^2) updates
+   * from RDF.
+   */
+  PRInt32 count = 0;
+  container->GetCount(&count);
+  for (PRInt32 i = count; i >= 1; --i) {
+    nsCOMPtr<nsIRDFNode> dummy;
+    container->RemoveElementAt(i, PR_TRUE, getter_AddRefs(dummy));
+  }
+
+#ifdef DEBUG
+  container->GetCount(&count);
+  NS_ASSERTION(count == 0, "count != 0 after clearing history");
+#endif
+
+  return NS_OK;
+}
+
+
+/* Get size of the history list */
+NS_IMETHODIMP
+nsUrlbarHistory::GetCount(PRInt32 * aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  nsCOMPtr<nsIRDFContainer> container;
+  gRDFCUtils->MakeSeq(mDataSource, 
+                      kNC_URLBARHISTORY,
+                      getter_AddRefs(container));
+
+  NS_ENSURE_TRUE(container, NS_ERROR_FAILURE);
+  return container->GetCount(aResult);
+}
+
+
+NS_IMETHODIMP
+nsUrlbarHistory::OnStartLookup(const PRUnichar *uSearchString,
+                               nsIAutoCompleteResults *previousSearchResult,
+                               nsIAutoCompleteListener *listener)
+{
+    nsresult rv = NS_OK;
+ 
+    if (!listener)
+        return NS_ERROR_NULL_POINTER;
+      
+	if (!mEnabled) {// urlbar autocomplete is not enabled
+		listener->OnAutoComplete(nsnull, nsIAutoCompleteStatus::ignored);
+		return NS_OK;
+	}
+ //   printf("Autocomplete is enabled\n");   
+
+    if (uSearchString[0] == 0)
+    {
+        listener->OnAutoComplete(nsnull, nsIAutoCompleteStatus::ignored);
+        return NS_OK;
+    }
+ 
+    // Check if it is one of the generic strings "http://, www., ftp:// etc..
+    PRInt32 cnt = mIgnoreArray.Count();
+	for(PRInt32 i=0; i<cnt; i++) {
+       nsString * match = mIgnoreArray.StringAt(i);
+	   
+	   if (match) {
+          PRInt32 index = match->Find(uSearchString, PR_TRUE);
+		  if (index == 0) {
+			  listener->OnAutoComplete(nsnull, nsIAutoCompleteStatus::ignored);
+		      return NS_OK;
+		  }
+	   }  // match
+	}  //for
+    
+    nsCOMPtr<nsIAutoCompleteResults> results;
+	/* Don't call SearchPreviousResults. It is buggy 
+    if (NS_FAILED(SearchPreviousResults(uSearchString, previousSearchResult)))
+    {
+        results = do_CreateInstance(NS_AUTOCOMPLETERESULTS_CONTRACTID);
+		NS_ENSURE_TRUE(results, NS_ERROR_FAILURE);
+        rv = SearchCache(uSearchString, results);       
+    }
+    else
+        results = previousSearchResult;
+      */
+	
+	results = do_CreateInstance(NS_AUTOCOMPLETERESULTS_CONTRACTID);
+	NS_ENSURE_TRUE(results, NS_ERROR_FAILURE);
+    rv = SearchCache(nsLiteralString(uSearchString), results);    
+
+    AutoCompleteStatus status = nsIAutoCompleteStatus::failed;
+    if (NS_FAILED(rv)) return NS_OK;
+    
+    PRBool addedDefaultItem = PR_FALSE;
+
+    results->SetSearchString(uSearchString);
+    results->SetDefaultItemIndex(-1);
+
+    nsCOMPtr<nsISupportsArray> array;
+    rv = results->GetItems(getter_AddRefs(array));
+
+    if (NS_FAILED(rv)) return NS_OK;
+    
+    PRUint32 nbrOfItems;
+    rv = array->Count(&nbrOfItems);
+
+    if (NS_SUCCEEDED(rv)) {
+        if (nbrOfItems > 1) {
+            results->SetDefaultItemIndex(addedDefaultItem ? 1 : 0);
+            status = nsIAutoCompleteStatus::matchFound;
+        }
+        else {
+            if (nbrOfItems == 1) {
+                results->SetDefaultItemIndex(0);
+                status = nsIAutoCompleteStatus::matchFound;
+            }
+            else
+                status = nsIAutoCompleteStatus::noMatch;
+        }
+    }  // NS_SUCCEEDED(rv)
+
+    listener->OnAutoComplete(results, status);
+    
+    return NS_OK;
+}
+
+#if 0
+NS_IMETHODIMP
+nsUrlbarHistory::SearchPreviousResults(const PRUnichar *searchStr,
+                                       nsIAutoCompleteResults *previousSearchResult)
+{
+    if (!previousSearchResult)
+        return NS_ERROR_NULL_POINTER;
+        
+    nsXPIDLString prevSearchString;
+    PRUint32 searchStrLen = nsCRT::strlen(searchStr);
+    nsresult rv;
+
+    rv = previousSearchResult->GetSearchString(getter_Copies(prevSearchString));
+    if (NS_FAILED(rv))
+        return NS_ERROR_FAILURE;
+    
+    if (!(const PRUnichar*)prevSearchString)
+        return NS_ERROR_FAILURE;
+    
+    PRUint32 prevSearchStrLen = nsCRT::strlen(prevSearchString);
+    if (searchStrLen < prevSearchStrLen || nsCRT::strncasecmp(searchStr, prevSearchString, prevSearchStrLen != 0))
+        return NS_ERROR_ABORT;
+
+    nsCOMPtr<nsISupportsArray> array;
+    rv = previousSearchResult->GetItems(getter_AddRefs(array));
+
+    if (NS_FAILED(rv)) return rv;
+    
+    PRUint32 nbrOfItems;
+    PRUint32 i;
+        
+    rv = array->Count(&nbrOfItems);
+    if (NS_FAILED(rv) || nbrOfItems <= 0)
+        return NS_ERROR_FAILURE;
+        
+    nsCOMPtr<nsISupports> item;
+    nsCOMPtr<nsIAutoCompleteItem> resultItem;
+        
+    // XXX I don't understand the purpose of this loop!
+    for (i = 0; i < nbrOfItems; i ++) {
+        rv = array->QueryElementAt(i, NS_GET_IID(nsIAutoCompleteItem),
+                                   getter_AddRefs(resultItem));
+        if (NS_FAILED(rv))
+            return NS_ERROR_FAILURE;
+
+        nsXPIDLString itemValue;
+        resultItem->GetValue(getter_Copies(itemValue));
+
+        // nsCAutoString itemAutoStr;
+        // itemAutoStr.AssignWithConversion(itemValue);
+        // printf("SearchPreviousResults::Comparing %s with %s \n", searchAutoStr.ToNewCString(), itemAutoStr.get());
+        if (!(const PRUnichar*)itemValue)
+            continue;
+            
+        if (nsCRT::strncasecmp(searchStr, itemValue, searchStrLen) == 0)
+            continue;
+			
+    }
+    
+    return NS_OK;
+}
+#endif
+
+NS_IMETHODIMP
+nsUrlbarHistory::SearchCache(nsAReadableString& searchStr,
+                             nsIAutoCompleteResults* results)
+{
+    nsresult rv = NS_OK;
+	nsCOMPtr<nsISimpleEnumerator>  entries;
+
+    //printf("******** In SearchCache *******\n");
+	
+	PRInt32  protocolIndex=-1;
+    nsAutoString searchProtocol, searchPath;
+    PRInt32 searchPathIndex, searchStrLength;
+
+    // Get the length of the search string
+    searchStrLength = searchStr.Length();
+    // Check if there is any protocol present in the 
+    // search string.
+    GetHostIndex(searchStr, &searchPathIndex);
+    if (searchPathIndex > 0) {
+        // There was a protocol in the search string. Strip off
+        // the protocol from the rest of the url  
+        searchStr.Left(searchProtocol, searchPathIndex);
+        searchStr.Mid(searchPath, searchPathIndex, searchStrLength);
+    }
+    else {
+        // There was no protocol in the search string. 
+        searchPath = searchStr;
+    }
+	//printf("Search String is %s path = %s protocol = %s \n", searchStr.ToNewCString(), searchPath.ToNewCString(), searchProtocol.ToNewCString());
+	   
+	if (!gRDFCUtils || !kNC_URLBARHISTORY)
+        return NS_ERROR_FAILURE;
+
+
+	nsCOMPtr<nsIRDFContainer> container;
+    /* Get the elements in the  data source
+     * through the container
+     */
+	rv = gRDFCUtils->MakeSeq(mDataSource,
+                            kNC_URLBARHISTORY,
+                            getter_AddRefs(container));
+
+    NS_ENSURE_TRUE(container, NS_ERROR_FAILURE);
+ 
+    //Get the elements from the container
+    container->GetElements(getter_AddRefs(entries));
+
+    NS_ENSURE_TRUE(entries, NS_ERROR_FAILURE);
+    
+    PRBool moreElements = PR_FALSE;
+    while (NS_SUCCEEDED(entries->HasMoreElements(&moreElements)) && moreElements) {
+       nsCOMPtr<nsISupports>  entry;
+       nsCOMPtr<nsIRDFLiteral>  literal;
+       nsAutoString rdfProtocol, rdfPath;
+       PRInt32 rdfPathIndex, index = -1;
+       nsAutoString match;
+       const PRUnichar * rdfValue = nsnull;   
+
+       rv = entries->GetNext(getter_AddRefs(entry));
+       if (entry) {
+         literal = do_QueryInterface(entry);
+         literal->GetValueConst(&rdfValue);
+       }      
+       if (!rdfValue)
+          continue;
+       nsLiteralString valueStr(rdfValue);
+
+       // Get the index of the hostname in the rdf string
+       GetHostIndex (valueStr, &rdfPathIndex);
+
+       if (rdfPathIndex > 0) {
+          // RDf string has a protocol in it, Strip it off
+          // from the rest of the url;
+          valueStr.Left(rdfProtocol, rdfPathIndex);
+          valueStr.Mid(rdfPath, rdfPathIndex, valueStr.Length());
+       }
+       else {
+          // There was no protocol.
+          rdfPath = valueStr;
+       }
+       //printf("RDFString is %s path = %s protocol = %s\n", valueStr.ToNewCString(), rdfPath.ToNewCString(), rdfProtocol.ToNewCString());
+       // We have all the data we need. Let's do the comparison
+       // We compare the path first and compare the protocol next
+       index = rdfPath.Find(searchPath, PR_TRUE);       
+       if (index == 0) {
+           // The paths match. Now let's compare protocols
+           if (searchProtocol.Length() && rdfProtocol.Length()) {
+              // Both the strings have a protocol part. Compare them.
+              protocolIndex = rdfProtocol.Find(searchProtocol);
+              if (protocolIndex == 0) {
+                  // Both protocols match. We found a result item
+                  match = valueStr;
+              } 
+           } 
+           else if (searchProtocol.Length() && (rdfProtocol.Length() <= 0)) {
+               /* The searchString has a protocol but the rdf string doesn't
+                * Check if the searchprotocol is the default "http://". If so,
+                * prepend the searchProtocol to the rdfPath and provide that as 
+                * the result. Otherwise we don't have a match
+                */
+               // XXX I guess  hard-coded "http://" is OK, since netlib considers
+               // all urls to be char *
+               if ((searchProtocol.Find("http://", PR_TRUE)) == 0) {
+                  match = searchProtocol + rdfPath;
+               }
+           }
+           else if ((searchProtocol.Length() <=0) && rdfProtocol.Length() ||
+                    (searchProtocol.Length() <=0) && (rdfProtocol.Length() <= 0)) {
+               /* Provide the rdfPath (no protocol, just the www.xyz.com/... part) 
+                * as the result for the following 2 cases.
+                * a) searchString has no protocol but rdfString has protocol
+                * b) Both searchString and rdfString don't have a protocol
+                */ 
+               match = rdfPath;
+           }           
+       }  // (index == 0)
+
+      
+	   
+       if (!match.IsEmpty()) {		   
+           /* We have a result item.
+            * First make sure that the value is not already
+            * present in the results array. If we have  
+            * www.mozilla.org and http://www.mozilla.org as unique addresses
+            * in the history and due to the algorithm we follow above to find a match,
+            * when the user user types, http://www.m, we would have 2 matches, both being,
+            * http://www.mozilla.org. So, before adding an entry as a result,
+            * make sure it is not already present in the resultarray
+            */
+           PRBool itemPresent = PR_FALSE;
+           rv = CheckItemAvailability(match, results, &itemPresent);
+           if (itemPresent) {
+               continue;
+           }
+           //Create an AutoComplete Item 
+		   nsCOMPtr<nsIAutoCompleteItem> newItem(do_CreateInstance(NS_AUTOCOMPLETEITEM_CONTRACTID));
+		   NS_ENSURE_TRUE(newItem, NS_ERROR_FAILURE);
+           
+           newItem->SetValue(match.get());
+           nsCOMPtr<nsISupportsArray> array;
+           rv = results->GetItems(getter_AddRefs(array));
+           if (NS_SUCCEEDED(rv))
+		   { 
+			  // printf("Appending element %s to the results array\n", item->ToNewCString());
+                array->AppendElement((nsISupports*)newItem);
+		   }	
+           /* The result may be much more than what was asked for. For example
+            * the user types http://www.moz and we had http://www.mozilla.org/sidebar
+            * as an entry in the history. This will match our selection criteria above
+            * above and will be provided as result. But the user may actually want to 
+            * go to http://www.mozilla.org. If we are such a situation, offer
+            * http://www.mozilla.org (The first part of the result string http://www.mozilla.org/sidebar)
+            * as a result option(probably the default result).
+            */
+            rv = VerifyAndCreateEntry(searchStr, match, results);
+	   }   
+
+    }    // while 
+    return rv;
+}
+
+
+NS_IMETHODIMP
+nsUrlbarHistory::GetHostIndex(nsAReadableString& aPath, PRInt32 * aReturn)
+{
+    if (!aReturn)
+        return NS_ERROR_FAILURE;
+
+    PRInt32 slashIndex=-1;    
+    nsresult rv;
+    
+    nsCOMPtr<nsIURL> pathURL=do_CreateInstance(kStandardURLCID, &rv);
+    if (pathURL) {
+       pathURL->SetSpec(NS_ConvertUCS2toUTF8(aPath).get());
+       nsXPIDLCString host, preHost, filePath;
+
+       pathURL->GetHost(getter_Copies(host));
+       pathURL->GetFilePath(getter_Copies(filePath));
+       pathURL->GetPreHost(getter_Copies(preHost));
+       
+       nsAutoString path(aPath);
+       if ((const char*)preHost) 
+           slashIndex  = path.Find(preHost, PR_TRUE);
+       else if ((const char *)host)
+           slashIndex = path.Find(host,PR_TRUE);
+       else if ((const char *)filePath)
+           slashIndex = path.Find(filePath, PR_TRUE);
+       else
+           slashIndex = 0;
+       
+       //printf("$$$$ Scheme for uri = %s, preHost = %s, filepath = %s, Host = %s HostIndex = %d\n", pathScheme, preHost, filePath, pathHost, *aReturn);
+    }
+
+    *aReturn = slashIndex;
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsUrlbarHistory::CheckItemAvailability(nsAReadableString& aItem,
+                                       nsIAutoCompleteResults * aArray,
+                                       PRBool * aResult)
+{
+    if (!aArray)
+        return PR_FALSE;
+    
+    nsresult rv;
+    *aResult = PR_FALSE;
+
+    nsCOMPtr<nsISupportsArray> array;
+    rv = aArray->GetItems(getter_AddRefs(array));
+
+    // no item array, just return false;
+    if (NS_FAILED(rv)) return NS_OK;
+
+    PRUint32 nbrOfItems=0;
+    PRUint32 i;
+        
+    rv = array->Count(&nbrOfItems);
+    // If there is no item found in the array, return false
+    if (nbrOfItems <= 0)
+        return NS_OK;
+        
+    nsCOMPtr <nsIAutoCompleteItem> resultItem;
+    for (i = 0; i < nbrOfItems; i ++) {
+
+        rv = array->QueryElementAt(i, NS_GET_IID(nsIAutoCompleteItem),
+                                   getter_AddRefs(resultItem));
+        if (NS_FAILED(rv))
+            return NS_ERROR_FAILURE;
+
+        nsXPIDLString itemValue;
+        resultItem->GetValue(getter_Copies(itemValue));
+        // Using nsIURI to do comparisons didn't quite work out.
+        // So use nsCRT methods
+        if (aItem.Equals(itemValue))
+            {
+                //printf("In CheckItemAvailability. Item already found\n");
+                *aResult = PR_TRUE;
+                break;
+            }
+    }  // for
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsUrlbarHistory::VerifyAndCreateEntry(nsAReadableString& aSearchItem,
+                                      nsString& aMatchStr,
+                                      nsIAutoCompleteResults * aResultArray)
+{
+    if (!aResultArray)
+        return NS_ERROR_FAILURE;
+
+    PRInt32 searchStrLen = aSearchItem.Length();
+    nsresult rv;
+    nsCOMPtr<nsIURL>  searchURL = do_CreateInstance(kStandardURLCID, &rv);
+    if (searchURL) {
+        searchURL->SetSpec(NS_ConvertUCS2toUTF8(aSearchItem).get());
+        nsXPIDLCString filePath;
+        searchURL->GetFilePath(getter_Copies(filePath));
+        // Don't bother checking for hostname if the search string
+        // already has a filepath;
+        if (filePath && (nsCRT::strlen(filePath) > 1)) {
+            return NS_OK;
+        }
+    }
+          
+    nsCOMPtr<nsIURL> matchURL = do_CreateInstance(kStandardURLCID, &rv);
+    if (matchURL) {
+        matchURL->SetSpec(NS_ConvertUCS2toUTF8(aMatchStr).get());
+        nsXPIDLCString filePath;
+        matchURL->GetFilePath(getter_Copies(filePath));
+        // If the match string doesn't have a filepath
+        // we need to do nothing here,  return.
+        if (!filePath || (filePath && (nsCRT::strlen(filePath) <=1)))
+            return NS_OK;
+        
+        // Find the position of the filepath in the result string
+        PRInt32 slashIndex = aMatchStr.Find("/", PR_FALSE, searchStrLen);
+        // Extract the host name
+        nsAutoString hostName;
+        aMatchStr.Left(hostName, slashIndex);
+        //printf("#### Host Name is %s\n", hostName.ToNewCString());
+        // Check if this host is already present in the result array
+        // If not add it to the result array
+        PRBool itemAvailable = PR_TRUE;
+        CheckItemAvailability(hostName, aResultArray, &itemAvailable);
+        if (!itemAvailable) {
+            // Insert the host name to the result array at the top
+            //Create an AutoComplete Item 
+		    nsCOMPtr<nsIAutoCompleteItem> newItem(do_CreateInstance(NS_AUTOCOMPLETEITEM_CONTRACTID));
+            NS_ENSURE_TRUE(newItem, NS_ERROR_FAILURE);            
+            newItem->SetValue(hostName.GetUnicode());
+            nsCOMPtr<nsISupportsArray> array;
+            rv = aResultArray->GetItems(getter_AddRefs(array));
+            // Always insert the host entry at the top of the array
+            if (NS_SUCCEEDED(rv)) {
+                array->InsertElementAt(newItem, 0);
+            }
+        }       
+    }
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP
+nsUrlbarHistory::OnStopLookup()
+{
+    printf("nsUrlbarHistory::OnStopLookup()\n");
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsUrlbarHistory::OnAutoComplete(const PRUnichar *searchString,
+                                nsIAutoCompleteResults *previousSearchResult,
+                                nsIAutoCompleteListener *listener)
+{
+#if 1
+    printf("nsUrlbarHistory::OnAutoComplete(%s)\n", NS_ConvertUCS2toUTF8(searchString));
+#endif
+	return NS_OK;
+}
+
+NS_IMETHODIMP
+nsUrlbarHistory::Observe(nsISupports *aSubject, const PRUnichar *aTopic,
+                         const PRUnichar *aSomeData)
+{
+    nsresult rv;
+    
+    if (nsCRT::strcmp(aTopic, NS_LITERAL_STRING("nsPref:changed").get())==0) {
+        
+        nsCOMPtr<nsIPref> prefs=do_QueryInterface(aSubject, &rv);
+        if (NS_SUCCEEDED(rv))
+            prefs->GetBoolPref(PREF_AUTOCOMPLETE_ENABLED, &mEnabled);
+
+    }
+    return NS_OK;
+}

mozilla/xpfe/components/urlbarhistory/src/nsUrlbarHistory.h

@@ -0,0 +1,68 @@
+/* -*- Mode: IDL; tab-width: 4; 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 the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications, Inc.  Portions created by Netscape are
+ * Copyright (C) 1999, Mozilla.  All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Radha Kulkarni <radha@netscape.com>
+ */
+
+#ifndef nsUrlbarHistory_h
+#define nsUrlbarHistory_h
+
+// Helper Classes
+#include "nsCOMPtr.h"
+
+//Interfaces Needed
+#include "nsIUrlbarHistory.h"
+#include "nsIAutoCompleteSession.h"
+#include "nsIObserver.h"
+#include "nsVoidArray.h"
+#include "nsIRDFService.h"
+#include "nsIRDFDataSource.h"
+#include "nsRDFCID.h"
+
+class nsUrlbarHistory: public nsIUrlbarHistory,
+                       public nsIObserver,
+                       public nsIAutoCompleteSession
+{
+public:
+	nsUrlbarHistory();
+
+	NS_DECL_ISUPPORTS
+	NS_DECL_NSIURLBARHISTORY
+    NS_DECL_NSIOBSERVER
+	NS_DECL_NSIAUTOCOMPLETESESSION
+
+protected:
+   virtual ~nsUrlbarHistory();
+
+#if 0
+   NS_IMETHOD SearchPreviousResults(const PRUnichar *, nsIAutoCompleteResults *);
+#endif
+   NS_IMETHOD SearchCache(nsAReadableString&, nsIAutoCompleteResults *);
+   NS_IMETHOD GetHostIndex(nsAReadableString& aPath, PRInt32 * aReturn);
+   NS_IMETHOD CheckItemAvailability(nsAReadableString& aItem, nsIAutoCompleteResults * aArray, PRBool * aResult);
+   NS_IMETHOD VerifyAndCreateEntry(nsAReadableString& aItem, nsString& aMatchItem, nsIAutoCompleteResults * aArray);
+
+private:
+	nsStringArray  mIgnoreArray;
+	nsCOMPtr<nsIRDFDataSource> mDataSource;
+    PRBool mEnabled;
+};
+
+
+#endif   /* nsUrlbarHistory */