Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-08 12:22:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 806755 - Don't call scroll methods on the pres shell after the Selection was disconnected. r=roc

Browse Source
This commit is contained in:
Mats Palmgren 2012-11-04 07:41:42 +01:00
parent ab508f6753
commit ed128c73b5
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
layout/generic/nsSelection.cpp
View File

@ -5327,6 +5327,10 @@ Selection::ScrollIntoView(SelectionRegion aRegion,
if (!mFrameSelection)
return NS_OK;//nothing to do
nsCOMPtr<nsIPresShell> presShell = mFrameSelection->GetShell();
if (!presShell)
return NS_OK;
if (mFrameSelection->GetBatching())
return NS_OK;
@ -5334,11 +5338,6 @@ Selection::ScrollIntoView(SelectionRegion aRegion,
return PostScrollSelectionIntoViewEvent(aRegion, aFlags,
aVertical, aHorizontal);
nsCOMPtr<nsIPresShell> presShell;
nsresult result = GetPresShell(getter_AddRefs(presShell));
if (NS_FAILED(result) || !presShell)
return result;
// Now that text frame character offsets are always valid (though not
// necessarily correct), the worst that will happen if we don't flush here
// is that some callers might scroll to the wrong place. Those should
@ -5347,10 +5346,10 @@ Selection::ScrollIntoView(SelectionRegion aRegion,
if (aFlags & Selection::SCROLL_DO_FLUSH) {
presShell->FlushPendingNotifications(Flush_Layout);
// Reget the presshell, since it might have gone away.
result = GetPresShell(getter_AddRefs(presShell));
if (NS_FAILED(result) || !presShell)
return result;
// Reget the presshell, since it might have been Destroy'ed.
presShell = mFrameSelection ? mFrameSelection->GetShell() : nullptr;
if (!presShell)
return NS_OK;
}
//