wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 847248 (part 7) - Remove nsFixedSizeAllocator from nsXBLService. r=bz.

Browse Source 
--HG--
extra : rebase_source : df6db83d51472ec57a72bf657e38f126326b389a
This commit is contained in:
Nicholas Nethercote 2013-03-05 04:37:47 -08:00
parent ef56c3a7ff
commit f42c5af971
2 changed files with 5 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
content/xbl/src/nsXBLService.cpp
View File

@ -107,18 +107,6 @@ public:
nsCOMPtr<nsIURI> mBindingURI;
nsCOMPtr<nsIContent> mBoundElement;
static nsXBLBindingRequest*
Create(nsFixedSizeAllocator& aPool, nsIURI* aURI, nsIContent* aBoundElement) {
void* place = aPool.Alloc(sizeof(nsXBLBindingRequest));
return place ? ::new (place) nsXBLBindingRequest(aURI, aBoundElement) : nullptr;
}
static void
Destroy(nsFixedSizeAllocator& aPool, nsXBLBindingRequest* aRequest) {
aRequest->~nsXBLBindingRequest();
aPool.Free(aRequest, sizeof(*aRequest));
}
void DocumentLoaded(nsIDocument* aBindingDoc)
{
// We only need the document here to cause frame construction, so
@ -157,28 +145,13 @@ public:
}
}
protected:
nsXBLBindingRequest(nsIURI* aURI, nsIContent* aBoundElement)
: mBindingURI(aURI),
mBoundElement(aBoundElement)
{
}
private:
// Hide so that only Create() and Destroy() can be used to
// allocate and deallocate from the heap
static void* operator new(size_t) CPP_THROW_NEW { return 0; }
static void operator delete(void*, size_t) {}
};
static const size_t kBucketSizes[] = {
sizeof(nsXBLBindingRequest)
};
static const int32_t kNumBuckets = sizeof(kBucketSizes)/sizeof(size_t);
static const int32_t kNumElements = 64;
static const int32_t kInitialSize = sizeof(nsXBLBindingRequest) * kNumElements;
// nsXBLStreamListener, a helper class used for
// asynchronous parsing of URLs
/* Header file */
@ -227,13 +200,13 @@ nsXBLStreamListener::~nsXBLStreamListener()
{
for (uint32_t i = 0; i < mBindingRequests.Length(); i++) {
nsXBLBindingRequest* req = mBindingRequests.ElementAt(i);
nsXBLBindingRequest::Destroy(nsXBLService::GetInstance()->mPool, req);
delete req;
}
}
NS_IMETHODIMP
nsXBLStreamListener::OnDataAvailable(nsIRequest *request, nsISupports* aCtxt,
nsIInputStream* aInStr,
nsIInputStream* aInStr,
uint64_t aSourceOffset, uint32_t aCount)
{
if (mInner)
@ -419,8 +392,6 @@ nsXBLService::Init()
// Constructors/Destructors
nsXBLService::nsXBLService(void)
{
mPool.Init("XBL Binding Requests", kBucketSizes, kNumBuckets, kInitialSize);
gClassTable = new nsHashtable();
Preferences::AddBoolVarCache(&gAllowDataURIs, "layout.debug.enable_data_xbl");
@ -970,7 +941,7 @@ nsXBLService::LoadBindingDocumentInfo(nsIContent* aBoundElement,
static_cast<nsXBLStreamListener*>(listener.get());
// Create a new load observer.
if (!xblListener->HasRequest(aBindingURI, aBoundElement)) {
nsXBLBindingRequest* req = nsXBLBindingRequest::Create(mPool, aBindingURI, aBoundElement);
nsXBLBindingRequest* req = new nsXBLBindingRequest(aBindingURI, aBoundElement);
xblListener->AddRequest(req);
}
return NS_OK;
@ -1094,9 +1065,8 @@ nsXBLService::FetchBindingDocument(nsIContent* aBoundElement, nsIDocument* aBoun
bindingManager->PutLoadingDocListener(aDocumentURI, xblListener);
// Add our request.
nsXBLBindingRequest* req = nsXBLBindingRequest::Create(mPool,
aBindingURI,
aBoundElement);
nsXBLBindingRequest* req = new nsXBLBindingRequest(aBindingURI,
aBoundElement);
xblListener->AddRequest(req);
// Now kick off the async read.

3
content/xbl/src/nsXBLService.h
View File

@ -13,7 +13,6 @@
#include "nsWeakReference.h"
#include "jsapi.h" // nsXBLJSClass derives from JSClass
#include "jsclist.h" // nsXBLJSClass derives from JSCList
#include "nsFixedSizeAllocator.h"
#include "nsTArray.h"
class nsXBLBinding;
@ -126,8 +125,6 @@ public:
static bool gAllowDataURIs; // Whether we should allow data
// urls in -moz-binding. Needed for
// testing.
nsFixedSizeAllocator mPool;
};
class nsXBLJSClass : public JSCList, public JSClass