1209037 - Eliminate some unneeded null checks

Status: RESOLVED FIXED

(Core :: DOM: Editor, defect)

Comment 1

[(no longer active)]

Attachment: Eliminate some unneeded null checks

Comment 2

[Josh Matthews [:jdm]]

Comment on attachment 8666674 [details] [diff] [review]
Eliminate some unneeded null checks

Review of attachment 8666674 [details] [diff] [review]:
-----------------------------------------------------------------

::: editor/libeditor/nsHTMLEditRules.cpp
@@ +6588,5 @@
>    nsCOMPtr<nsINode> rightParaNode = do_QueryInterface(rightPara);
>    NS_ENSURE_STATE(mHTMLEditor && rightParaNode);
>    nsCOMPtr<nsIDOMNode> child =
>      GetAsDOMNode(mHTMLEditor->GetLeftmostChild(rightParaNode, true));
>    NS_ENSURE_STATE(mHTMLEditor);

Want to remove this one too?

@@ +7386,5 @@
>      nsCOMPtr<nsIDOMNode> tmp = mNewBlock;
>      NS_ENSURE_STATE(mHTMLEditor);
>      tmp = GetAsDOMNode(mHTMLEditor->GetLastEditableChild(*block));
>      uint32_t endPoint;
>      NS_ENSURE_STATE(mHTMLEditor);

Ditto.

@@ +7392,3 @@
>          mHTMLEditor->IsContainer(tmp))
>      {
>        NS_ENSURE_STATE(mHTMLEditor);

And ditto.

@@ +7405,5 @@
>    else
>    {
>      // selection is before block.  put at start of block.
>      nsCOMPtr<nsIDOMNode> tmp = mNewBlock;
>      NS_ENSURE_STATE(mHTMLEditor);

There's an NS_ENSURE_STATE(mHTMLEditor) earlier in this method, and there's no clear reason why any intervening code should null this out. Your choice.

@@ +7414,4 @@
>      {
>        tmp = nsEditor::GetNodeLocation(tmp, &offset);
>      }
>      NS_ENSURE_STATE(mHTMLEditor);

Ditto.

Comment 3

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/c42dadd33b58

Comment 4

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/c42dadd33b58