Bug 456388 - "Remove PR_STATIC_CALLBACK and PR_CALLBACK(_DECL) from the tree" (followup for mozilla-central) [r+sr=brendan]
authorArpad Borsos <arpad.borsos@googlemail.com>
Tue, 21 Oct 2008 01:50:05 -0500
changeset 20705 c53251d62ddf3b05e6c27346d4a49014e368022c
parent 20704 adf33dbb59d04461121d236451dc8b5973b96fab
child 20706 30d9ff763b22cd5d5cdc39bfda75cfb4b9c277b7
child 20708 37c3a69086e7b5fe8349068fc263e30d378e3758
push id3075
push userreed@reedloden.com
push dateTue, 21 Oct 2008 06:50:15 +0000
treeherdermozilla-central@c53251d62ddf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs456388
milestone1.9.1b2pre
Bug 456388 - "Remove PR_STATIC_CALLBACK and PR_CALLBACK(_DECL) from the tree" (followup for mozilla-central) [r+sr=brendan]
content/base/src/nsDocument.cpp
content/base/src/nsXMLHttpRequest.cpp
content/base/src/nsXMLHttpRequest.h
gfx/thebes/src/gfxWindowsPlatform.cpp
layout/base/nsDocumentViewer.cpp
layout/svg/base/src/nsSVGEffects.cpp
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -801,17 +801,17 @@ nsExternalResourceMap::RequestResource(n
 
 struct
 nsExternalResourceEnumArgs
 {
   nsIDocument::nsSubDocEnumFunc callback;
   void *data;
 };
 
-PR_STATIC_CALLBACK(PLDHashOperator)
+static PLDHashOperator
 ExternalResourceEnumerator(nsIURI* aKey,
                            nsExternalResourceMap::ExternalResource* aData,
                            void* aClosure)
 {
   nsExternalResourceEnumArgs* args =
     static_cast<nsExternalResourceEnumArgs*>(aClosure);
   PRBool next =
     aData->mDocument ? args->callback(aData->mDocument, args->data) : PR_TRUE;
@@ -821,17 +821,17 @@ ExternalResourceEnumerator(nsIURI* aKey,
 void
 nsExternalResourceMap::EnumerateResources(nsIDocument::nsSubDocEnumFunc aCallback,
                                           void* aData)
 {
   nsExternalResourceEnumArgs args = { aCallback, aData };
   mMap.EnumerateRead(ExternalResourceEnumerator, &args);
 }
 
-PR_STATIC_CALLBACK(PLDHashOperator)
+static PLDHashOperator
 ExternalResourceTraverser(nsIURI* aKey,
                           nsExternalResourceMap::ExternalResource* aData,
                           void* aClosure)
 {
   nsCycleCollectionTraversalCallback *cb = 
     static_cast<nsCycleCollectionTraversalCallback*>(aClosure);
 
   NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(*cb,
--- a/content/base/src/nsXMLHttpRequest.cpp
+++ b/content/base/src/nsXMLHttpRequest.cpp
@@ -969,17 +969,17 @@ nsAccessControlLRUCache::GetEntry(nsIURI
 
 void
 nsAccessControlLRUCache::Clear()
 {
   PR_INIT_CLIST(&mList);
   mTable.Clear();
 }
 
-/* static */ PR_CALLBACK PLDHashOperator
+/* static */ PLDHashOperator
 nsAccessControlLRUCache::RemoveExpiredEntries(const nsACString& aKey,
                                               nsAutoPtr<CacheEntry>& aValue,
                                               void* aUserData)
 {
   PRTime* now = static_cast<PRTime*>(aUserData);
   
   aValue->PurgeExpired(*now);
   
--- a/content/base/src/nsXMLHttpRequest.h
+++ b/content/base/src/nsXMLHttpRequest.h
@@ -125,17 +125,17 @@ public:
   }
 
   CacheEntry* GetEntry(nsIURI* aURI, nsIPrincipal* aPrincipal,
                        PRBool aWithCredentials, PRBool aCreate);
 
   void Clear();
 
 private:
-  PR_STATIC_CALLBACK(PLDHashOperator)
+  static PLDHashOperator
     RemoveExpiredEntries(const nsACString& aKey, nsAutoPtr<CacheEntry>& aValue,
                          void* aUserData);
 
   static PRBool GetCacheKey(nsIURI* aURI, nsIPrincipal* aPrincipal,
                             PRBool aWithCredentials, nsACString& _retval);
 
   nsClassHashtable<nsCStringHashKey, CacheEntry> mTable;
   PRCList mList;
--- a/gfx/thebes/src/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/src/gfxWindowsPlatform.cpp
@@ -570,17 +570,17 @@ FindFullNameForFace(const ENUMLOGFONTEXW
     
     return 0;  // stop iteration
 }
 
 
 // callback called for each family name, based on the assumption that the 
 // first part of the full name is the family name
 
-static PLDHashOperator PR_CALLBACK
+static PLDHashOperator
 FindFullName(nsStringHashKey::KeyType aKey,
              nsRefPtr<FontFamily>& aFontFamily,
              void* userArg)
 {
     FullFontNameSearch *data = reinterpret_cast<FullFontNameSearch*>(userArg);
 
     // does the family name match up to the length of the family name?
     const nsString& family = aFontFamily->Name();
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -2703,33 +2703,33 @@ SetChildTextZoom(nsIMarkupDocumentViewer
 
 static void
 SetChildFullZoom(nsIMarkupDocumentViewer* aChild, void* aClosure)
 {
   struct ZoomInfo* ZoomInfo = (struct ZoomInfo*) aClosure;
   aChild->SetFullZoom(ZoomInfo->mZoom);
 }
 
-PR_STATIC_CALLBACK(PRBool)
+static PRBool
 SetExtResourceTextZoom(nsIDocument* aDocument, void* aClosure)
 {
   // Would it be better to enumerate external resource viewers instead?
   nsIPresShell* shell = aDocument->GetPrimaryShell();
   if (shell) {
     nsPresContext* ctxt = shell->GetPresContext();
     if (ctxt) {
       struct ZoomInfo* ZoomInfo = static_cast<struct ZoomInfo*>(aClosure);
       ctxt->SetTextZoom(ZoomInfo->mZoom);
     }
   }
 
   return PR_TRUE;
 }
 
-PR_STATIC_CALLBACK(PRBool)
+static PRBool
 SetExtResourceFullZoom(nsIDocument* aDocument, void* aClosure)
 {
   // Would it be better to enumerate external resource viewers instead?
   nsIPresShell* shell = aDocument->GetPrimaryShell();
   if (shell) {
     nsPresContext* ctxt = shell->GetPresContext();
     if (ctxt) {
       struct ZoomInfo* ZoomInfo = static_cast<struct ZoomInfo*>(aClosure);
--- a/layout/svg/base/src/nsSVGEffects.cpp
+++ b/layout/svg/base/src/nsSVGEffects.cpp
@@ -393,17 +393,17 @@ nsSVGEffects::GetFilterProperty(nsIFrame
   NS_ASSERTION(!aFrame->GetPrevContinuation(), "aFrame should be first continuation");
 
   if (!aFrame->GetStyleSVGReset()->mFilter)
     return nsnull;
 
   return static_cast<nsSVGFilterProperty *>(aFrame->GetProperty(nsGkAtoms::filter));
 }
 
-static PLDHashOperator PR_CALLBACK
+static PLDHashOperator
 GatherEnumerator(nsVoidPtrHashKey* aEntry, void* aArg)
 {
   nsTArray<nsSVGRenderingObserver*>* array =
     static_cast<nsTArray<nsSVGRenderingObserver*>*>(aArg);
   array->AppendElement(static_cast<nsSVGRenderingObserver*>(
           const_cast<void*>(aEntry->GetKey())));
   return PL_DHASH_REMOVE;
 }