This commit is contained in:
Cameron Kaiser 2017-09-01 21:37:44 -07:00
parent 693b6a16ea
commit 19a2166287

View File

@ -953,23 +953,13 @@ nsEditor::EndPlaceHolderTransaction()
selection->SetCanCacheFrameOffset(true); selection->SetCanCacheFrameOffset(true);
} }
{ // time to turn off the batch
// Hide the caret here to avoid hiding it twice, once in EndUpdateViewBatch EndUpdateViewBatch();
// and once in ScrollSelectionIntoView. // make sure selection is in view
RefPtr<nsCaret> caret;
nsCOMPtr<nsIPresShell> presShell = GetPresShell();
if (presShell) // After ScrollSelectionIntoView(), the pending notifications might be
caret = presShell->GetCaret(); // flushed and PresShell/PresContext/Frames may be dead. See bug 418470.
ScrollSelectionIntoView(false);
// time to turn off the batch
EndUpdateViewBatch();
// make sure selection is in view
// After ScrollSelectionIntoView(), the pending notifications might be
// flushed and PresShell/PresContext/Frames may be dead. See bug 418470.
ScrollSelectionIntoView(false);
}
// cached for frame offset are Not available now // cached for frame offset are Not available now
if (selection) { if (selection) {