718170 - Use nsINode in IsEmptyNodeImpl/IsVisTextNode/IsEmptyCell

Status: RESOLVED FIXED

(Core :: DOM: Editor, defect)

Description

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

Attachment: Part a: IsEmptyNodeImpl

Comment 1

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

Attachment: Part b: IsVisTextNode

Comment 2

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

Attachment: Part c: IsEmptyCell

Comment 3

[(no longer active)]

Comment on attachment 588612 [details] [diff] [review]
Part b: IsVisTextNode

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

::: content/base/public/nsISelectionController.idl
@@ +50,5 @@
>  interface nsIDOMNode;
>  interface nsISelection;
>  interface nsISelectionDisplay;
>  
>  [scriptable, uuid(cf30315f-b65d-44c3-8c57-557e36d18fd2)]

Rev the uuid please.

::: editor/libeditor/html/nsHTMLEditRules.cpp
@@ +2443,5 @@
>              arrayOfNodes.RemoveObjectAt(0);
>              // If something visible is deleted, no need to join.
>              // Visible means all nodes except non-visible textnodes and breaks.
>              if (join && origCollapsed) {
> +              nsCOMPtr<nsINode> node = do_QueryInterface(somenode);

Couldn't you cast directly to nsIContent?

Comment 4

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

  nsCOMPtr<nsIContent> content = do_QueryInterface(somenode);
  if (!content) {
    join = false;
  } else if (content->NodeType() == nsIDOMNode::TEXT_NODE) {
    mHTMLEditor->IsVisTextNode(content,
                               &join, true);
  } else {
    join = content->AsElement()->IsHTML(nsGkAtoms::br) &&
           !mHTMLEditor->IsVisBreak(somenode);
  }

then?

Comment 5

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

s/AsElement()->//

Comment 6

[(no longer active)]

Yes!

Comment 7

[:Ms2ger (he/him; ⌚ UTC+1/+2)]

https://hg.mozilla.org/mozilla-central/rev/46fce3248ec9
https://hg.mozilla.org/mozilla-central/rev/677e38a3838c
https://hg.mozilla.org/mozilla-central/rev/70991ab26e20