Commit dd2848c6 authored by Dave Townsend's avatar Dave Townsend
Browse files

Backed out changeset 461d728271d1

parent 6a70c371

caps/include/nsPrincipal.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 


#include "nsAutoPtr.h"

#include "nsCOMPtr.h"

#include "nsVoidArray.h"

#include "nsHashtable.h"

#include "nsJSPrincipals.h"

#include "nsTArray.h"

caps/src/nsPrincipal.cpp

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include "nsIProtocolHandler.h"

#include "nsNetUtil.h"

#include "nsJSPrincipals.h"

#include "nsVoidArray.h"

#include "nsHashtable.h"

#include "nsIObjectInputStream.h"

#include "nsIObjectOutputStream.h"

chrome/src/nsChromeRegistry.cpp

+16 −5
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ CanLoadResource(nsIURI* aResourceURI) 
nsChromeRegistry::ProviderEntry*

nsChromeRegistry::nsProviderArray::GetProvider(const nsACString& aPreferred, MatchType aType)

{

  PRInt32 i = mArray.Length();

  PRInt32 i = mArray.Count();

  if (!i)

    return nsnull;
@@ -274,7 +274,7 @@ nsChromeRegistry::nsProviderArray::GetProvider(const nsACString& aPreferred, Mat 
  ProviderEntry* entry;



  while (i--) {

    entry = &mArray[i];

    entry = reinterpret_cast<ProviderEntry*>(mArray[i]);

    if (aPreferred.Equals(entry->provider))

      return entry;
@@ -329,21 +329,32 @@ nsChromeRegistry::nsProviderArray::SetBase(const nsACString& aProvider, nsIURI* 
  }



  // no existing entries, add a new one

  mArray.AppendElement(ProviderEntry(aProvider, aBaseURL));

  provider = new ProviderEntry(aProvider, aBaseURL);

  if (!provider)

    return; // It's safe to silently fail on OOM



  mArray.AppendElement(provider);

}



void

nsChromeRegistry::nsProviderArray::EnumerateToArray(nsTArray<nsCString> *a)

{

  PRInt32 i = mArray.Length();

  PRInt32 i = mArray.Count();

  while (i--) {

    a->AppendElement(mArray[i].provider);

    ProviderEntry *entry = reinterpret_cast<ProviderEntry*>(mArray[i]);

    a->AppendElement(entry->provider);

  }

}



void

nsChromeRegistry::nsProviderArray::Clear()

{

  PRInt32 i = mArray.Count();

  while (i--) {

    ProviderEntry* entry = reinterpret_cast<ProviderEntry*>(mArray[i]);

    delete entry;

  }



  mArray.Clear();

}

chrome/src/nsChromeRegistry.h

+2 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include "nsString.h"

#include "nsTHashtable.h"

#include "nsURIHashKey.h"

#include "nsVoidArray.h"

#include "nsTArray.h"

#include "nsInterfaceHashtable.h"
@@ -170,7 +171,7 @@ public: 
  private:

    ProviderEntry* GetProvider(const nsACString& aPreferred, MatchType aType);



    nsTArray<ProviderEntry> mArray;

    nsVoidArray mArray;

  };



  struct PackageEntry : public PLDHashEntryHdr

db/morkreader/nsMorkReader.cpp

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include "nsMorkReader.h"

#include "prio.h"

#include "nsNetUtil.h"

#include "nsVoidArray.h"



// A FixedString implementation that can hold 2 80-character lines

class nsCLineString : public nsFixedCString