Bug 1003808 part 2 - Clean up nsEditorUtils::IsDescendantOf; r=ehsan

shellylin · Apr 28, 2014 · 8344d42 · 8344d42
1 parent f55311b
commit 8344d42
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 25 deletions.
diff --git a/editor/libeditor/base/nsEditorUtils.cpp b/editor/libeditor/base/nsEditorUtils.cpp
@@ -138,38 +138,35 @@ nsDOMSubtreeIterator::Init(nsIDOMRange* aRange)
  * some general purpose editor utils
  *****************************************************************************/
 
-bool 
-nsEditorUtils::IsDescendantOf(nsIDOMNode *aNode, nsIDOMNode *aParent, int32_t *aOffset) 
+bool
+nsEditorUtils::IsDescendantOf(nsINode* aNode, nsINode* aParent, int32_t* aOffset)
 {
-  NS_ENSURE_TRUE(aNode || aParent, false);
-  if (aNode == aParent) return false;
-
-  nsCOMPtr<nsIDOMNode> parent, node = do_QueryInterface(aNode);
-  nsresult res;
-
-  do
-  {
-    res = node->GetParentNode(getter_AddRefs(parent));
-    NS_ENSURE_SUCCESS(res, false);
-    if (parent == aParent) 
-    {
-      if (aOffset)
-      {
-        nsCOMPtr<nsIContent> pCon(do_QueryInterface(parent));
-        nsCOMPtr<nsIContent> cCon(do_QueryInterface(node));
-        if (pCon)
-        {
-          *aOffset = pCon->IndexOf(cCon);
-        }
+  MOZ_ASSERT(aNode && aParent);
+  if (aNode == aParent) {
+    return false;
+  }
+
+  for (nsCOMPtr<nsINode> node = aNode; node; node = node->GetParentNode()) {
+    if (node->GetParentNode() == aParent) {
+      if (aOffset) {
+        *aOffset = aParent->IndexOf(node);
       }
       return true;
     }
-    node = parent;
-  } while (parent);
-
+  }
+
   return false;
 }
 
+bool
+nsEditorUtils::IsDescendantOf(nsIDOMNode* aNode, nsIDOMNode* aParent, int32_t* aOffset)
+{
+  nsCOMPtr<nsINode> node = do_QueryInterface(aNode);
+  nsCOMPtr<nsINode> parent = do_QueryInterface(aParent);
+  NS_ENSURE_TRUE(node && parent, false);
+  return IsDescendantOf(node, parent, aOffset);
+}
+
 bool
 nsEditorUtils::IsLeafNode(nsIDOMNode *aNode)
 {

diff --git a/editor/libeditor/base/nsEditorUtils.h b/editor/libeditor/base/nsEditorUtils.h
@@ -232,6 +232,7 @@ struct MOZ_STACK_CLASS DOMPoint
 class nsEditorUtils
 {
   public:
+    static bool IsDescendantOf(nsINode* aNode, nsINode* aParent, int32_t* aOffset = 0);
     static bool IsDescendantOf(nsIDOMNode *aNode, nsIDOMNode *aParent, int32_t *aOffset = 0);
     static bool IsLeafNode(nsIDOMNode *aNode);
 };