Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 363067, Add nsPIDOMEventTarget and kill nsIChromeEventHandler, r=jst, sr=sicking

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@220346 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
Olli.Pettay%helsinki.fi
2007-02-15 23:04:33 +00:00
parent 589b161152
commit 49e16cb1d6
48 changed files with 316 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -67,7 +67,7 @@
#include "nsIMarkupDocumentViewer.h"
#include "nsXPIDLString.h"
#include "nsReadableUtils.h"
#include "nsIChromeEventHandler.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMChromeWindow.h"
#include "nsIDOMWindowInternal.h"
#include "nsIWebBrowserChrome.h"
@@ -1110,10 +1110,12 @@ nsDocShell::GetContentViewer(nsIContentViewer ** aContentViewer)
}
NS_IMETHODIMP
nsDocShell::SetChromeEventHandler(nsIChromeEventHandler * aChromeEventHandler)
nsDocShell::SetChromeEventHandler(nsIDOMEventTarget* aChromeEventHandler)
{
nsCOMPtr<nsPIDOMEventTarget> piTarget =
do_QueryInterface(aChromeEventHandler);
// Weak reference. Don't addref.
mChromeEventHandler = aChromeEventHandler;
mChromeEventHandler = piTarget;
NS_ASSERTION(!mScriptGlobal,
"SetChromeEventHandler() called after the script global "
@@ -1126,12 +1128,11 @@ nsDocShell::SetChromeEventHandler(nsIChromeEventHandler * aChromeEventHandler)
}
NS_IMETHODIMP
nsDocShell::GetChromeEventHandler(nsIChromeEventHandler ** aChromeEventHandler)
nsDocShell::GetChromeEventHandler(nsIDOMEventTarget** aChromeEventHandler)
{
NS_ENSURE_ARG_POINTER(aChromeEventHandler);
*aChromeEventHandler = mChromeEventHandler;
NS_IF_ADDREF(*aChromeEventHandler);
nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(mChromeEventHandler);
target.swap(*aChromeEventHandler);
return NS_OK;
}