Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 328395: deal with an nsTypedSelection existing after its presentation is destroyed so it doesn't crash. r=bzbarsky, sr=roc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@194369 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sharparrow1%yahoo.com
2006-04-14 00:28:22 +00:00
parent 6f70cce9b5
commit 1c6d65819c
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mozilla/layout/generic/nsSelection.cpp
View File

@@ -257,6 +257,8 @@ public:
nsresult NotifySelectionListeners();
void DetachFromPresentation();
private:
friend class nsSelectionIterator;
friend struct nsScrollSelectionIntoViewEvent;
@@ -952,7 +954,10 @@ nsSelection::~nsSelection()
{
PRInt32 i;
for (i = 0;i<nsISelectionController::NUM_SELECTIONTYPES;i++){
NS_IF_RELEASE(mDomSelections[i]);
if (mDomSelections[i]) {
mDomSelections[i]->DetachFromPresentation();
NS_RELEASE(mDomSelections[i]);
}
}
}
@@ -1601,6 +1606,8 @@ nsTypedSelection::ToStringWithFormat(const char * aFormatType, PRUint32 aFlags,
NS_IMETHODIMP
nsTypedSelection::SetInterlinePosition(PRBool aHintRight)
{
if (!mFrameSelection)
return NS_ERROR_NOT_INITIALIZED; // Can't do selection
nsIFrameSelection::HINT hint;
if (aHintRight)
hint = nsIFrameSelection::HINTRIGHT;
@@ -1612,6 +1619,8 @@ nsTypedSelection::SetInterlinePosition(PRBool aHintRight)
NS_IMETHODIMP
nsTypedSelection::GetInterlinePosition(PRBool *aHintRight)
{
if (!mFrameSelection)
return NS_ERROR_NOT_INITIALIZED; // Can't do selection
nsIFrameSelection::HINT hint;
nsresult rv = mFrameSelection->GetHint(&hint);
if (hint == nsIFrameSelection::HINTRIGHT)
@@ -4270,6 +4279,10 @@ nsTypedSelection::nsTypedSelection()
nsTypedSelection::~nsTypedSelection()
{
DetachFromPresentation();
}
void nsTypedSelection::DetachFromPresentation() {
setAnchorFocusRange(-1);
if (mAutoScrollTimer) {
@@ -4282,7 +4295,12 @@ nsTypedSelection::~nsTypedSelection()
mScrollEventPosted = PR_FALSE;
}
delete mCachedOffsetForFrame;
if (mCachedOffsetForFrame) {
delete mCachedOffsetForFrame;
mCachedOffsetForFrame = nsnull;
}
mFrameSelection = nsnull;
}
@@ -5535,6 +5553,8 @@ nsTypedSelection::Collapse(nsIDOMNode* aParentNode, PRInt32 aOffset)
{
if (!aParentNode)
return NS_ERROR_INVALID_ARG;
if (!mFrameSelection)
return NS_ERROR_NOT_INITIALIZED; // Can't do selection
mFrameSelection->InvalidateDesiredX();
if (!IsValidSelectionPoint(mFrameSelection, aParentNode))
return NS_ERROR_FAILURE;
@@ -6052,6 +6072,9 @@ nsTypedSelection::Extend(nsIDOMNode* aParentNode, PRInt32 aOffset)
if (!mAnchorFocusRange)
return NS_ERROR_NOT_INITIALIZED;
if (!mFrameSelection)
return NS_ERROR_NOT_INITIALIZED; // Can't do selection
nsresult res;
if (!IsValidSelectionPoint(mFrameSelection, aParentNode))
return NS_ERROR_FAILURE;
@@ -7283,6 +7306,8 @@ nsTypedSelection::DeleteFromDocument()
NS_IMETHODIMP
nsTypedSelection::SelectionLanguageChange(PRBool aLangRTL)
{
if (!mFrameSelection)
return NS_ERROR_NOT_INITIALIZED; // Can't do selection
nsresult result;
nsCOMPtr<nsIDOMNode> focusNode;
nsCOMPtr<nsIContent> focusContent;