Stop null-checking the pres shell so that we get to the UnbindFromTree call in nsHTMLEditor::DeleteRefToAnonymousNode. (Bug 563980) r=ehsan

This commit is contained in:
L. David Baron 2010-05-05 18:20:43 -07:00
parent 889fcc7adc
commit ef99600a41
3 changed files with 9 additions and 3 deletions

View File

@ -313,7 +313,9 @@ nsHTMLEditor::HideGrabber()
// get the presshell's document observer interface.
nsCOMPtr<nsIPresShell> ps = do_QueryReferent(mPresShellWeak);
if (!ps) return NS_ERROR_NOT_INITIALIZED;
// We allow the pres shell to be null; when it is, we presume there
// are no document observers to notify, but we still want to
// UnbindFromTree.
nsCOMPtr<nsIDOMNode> parentNode;
res = mGrabber->GetParentNode(getter_AddRefs(parentNode));

View File

@ -125,7 +125,9 @@ nsHTMLEditor::HideInlineTableEditingUI()
// get the presshell's document observer interface.
nsCOMPtr<nsIPresShell> ps = do_QueryReferent(mPresShellWeak);
if (!ps) return NS_ERROR_NOT_INITIALIZED;
// We allow the pres shell to be null; when it is, we presume there
// are no document observers to notify, but we still want to
// UnbindFromTree.
// get the root content node.

View File

@ -439,7 +439,9 @@ nsHTMLEditor::HideResizers(void)
// get the presshell's document observer interface.
nsCOMPtr<nsIPresShell> ps = do_QueryReferent(mPresShellWeak);
if (!ps) return NS_ERROR_NOT_INITIALIZED;
// We allow the pres shell to be null; when it is, we presume there
// are no document observers to notify, but we still want to
// UnbindFromTree.
nsresult res;
nsCOMPtr<nsIDOMNode> parentNode;