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

fixed an assesrtion in ~nsHTMLEditor caused by calling GetDocument()

Browse Source 
when Init() had never been called.  This is a legal sequence
(nsHTMLEditor is instantiated and destroyed without Init() ever being called),
so now it's allowed.
This commit is contained in:
buster%netscape.com 1999-09-17 20:18:50 +00:00
parent 1b1462e1dc
commit b6b2acbf53
2 changed files with 58 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
editor/base/nsHTMLEditor.cpp
View File

@ -171,34 +171,39 @@ nsHTMLEditor::~nsHTMLEditor()
selection->RemoveSelectionListener(listener);
}
}
nsCOMPtr<nsIDOMDocument> doc;
nsEditor::GetDocument(getter_AddRefs(doc));
if (doc)
// Don't use getDocument here, because we have no way of knowing if
// Init() was ever called. So we need to get the document ourselves,
// if it exists.
if (mDocWeak)
{
nsCOMPtr<nsIDOMEventReceiver> erP = do_QueryInterface(doc, &result);
if (NS_SUCCEEDED(result) && erP)
nsCOMPtr<nsIDOMDocument> doc = do_QueryReferent(mDocWeak);
if (doc)
{
if (mKeyListenerP) {
erP->RemoveEventListenerByIID(mKeyListenerP, nsIDOMKeyListener::GetIID());
}
if (mMouseListenerP) {
erP->RemoveEventListenerByIID(mMouseListenerP, nsIDOMMouseListener::GetIID());
}
if (mTextListenerP) {
erP->RemoveEventListenerByIID(mTextListenerP, nsIDOMTextListener::GetIID());
}
if (mCompositionListenerP) {
erP->RemoveEventListenerByIID(mCompositionListenerP, nsIDOMCompositionListener::GetIID());
}
if (mFocusListenerP) {
erP->RemoveEventListenerByIID(mFocusListenerP, nsIDOMFocusListener::GetIID());
}
if (mDragListenerP) {
erP->RemoveEventListenerByIID(mDragListenerP, nsIDOMDragListener::GetIID());
nsCOMPtr<nsIDOMEventReceiver> erP = do_QueryInterface(doc, &result);
if (NS_SUCCEEDED(result) && erP)
{
if (mKeyListenerP) {
erP->RemoveEventListenerByIID(mKeyListenerP, nsIDOMKeyListener::GetIID());
}
if (mMouseListenerP) {
erP->RemoveEventListenerByIID(mMouseListenerP, nsIDOMMouseListener::GetIID());
}
if (mTextListenerP) {
erP->RemoveEventListenerByIID(mTextListenerP, nsIDOMTextListener::GetIID());
}
if (mCompositionListenerP) {
erP->RemoveEventListenerByIID(mCompositionListenerP, nsIDOMCompositionListener::GetIID());
}
if (mFocusListenerP) {
erP->RemoveEventListenerByIID(mFocusListenerP, nsIDOMFocusListener::GetIID());
}
if (mDragListenerP) {
erP->RemoveEventListenerByIID(mDragListenerP, nsIDOMDragListener::GetIID());
}
}
else
NS_NOTREACHED("~nsTextEditor");
}
else
NS_NOTREACHED("~nsTextEditor");
}
// deleting a null pointer is safe
@ -1048,7 +1053,6 @@ NS_IMETHODIMP nsHTMLEditor::InsertText(const nsString& aStringToInsert)
}
if (placeholderTxn)
placeholderTxn->SetAbsorb(PR_FALSE); // this ends the merging of txns into placeholderTxn
return result;
}

54
editor/libeditor/html/nsHTMLEditor.cpp
View File

@ -171,34 +171,39 @@ nsHTMLEditor::~nsHTMLEditor()
selection->RemoveSelectionListener(listener);
}
}
nsCOMPtr<nsIDOMDocument> doc;
nsEditor::GetDocument(getter_AddRefs(doc));
if (doc)
// Don't use getDocument here, because we have no way of knowing if
// Init() was ever called. So we need to get the document ourselves,
// if it exists.
if (mDocWeak)
{
nsCOMPtr<nsIDOMEventReceiver> erP = do_QueryInterface(doc, &result);
if (NS_SUCCEEDED(result) && erP)
nsCOMPtr<nsIDOMDocument> doc = do_QueryReferent(mDocWeak);
if (doc)
{
if (mKeyListenerP) {
erP->RemoveEventListenerByIID(mKeyListenerP, nsIDOMKeyListener::GetIID());
}
if (mMouseListenerP) {
erP->RemoveEventListenerByIID(mMouseListenerP, nsIDOMMouseListener::GetIID());
}
if (mTextListenerP) {
erP->RemoveEventListenerByIID(mTextListenerP, nsIDOMTextListener::GetIID());
}
if (mCompositionListenerP) {
erP->RemoveEventListenerByIID(mCompositionListenerP, nsIDOMCompositionListener::GetIID());
}
if (mFocusListenerP) {
erP->RemoveEventListenerByIID(mFocusListenerP, nsIDOMFocusListener::GetIID());
}
if (mDragListenerP) {
erP->RemoveEventListenerByIID(mDragListenerP, nsIDOMDragListener::GetIID());
nsCOMPtr<nsIDOMEventReceiver> erP = do_QueryInterface(doc, &result);
if (NS_SUCCEEDED(result) && erP)
{
if (mKeyListenerP) {
erP->RemoveEventListenerByIID(mKeyListenerP, nsIDOMKeyListener::GetIID());
}
if (mMouseListenerP) {
erP->RemoveEventListenerByIID(mMouseListenerP, nsIDOMMouseListener::GetIID());
}
if (mTextListenerP) {
erP->RemoveEventListenerByIID(mTextListenerP, nsIDOMTextListener::GetIID());
}
if (mCompositionListenerP) {
erP->RemoveEventListenerByIID(mCompositionListenerP, nsIDOMCompositionListener::GetIID());
}
if (mFocusListenerP) {
erP->RemoveEventListenerByIID(mFocusListenerP, nsIDOMFocusListener::GetIID());
}
if (mDragListenerP) {
erP->RemoveEventListenerByIID(mDragListenerP, nsIDOMDragListener::GetIID());
}
}
else
NS_NOTREACHED("~nsTextEditor");
}
else
NS_NOTREACHED("~nsTextEditor");
}
// deleting a null pointer is safe
@ -1048,7 +1053,6 @@ NS_IMETHODIMP nsHTMLEditor::InsertText(const nsString& aStringToInsert)
}
if (placeholderTxn)
placeholderTxn->SetAbsorb(PR_FALSE); // this ends the merging of txns into placeholderTxn
return result;
}