Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backing out fix for bug 249136 because it caused bug 279285

Browse Source
This commit is contained in:
aaronleventhal%moonset.net 2005-02-05 17:00:46 +00:00
parent 4e3e26bee1
commit 76ec412a0d
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
layout/base/nsPresShell.cpp
View File

@ -5515,38 +5515,36 @@ nsresult PresShell::RetargetEventToParent(nsIView *aView,
PRBool& aHandled,
nsIContent* aZombieFocusedContent)
{
// Send this event straight up to the parent pres shell.
// Send this events straight up to the parent pres shell.
// We do this for non-mouse events in zombie documents.
// That way at least the UI key bindings can work.
// First, eliminate the focus ring in the current docshell, which
// is now a zombie. If we key navigate, it won't be within this
// docshell, until the newly loading document is displayed.
nsCOMPtr<nsIPresShell> kungFuDeathGrip(this);
// hold a reference to the ESM across event dispatch
nsCOMPtr<nsIEventStateManager> esm = mPresContext->EventStateManager();
esm->SetContentState(nsnull, NS_EVENT_STATE_FOCUS);
esm->SetFocusedContent(nsnull);
ContentStatesChanged(mDocument, aZombieFocusedContent,
nsnull, NS_EVENT_STATE_FOCUS);
// Next, update the display so the old focus ring is no longer visible
nsCOMPtr<nsISupports> container = mPresContext->GetContainer();
if (aZombieFocusedContent) {
// If sub-content within current document is focused,
// eliminate the focus ring, because the current docshell
// is now a zombie. If we key navigate, it won't be within this
// docshell, until the newly loading document is displayed.
// Note: if document itself has focus, leave the focus alone so that
// we don't mess up the "open link in new foreground tab" feature --
// there is no focus outline in that case anyway.
esm->SetContentState(nsnull, NS_EVENT_STATE_FOCUS);
esm->SetFocusedContent(nsnull);
ContentStatesChanged(mDocument, aZombieFocusedContent,
nsnull, NS_EVENT_STATE_FOCUS);
// Update the display so the old focus ring is no longer visible
nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(container));
NS_ASSERTION(docShell, "No docshell for container.");
nsCOMPtr<nsIContentViewer> contentViewer;
docShell->GetContentViewer(getter_AddRefs(contentViewer));
if (contentViewer) {
nsCOMPtr<nsIContentViewer> zombieViewer;
contentViewer->GetPreviousViewer(getter_AddRefs(zombieViewer));
if (zombieViewer) {
zombieViewer->Show();
}
nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(container));
NS_ASSERTION(docShell, "No docshell for container.");
nsCOMPtr<nsIContentViewer> contentViewer;
docShell->GetContentViewer(getter_AddRefs(contentViewer));
if (contentViewer) {
nsCOMPtr<nsIContentViewer> zombieViewer;
contentViewer->GetPreviousViewer(getter_AddRefs(zombieViewer));
if (zombieViewer) {
zombieViewer->Show();
}
}