From 2a4f8f394684a4226976f338bc5b2bcc232ae0f3 Mon Sep 17 00:00:00 2001
From: "jfrancis%netscape.com"
 <jfrancis%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 20 Jun 1999 00:12:59 +0000
Subject: [PATCH] fixing bug that broke selection in docs with generated
 content

git-svn-id: svn://10.0.0.236/trunk@35951 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/base/src/nsRange.cpp | 9 +++------
 mozilla/content/base/src/nsRange.h   | 2 +-
 mozilla/layout/base/src/nsRange.cpp  | 9 +++------
 mozilla/layout/base/src/nsRange.h    | 2 +-
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/mozilla/content/base/src/nsRange.cpp b/mozilla/content/base/src/nsRange.cpp
index f327c793adb..da970a887ce 100644
--- a/mozilla/content/base/src/nsRange.cpp
+++ b/mozilla/content/base/src/nsRange.cpp
@@ -240,11 +240,8 @@ PRBool GetNodeBracketPoints(nsIContent* aNode,
   }
   else
   {
-    nsCOMPtr<nsIContent> cN(do_QueryInterface(*outParent));
-    if (!cN || NS_FAILED(cN->IndexOf(aNode, indx)))
-      return PR_FALSE;
-    *outStartOffset = indx;
-    *outEndOffset = indx+1;
+    *outStartOffset = nsRange::IndexOf(theDOMNode);
+    *outEndOffset = *outStartOffset+1;
   }
   return PR_TRUE;
 }
@@ -588,7 +585,7 @@ nsresult nsRange::ComparePointToRange(nsCOMPtr<nsIDOMNode> aParent, PRInt32 aOff
   return NS_OK;
 }
   
-PRInt32 nsRange::IndexOf(nsCOMPtr<nsIDOMNode> aChildNode)
+PRInt32 nsRange::IndexOf(nsIDOMNode* aChildNode)
 {
   nsCOMPtr<nsIDOMNode> parentNode;
   nsCOMPtr<nsIContent> contentChild;
diff --git a/mozilla/content/base/src/nsRange.h b/mozilla/content/base/src/nsRange.h
index a1970958912..f1179d998f5 100644
--- a/mozilla/content/base/src/nsRange.h
+++ b/mozilla/content/base/src/nsRange.h
@@ -123,7 +123,7 @@ public:
   // helper routines
   
   static PRBool        InSameDoc(nsCOMPtr<nsIDOMNode> aNode1, nsCOMPtr<nsIDOMNode> aNode2);
-  static PRInt32       IndexOf(nsCOMPtr<nsIDOMNode> aNode);
+  static PRInt32       IndexOf(nsIDOMNode* aNode);
   static PRInt32       FillArrayWithAncestors(nsVoidArray* aArray,nsCOMPtr<nsIDOMNode> aNode);
   static nsCOMPtr<nsIDOMNode>   CommonParent(nsCOMPtr<nsIDOMNode> aNode1, nsCOMPtr<nsIDOMNode> aNode2);
   static nsresult      GetDOMNodeFromContent(nsCOMPtr<nsIContent> inContentNode, nsCOMPtr<nsIDOMNode>* outDomNode);
diff --git a/mozilla/layout/base/src/nsRange.cpp b/mozilla/layout/base/src/nsRange.cpp
index f327c793adb..da970a887ce 100644
--- a/mozilla/layout/base/src/nsRange.cpp
+++ b/mozilla/layout/base/src/nsRange.cpp
@@ -240,11 +240,8 @@ PRBool GetNodeBracketPoints(nsIContent* aNode,
   }
   else
   {
-    nsCOMPtr<nsIContent> cN(do_QueryInterface(*outParent));
-    if (!cN || NS_FAILED(cN->IndexOf(aNode, indx)))
-      return PR_FALSE;
-    *outStartOffset = indx;
-    *outEndOffset = indx+1;
+    *outStartOffset = nsRange::IndexOf(theDOMNode);
+    *outEndOffset = *outStartOffset+1;
   }
   return PR_TRUE;
 }
@@ -588,7 +585,7 @@ nsresult nsRange::ComparePointToRange(nsCOMPtr<nsIDOMNode> aParent, PRInt32 aOff
   return NS_OK;
 }
   
-PRInt32 nsRange::IndexOf(nsCOMPtr<nsIDOMNode> aChildNode)
+PRInt32 nsRange::IndexOf(nsIDOMNode* aChildNode)
 {
   nsCOMPtr<nsIDOMNode> parentNode;
   nsCOMPtr<nsIContent> contentChild;
diff --git a/mozilla/layout/base/src/nsRange.h b/mozilla/layout/base/src/nsRange.h
index a1970958912..f1179d998f5 100644
--- a/mozilla/layout/base/src/nsRange.h
+++ b/mozilla/layout/base/src/nsRange.h
@@ -123,7 +123,7 @@ public:
   // helper routines
   
   static PRBool        InSameDoc(nsCOMPtr<nsIDOMNode> aNode1, nsCOMPtr<nsIDOMNode> aNode2);
-  static PRInt32       IndexOf(nsCOMPtr<nsIDOMNode> aNode);
+  static PRInt32       IndexOf(nsIDOMNode* aNode);
   static PRInt32       FillArrayWithAncestors(nsVoidArray* aArray,nsCOMPtr<nsIDOMNode> aNode);
   static nsCOMPtr<nsIDOMNode>   CommonParent(nsCOMPtr<nsIDOMNode> aNode1, nsCOMPtr<nsIDOMNode> aNode2);
   static nsresult      GetDOMNodeFromContent(nsCOMPtr<nsIContent> inContentNode, nsCOMPtr<nsIDOMNode>* outDomNode);