Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-05 13:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Not part of build. Bug 30088 - type ahead find. Simplify code to go from docshell -> dom window using nsIInterfaceRequestor

Browse Source
This commit is contained in:
aaronl%netscape.com 2002-08-15 04:57:33 +00:00
parent 98d012fd4b
commit 59f8b8c7bb
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
extensions/typeaheadfind/nsTypeAheadFind.cpp
View File

@ -39,7 +39,6 @@
* ***** END LICENSE BLOCK ***** */
#include "nsCOMPtr.h"
#include "nsIInterfaceRequestorUtils.h"
#include "nsMemory.h"
#include "nsIServiceManager.h"
#include "nsIGenericFactory.h"
@ -84,6 +83,8 @@
#include "nsPIDOMWindow.h"
#include "nsIDOMKeyEvent.h"
#include "nsIDocShellTreeItem.h"
#include "nsIInterfaceRequestor.h"
#include "nsIInterfaceRequestorUtils.h"
#include "nsISound.h"
#include "nsContentCID.h"
#include "nsLayoutCID.h"
@ -407,22 +408,14 @@ NS_IMETHODIMP nsTypeAheadFind::Observe(nsISupports *aSubject, const char *aTopic
while (NS_SUCCEEDED(docShellEnumerator->HasMoreElements(&hasMoreDocShells))
&& hasMoreDocShells) {
docShellEnumerator->GetNext(getter_AddRefs(pcContainer));
docShell = do_QueryInterface(pcContainer);
if (docShell) {
docShell->GetPresShell(getter_AddRefs(presShell));
if (presShell) {
presShell->GetDocument(getter_AddRefs(doc));
if (doc) {
nsCOMPtr<nsIScriptGlobalObject> ourGlobal;
doc->GetScriptGlobalObject(getter_AddRefs(ourGlobal));
domWin = do_QueryInterface(ourGlobal);
if (domWin) {
nsCOMPtr<nsISupports> windowSupports(do_QueryInterface(domWin));
PRInt32 index = mManualFindWindows->IndexOf(windowSupports);
if (index >= 0)
mManualFindWindows->RemoveElementAt(index);
}
}
nsCOMPtr<nsIInterfaceRequestor> ifreq(do_QueryInterface(pcContainer));
if (ifreq) {
ifreq->GetInterface(NS_GET_IID(nsIDOMWindow), getter_AddRefs(domWin));
if (domWin) {
nsCOMPtr<nsISupports> windowSupports(do_QueryInterface(domWin));
PRInt32 index = mManualFindWindows->IndexOf(windowSupports);
if (index >= 0)
mManualFindWindows->RemoveElementAt(index);
}
}
}
@ -1463,9 +1456,10 @@ void nsTypeAheadFind::RemoveWindowFocusListener(nsIDOMWindow *aDOMWin)
// Remove focus listener
nsCOMPtr<nsIDOMEventTarget> chromeEventHandler;
GetChromeEventHandler(aDOMWin, getter_AddRefs(chromeEventHandler));
chromeEventHandler->RemoveEventListener(NS_LITERAL_STRING("focus"),
NS_STATIC_CAST(nsIDOMFocusListener*, this),
PR_TRUE);
if (chromeEventHandler)
chromeEventHandler->RemoveEventListener(NS_LITERAL_STRING("focus"),
NS_STATIC_CAST(nsIDOMFocusListener*, this),
PR_TRUE);
if (aDOMWin == mFocusedWindow)
mFocusedWindow = nsnull;
@ -1477,9 +1471,10 @@ void nsTypeAheadFind::AttachWindowFocusListener(nsIDOMWindow *aDOMWin)
// Add focus listener to chrome event handler
nsCOMPtr<nsIDOMEventTarget> chromeEventHandler;
GetChromeEventHandler(aDOMWin, getter_AddRefs(chromeEventHandler));
chromeEventHandler->AddEventListener(NS_LITERAL_STRING("focus"),
NS_STATIC_CAST(nsIDOMFocusListener*, this),
PR_TRUE);
if (chromeEventHandler)
chromeEventHandler->AddEventListener(NS_LITERAL_STRING("focus"),
NS_STATIC_CAST(nsIDOMFocusListener*, this),
PR_TRUE);
}