1191354 - Clean up nsHTMLEditRules::GetHighestInlineParent, CheckInterlinePosition, InsertMozBRIfNeeded, etc.

Status: RESOLVED FIXED

(Core :: DOM: Editor, enhancement)

Comment 1

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: Part 1 -- Clean up nsHTMLEditRules::GetHighestInlineParent

Comment 2

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: Part 2 -- Clean up nsHTMLEditRules::CheckInterlinePosition

Comment 3

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: Part 3 -- Clean up nsHTMLEditRules::InsertMozBRIfNeeded

Comment 4

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: Part 4 -- Clean up nsHTMLEditRules::AlignBlock

Comment 5

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: Part 5 -- Clean up nsHTMLEditRules::IsEmptyInline

Comment 6

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: Part 6 -- Clean up IsBlockNode/IsInlineNode in nsHTMLEditRules.cpp

Comment 7

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: Part 7 -- Clean up nsHTMLEditRules::CheckForInvisibleBR

Comment 8

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: Part 8 -- Typedefs in headers for readability

Comment 9

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: Part 9 -- Remove old nsHTMLEditRules::ConvertListType variant

Comment 10

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: Part 10 -- More features for OwningNonNull

Comment 11

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: Part 11 -- Clean up nsHTMLEditRules::WillOutdent

Comment 12

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: Part 12 -- Clean up nsHTMLEditRules::OutdentPartOfBlock

Comment 13

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: Part 13 -- Clean up nsHTMLEditRules::SplitBlock

Comment 14

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Green try: https://treeherder.mozilla.org/#/jobs?repo=try&revision=d5ed28ac87ca

Comment 15

[(no longer active)]

Comment on attachment 8644359 [details] [diff] [review]
Part 2 -- Clean up nsHTMLEditRules::CheckInterlinePosition

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

::: editor/libeditor/nsHTMLEditRules.cpp
@@ +7177,3 @@
>    }
>  
> +  NS_ENSURE_TRUE(mHTMLEditor, );

NS_ENSURE_TRUE_VOID, as before.  Here and elsewhere in all other patches.

Comment 16

[(no longer active)]

Comment on attachment 8644362 [details] [diff] [review]
Part 4 -- Clean up nsHTMLEditRules::AlignBlock

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

::: editor/libeditor/nsHTMLEditRules.cpp
@@ +8353,5 @@
> +  nsCOMPtr<nsIEditor> kungFuDeathGrip(mHTMLEditor);
> +
> +  nsresult res = RemoveAlignment(aElement.AsDOMNode(), aAlignType,
> +                                 aContentsOnly == ContentsOnly::yes ? true
> +                                                                    : false);

Just aContentsOnly == ContentsOnly::yes is enough.

Comment 17

[(no longer active)]

Comment on attachment 8644371 [details] [diff] [review]
Part 5 -- Clean up nsHTMLEditRules::IsEmptyInline

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

::: editor/libeditor/nsHTMLEditRules.cpp
@@ +7658,5 @@
> +  NS_ENSURE_TRUE(mHTMLEditor, false);
> +  nsCOMPtr<nsIEditor> kungFuDeathGrip(mHTMLEditor);
> +
> +  if (IsInlineNode(aNode.AsDOMNode()) && mHTMLEditor->IsContainer(&aNode)) {
> +    bool isEmpty;

Please initialize to true.

Comment 18

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: Part 1 updated -- Clean up nsHTMLEditRules::GetHighestInlineParent

Comment 19

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: Part 2 updated

Comment 20

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: 0024-Bug-1191354-part-3-Clean-up-nsHTMLEditRules-InsertMo.patch

Comment 21

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: 0025-Bug-1191354-part-4-Clean-up-nsHTMLEditRules-AlignBlo.patch

Comment 22

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: 0026-Bug-1191354-part-5-Clean-up-nsHTMLEditRules-IsEmptyI.patch

Comment 23

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: 0026-Bug-1191354-part-5-Clean-up-nsHTMLEditRules-IsEmptyI.patch

Comment 24

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: 0027-Bug-1191354-part-6-Clean-up-IsBlockNode-IsInlineNode.patch

Comment 25

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: 0028-Bug-1191354-part-7-Clean-up-nsHTMLEditRules-CheckFor.patch

Comment 26

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: 0029-Bug-1191354-part-8-Typedefs-in-headers-for-readabili.patch

Comment 27

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: 0030-Bug-1191354-part-9-Remove-old-nsHTMLEditRules-Conver.patch

Comment 28

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: 0031-Bug-1191354-part-10-More-features-for-OwningNonNull-.patch

Comment 29

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: 0032-Bug-1191354-part-11-Clean-up-nsHTMLEditRules-WillOut.patch

Comment 30

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: 0033-Bug-1191354-part-12-Clean-up-nsHTMLEditRules-Outdent.patch

Comment 31

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Attachment: 0034-Bug-1191354-part-13-Clean-up-nsHTMLEditRules-SplitBl.patch

Comment 32

[Aryeh Gregor (:ayg) (no longer with Mozilla)]

Checkin instructions at bug 1191356 comment 20.

Comment 33

[Pulsebot]

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

Comment 34

[Pulsebot]

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

Comment 35

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/142b62061350

Comment 36

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/6c6fd98812c7

Comment 37

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/47f7ab7dc09b

Comment 38

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/14fb48ed9c8d

Comment 39

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/4724402baace

Comment 40

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/68e6b568ad2a

Comment 41

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/12906c848272

Comment 42

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/62d58efcd0c0

Comment 43

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/3739ead5ce63

Comment 44

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/5896fcd5c10a

Comment 45

[Pulsebot]

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

Comment 46

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/ab44edac6c41
https://hg.mozilla.org/mozilla-central/rev/d556b4103dee
https://hg.mozilla.org/mozilla-central/rev/142b62061350
https://hg.mozilla.org/mozilla-central/rev/6c6fd98812c7
https://hg.mozilla.org/mozilla-central/rev/47f7ab7dc09b
https://hg.mozilla.org/mozilla-central/rev/14fb48ed9c8d
https://hg.mozilla.org/mozilla-central/rev/4724402baace
https://hg.mozilla.org/mozilla-central/rev/68e6b568ad2a
https://hg.mozilla.org/mozilla-central/rev/12906c848272
https://hg.mozilla.org/mozilla-central/rev/62d58efcd0c0
https://hg.mozilla.org/mozilla-central/rev/3739ead5ce63
https://hg.mozilla.org/mozilla-central/rev/5896fcd5c10a
https://hg.mozilla.org/mozilla-central/rev/a5a4a49c5188