Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-28 04:35:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 131089, bug 131238, and bug 131918. Fixes regressions caused from 'browse with caret' checkins in bug 66597. a) bug 131089 - crash in ResetBrowseWithCaret(), r=bryner, sr=alecf, a=scc. b) bug 131238 - assertions caused by SetCaretContentVisible, r=bryner, sr=alecf, a=scc. c) bug 131918 - infinite loop in MoveFocusToCaret(), r=jgaunt, sr=alecf, a=asa

Browse Source
This commit is contained in:
aaronl%netscape.com 2002-03-20 06:42:26 +00:00
parent 03fe97372a
commit a0842fd880
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
content/events/src/nsEventStateManager.cpp
View File

@ -4363,8 +4363,10 @@ NS_IMETHODIMP nsEventStateManager::MoveFocusToCaret(PRBool aCanFocusDoc, PRBool
do {
selectionNode->GetParentNode(getter_AddRefs(testNode));
if (!testNode || testNode == endSelectionNode)
if (!testNode || testNode == endSelectionNode) {
selectionNode = nsnull;
break;
}
testNode->GetNextSibling(getter_AddRefs(selectionNode));
if (selectionNode)
break;
@ -4480,11 +4482,13 @@ nsresult nsEventStateManager::SetContentCaretVisible(nsIPresShell* aPresShell, n
nsCOMPtr<nsICaret> caret;
aPresShell->GetCaret(getter_AddRefs(caret));
nsIFrame *focusFrame = nsnull;
aPresShell->GetPrimaryFrameFor(aFocusedContent, &focusFrame);
nsCOMPtr<nsIFrameSelection> frameSelection, docFrameSelection;
GetSelection(focusFrame, mPresContext, getter_AddRefs(frameSelection));
if (aFocusedContent) {
nsIFrame *focusFrame = nsnull;
aPresShell->GetPrimaryFrameFor(aFocusedContent, &focusFrame);
GetSelection(focusFrame, mPresContext, getter_AddRefs(frameSelection));
}
aPresShell->GetFrameSelection(getter_AddRefs(docFrameSelection));
if (docFrameSelection && caret &&
@ -4519,6 +4523,9 @@ nsEventStateManager::ResetBrowseWithCaret(PRBool *aBrowseWithCaret)
mPresContext->GetContainer(getter_AddRefs(pcContainer));
PRInt32 itemType;
nsCOMPtr<nsIDocShellTreeItem> shellItem(do_QueryInterface(pcContainer));
if (!shellItem)
return NS_ERROR_FAILURE;
shellItem->GetItemType(&itemType);
if (itemType == nsIDocShellTreeItem::typeChrome)
@ -4532,7 +4539,7 @@ nsEventStateManager::ResetBrowseWithCaret(PRBool *aBrowseWithCaret)
// Make caret visible or not, depending on what's appropriate
if (presShell)
SetContentCaretVisible(presShell, mCurrentFocus, *aBrowseWithCaret && gLastFocusedDocument == mDocument);
return SetContentCaretVisible(presShell, mCurrentFocus, *aBrowseWithCaret && gLastFocusedDocument == mDocument);
return NS_ERROR_FAILURE;
}