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

deCOMtaminate nsPIDOMWindow (bug 242111). r+sr=jst.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@155867 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%brianryner.com
2004-05-03 21:48:36 +00:00
parent 6f62f5ebfc
commit 7247372aa3
59 changed files with 278 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
View File

@@ -88,6 +88,7 @@
#include "nsIContent.h"
#include "imgIContainer.h"
#include "nsContextMenuInfo.h"
#include "nsIPresContext.h"
//
// GetEventReceiver
@@ -104,13 +105,9 @@ GetEventReceiver ( nsWebBrowser* inBrowser, nsIDOMEventReceiver** outEventRcvr )
nsCOMPtr<nsPIDOMWindow> domWindowPrivate = do_QueryInterface(domWindow);
NS_ENSURE_TRUE(domWindowPrivate, NS_ERROR_FAILURE);
nsCOMPtr<nsIDOMWindowInternal> rootWindow;
domWindowPrivate->GetPrivateRoot(getter_AddRefs(rootWindow));
nsPIDOMWindow *rootWindow = domWindowPrivate->GetPrivateRoot();
NS_ENSURE_TRUE(rootWindow, NS_ERROR_FAILURE);
nsCOMPtr<nsIChromeEventHandler> chromeHandler;
nsCOMPtr<nsPIDOMWindow> piWin(do_QueryInterface(rootWindow));
NS_ENSURE_TRUE(piWin, NS_ERROR_FAILURE);
piWin->GetChromeEventHandler(getter_AddRefs(chromeHandler));
nsIChromeEventHandler *chromeHandler = rootWindow->GetChromeEventHandler();
NS_ENSURE_TRUE(chromeHandler, NS_ERROR_FAILURE);
nsCOMPtr<nsIDOMEventReceiver> rcvr = do_QueryInterface(chromeHandler);
@@ -1685,9 +1682,7 @@ ChromeContextMenuListener::ContextMenu(nsIDOMEvent* aMouseEvent)
NS_ENSURE_SUCCESS(res, res);
NS_ENSURE_TRUE(privateWin, NS_ERROR_FAILURE);
// get the focus controller
nsCOMPtr<nsIFocusController> focusController;
res = privateWin->GetRootFocusController(getter_AddRefs(focusController));
NS_ENSURE_SUCCESS(res, res);
nsIFocusController *focusController = privateWin->GetRootFocusController();
NS_ENSURE_TRUE(focusController, NS_ERROR_FAILURE);
// set the focus controller's popup node to the event target
res = focusController->SetPopupNode(targetDOMnode);