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 605492 part 2. Add a way to get an outer window object given its window id via windowutils. r=mrbkap

Browse Source
This commit is contained in:
Boris Zbarsky 2010-10-20 20:24:16 -04:00
parent fbab69d5ff
commit 53a6a5fae9
5 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dom/base/nsDOMWindowUtils.cpp
View File

@ -1550,3 +1550,12 @@ nsDOMWindowUtils::GetCursorType(PRInt16 *aCursor)
return NS_OK;
}
NS_IMETHODIMP
nsDOMWindowUtils::GetOuterWindowWithId(PRUint64 aWindowID,
nsIDOMWindow** aWindow)
{
*aWindow = nsGlobalWindow::GetOuterWindowWithId(aWindowID);
NS_IF_ADDREF(*aWindow);
return NS_OK;
}

18
dom/base/nsGlobalWindow.cpp
View File

@ -242,6 +242,7 @@ using mozilla::TimeStamp;
using mozilla::TimeDuration;
nsIDOMStorageList *nsGlobalWindow::sGlobalStorageList = nsnull;
nsGlobalWindow::WindowByIdTable *nsGlobalWindow::sOuterWindowsById = nsnull;
static nsIEntropyCollector *gEntropyCollector = nsnull;
static PRInt32 gRefCnt = 0;
@ -773,6 +774,18 @@ nsGlobalWindow::nsGlobalWindow(nsGlobalWindow *aOuterWindow)
mObserver = nsnull;
SetIsProxy();
if (!sOuterWindowsById) {
sOuterWindowsById = new WindowByIdTable();
if (!sOuterWindowsById->Init()) {
delete sOuterWindowsById;
sOuterWindowsById = nsnull;
}
}
if (sOuterWindowsById) {
sOuterWindowsById->Put(mWindowID, this);
}
}
// We could have failed the first time through trying
@ -825,8 +838,13 @@ nsGlobalWindow::nsGlobalWindow(nsGlobalWindow *aOuterWindow)
nsGlobalWindow::~nsGlobalWindow()
{
if (sOuterWindowsById) {
sOuterWindowsById->Remove(mWindowID);
}
if (!--gRefCnt) {
NS_IF_RELEASE(gEntropyCollector);
delete sOuterWindowsById;
sOuterWindowsById = nsnull;
}
#ifdef DEBUG
nsCAutoString url;

7
dom/base/nsGlobalWindow.h
View File

@ -562,6 +562,10 @@ public:
return mSerial;
}
static nsGlobalWindow* GetOuterWindowWithId(PRUint64 aWindowID) {
return sOuterWindowsById ? sOuterWindowsById->Get(aWindowID) : nsnull;
}
protected:
// Object Management
virtual ~nsGlobalWindow();
@ -946,6 +950,9 @@ protected:
friend class nsDOMWindowUtils;
friend class PostMessageEvent;
static nsIDOMStorageList* sGlobalStorageList;
typedef nsDataHashtable<nsUint64HashKey, nsGlobalWindow*> WindowByIdTable;
static WindowByIdTable* sOuterWindowsById;
};
/*

8
dom/interfaces/base/nsIDOMWindowUtils.idl
View File

@ -59,8 +59,9 @@ interface nsIDOMHTMLCanvasElement;
interface nsIDOMEvent;
interface nsITransferable;
interface nsIQueryContentEventResult;
interface nsIDOMWindow;
[scriptable, uuid(43fd9eb5-9e08-4d60-a305-3f87b1d5c398)]
[scriptable, uuid(33cbae2d-2361-4f3d-b589-cc55af07a434)]
interface nsIDOMWindowUtils : nsISupports {
/**
@ -789,6 +790,11 @@ interface nsIDOMWindowUtils : nsISupports {
*/
readonly attribute AString layerManagerType;
/**
* Return the outer window with the given ID, if any. Can return null.
*/
nsIDOMWindow getOuterWindowWithId(in unsigned long long aOuterWindowID);
%{C++
virtual nsresult RenderDocument(const nsRect& aRect,
PRUint32 aFlags,

27
xpcom/glue/nsHashKeys.h
View File

@ -59,6 +59,7 @@
* nsStringHashKey
* nsCStringHashKey
* nsUint32HashKey
* nsUint64HashKey
* nsPtrHashkey
* nsClearingPtrHashKey
* nsVoidPtrHashKey
@ -164,6 +165,32 @@ private:
const PRUint32 mValue;
};
/**
* hashkey wrapper using PRUint64 KeyType
*
* @see nsTHashtable::EntryType for specification
*/
class nsUint64HashKey : public PLDHashEntryHdr
{
public:
typedef const PRUint64& KeyType;
typedef const PRUint64* KeyTypePointer;
nsUint64HashKey(KeyTypePointer aKey) : mValue(*aKey) { }
nsUint64HashKey(const nsUint64HashKey& toCopy) : mValue(toCopy.mValue) { }
~nsUint64HashKey() { }
KeyType GetKey() const { return mValue; }
PRBool KeyEquals(KeyTypePointer aKey) const { return *aKey == mValue; }
static KeyTypePointer KeyToPointer(KeyType aKey) { return &aKey; }
static PLDHashNumber HashKey(KeyTypePointer aKey) { return *aKey; }
enum { ALLOW_MEMMOVE = PR_TRUE };
private:
const PRUint64 mValue;
};
/**
* hashkey wrapper using nsISupports* KeyType
*