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 968012, part 2 - Convert nsWindowDataSource::mWindowResources to nsInterfaceHashtable. r=froydnj

Browse Source
This commit is contained in:
Andrew McCreight 2014-02-11 14:56:45 -08:00
parent 3c02bd87da
commit 1d21f564cc
2 changed files with 23 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
xpfe/components/windowds/nsWindowDataSource.cpp
View File

@ -127,21 +127,16 @@ nsWindowDataSource::OnWindowTitleChange(nsIXULWindow *window,
{
nsresult rv;
nsVoidKey key(window);
nsCOMPtr<nsISupports> sup =
dont_AddRef(mWindowResources.Get(&key));
nsCOMPtr<nsIRDFResource> windowResource;
mWindowResources.Get(window, getter_AddRefs(windowResource));
// oops, make sure this window is in the hashtable!
if (!sup) {
if (!windowResource) {
OnOpenWindow(window);
sup = dont_AddRef(mWindowResources.Get(&key));
mWindowResources.Get(window, getter_AddRefs(windowResource));
}
NS_ENSURE_TRUE(sup, NS_ERROR_UNEXPECTED);
nsCOMPtr<nsIRDFResource> windowResource =
do_QueryInterface(sup);
NS_ENSURE_TRUE(windowResource, NS_ERROR_UNEXPECTED);
nsCOMPtr<nsIRDFLiteral> newTitleLiteral;
rv = gRDFService->GetLiteral(newTitle, getter_AddRefs(newTitleLiteral));
@ -178,8 +173,7 @@ nsWindowDataSource::OnOpenWindow(nsIXULWindow *window)
nsCOMPtr<nsIRDFResource> windowResource;
gRDFService->GetResource(windowId, getter_AddRefs(windowResource));
nsVoidKey key(window);
mWindowResources.Put(&key, windowResource);
mWindowResources.Put(window, windowResource);
// assert the new window
if (mContainer)
@ -192,13 +186,14 @@ nsWindowDataSource::OnOpenWindow(nsIXULWindow *window)
NS_IMETHODIMP
nsWindowDataSource::OnCloseWindow(nsIXULWindow *window)
{
nsVoidKey key(window);
nsCOMPtr<nsIRDFResource> resource;
nsresult rv;
if (!mWindowResources.Remove(&key, getter_AddRefs(resource)))
nsCOMPtr<nsIRDFResource> resource;
mWindowResources.Get(window, getter_AddRefs(resource));
if (!resource) {
return NS_ERROR_UNEXPECTED;
}
mWindowResources.Remove(window);
// make sure we're not shutting down
if (!mContainer) return NS_OK;
@ -279,24 +274,16 @@ struct findWindowClosure {
nsIXULWindow *resultWindow;
};
static bool
findWindow(nsHashKey* aKey, void *aData, void* aClosure)
static PLDHashOperator
findWindow(nsIXULWindow* aWindow, nsIRDFResource* aResource, void* aClosure)
{
nsVoidKey *thisKey = static_cast<nsVoidKey*>(aKey);
findWindowClosure* closure = static_cast<findWindowClosure*>(aClosure);
nsIRDFResource *resource =
static_cast<nsIRDFResource*>(aData);
findWindowClosure* closure =
static_cast<findWindowClosure*>(aClosure);
if (resource == closure->targetResource) {
closure->resultWindow =
static_cast<nsIXULWindow*>
(thisKey->GetValue());
return false; // stop enumerating
if (aResource == closure->targetResource) {
closure->resultWindow = aWindow;
return PL_DHASH_STOP;
}
return true;
return PL_DHASH_NEXT;
}
// nsIWindowDataSource implementation
@ -311,7 +298,7 @@ nsWindowDataSource::GetWindowForResource(const char *aResourceString,
// now reverse-lookup in the hashtable
findWindowClosure closure = { windowResource.get(), nullptr };
mWindowResources.Enumerate(findWindow, (void*)&closure);
mWindowResources.EnumerateRead(findWindow, &closure);
if (closure.resultWindow) {
// this sucks, we have to jump through docshell to go from

5
xpfe/components/windowds/nsWindowDataSource.h
View File

@ -8,9 +8,10 @@
#include "nsIWindowDataSource.h"
#include "nsIObserver.h"
#include "nsHashKeys.h"
#include "nsIRDFService.h"
#include "nsIRDFContainer.h"
#include "nsHashtable.h"
#include "nsInterfaceHashtable.h"
#include "nsCycleCollectionParticipant.h"
// {C744CA3D-840B-460a-8D70-7CE63C51C958}
@ -41,7 +42,7 @@ class nsWindowDataSource : public nsIRDFDataSource,
private:
// mapping of window -> RDF resource
nsSupportsHashtable mWindowResources;
nsInterfaceHashtable<nsPtrHashKey<nsIXULWindow>, nsIRDFResource> mWindowResources;
static uint32_t windowCount;
static uint32_t gRefCnt;