333063 - Fix the relationship between nsHTMLEditor::InsertHTMLWithContext and nsHTMLEditor::CreateDOMFragmentFromPaste

Status: RESOLVED FIXED

(Core :: DOM: Editor, defect, P2)

Description

[Blake Kaplan (:mrbkap) (inactive)]

Currently, the path to paste an HTML fragment in the editor goes through a little maze of functions. Two of those functions are InsertHTMLWithContext and CreateDOMFragmentFromPaste. These functions are currently in a weird incestuous relationship where one CreateDOMFragmentFromPaste does parsing and passes "hints" back to InsertHTMLWithContext, basically meaning that we end up calculating the same things twice.

I want to clean up the relationship between the two functions so that we only calculate things once. This is a spinoff of bug 228920. Note that I don't want to nuke CreateDOMFragmentFromPaste altogether, since InsertHTMLWithContext is a large enough function as-is.

Comment 1

[Blake Kaplan (:mrbkap) (inactive)]

Attachment: Pass 1

I tried to keep the behavior the same between the old and new code. I'm not really happy with the nsCOMPtr usage, suggestions are welcome.

Comment 2

[[e-mail]]

Comment on attachment 219573 [details] [diff] [review]
Pass 1

>+  *outStartNode = contextLeaf;
>+  *outStartOffset = 0;
>+
>+  *outEndNode = *outStartNode;
Chained assignment?

>+      *outStartNode = tmp;
->swap?

>+    GetLengthOfDOMNode(*outEndNode, (PRUint32&)*outEndOffset);
>   }
>   else
>   {
>+    GetLengthOfDOMNode(*outEndNode, (PRUint32&)*outEndOffset);
>   }
I suppose any decent compiler will optimise this, but it looks silly.

Comment 3

[Johnny Stenback (:jst)]

Comment on attachment 219573 [details] [diff] [review]
Pass 1

sr=jst

Comment 4

[Blake Kaplan (:mrbkap) (inactive)]

Fix checked in.