156554 - Make nsRange QI directly

Status: RESOLVED FIXED

(Core :: DOM: Core & HTML, defect)

Description

[Christopher Aillon (sabbatical, not receiving bugmail)]

Right now there are silly helper functions that nsRange uses to do QIs.  We
should just remove those and QI directly.

Comment 1

[Christopher Aillon (sabbatical, not receiving bugmail)]

Attachment: Simple patch.

Comment 2

[Jonas Sicking (:sicking) No longer reading bugmail consistently]

Comment on attachment 90682 [details] [diff] [review]
Simple patch.

>           if (theRange)
>           {
>-            nsCOMPtr<nsIDOMNode> domNode;
>-            res = GetDOMNodeFromContent(cN, address_of(domNode));
>+            nsCOMPtr<nsIDOMNode> domNode(do_QueryInterface(cN));
>             NS_POSTCONDITION(NS_SUCCEEDED(res), "error updating range
>             NS_POSTCONDITION(domNode, "error updating range list");

you should either use do_QueryInterface(cN, res) or remove the first
postcondition. I'd prefer the latter.

>@@ -2463,16 +2438,11 @@
>   
>   nsCOMPtr<nsIContent> parent( do_QueryInterface(aParentNode) );
>   nsCOMPtr<nsIContent> replaced( do_QueryInterface(aReplacedNode) );
>-  nsCOMPtr<nsIDOMNode> parentDomNode; 
>-  nsresult res;
>-  
>-  res = GetDOMNodeFromContent(parent, address_of(parentDomNode));
>-  if (NS_FAILED(res))  return res;
>+  nsCOMPtr<nsIDOMNode> parentDomNode( do_QueryInterface(parent) ); 

what's up with the extra spaces?

r=sicking

Comment 3

[Christopher Aillon (sabbatical, not receiving bugmail)]

Comment on attachment 90682 [details] [diff] [review]
Simple patch.

Ben says sr=ben

Comment 4

[Christopher Aillon (sabbatical, not receiving bugmail)]

Checked in.