bs7868. bug driving me crazy i keep putting it into trunk but i keep failing. this patch was in 9.9 and 9.8 will go into branch soonest

layout/base/nsPresShell.cpp

@@ -1478,6 +1478,9 @@ PresShell::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   } else if (aIID.Equals(NS_GET_IID(nsISelectionController))) {
     nsISelectionController* tmp = this;
     *aInstancePtr = (void*) tmp;
+  } else if (aIID.Equals(NS_GET_IID(nsISelectionDisplay))) {
+    nsISelectionController* tmp = this;
+    *aInstancePtr = (void*) tmp;
   } else if (aIID.Equals(NS_GET_IID(nsISupportsWeakReference))) {
     nsISupportsWeakReference* tmp = this;
     *aInstancePtr = (void*) tmp;

layout/generic/nsFrame.cpp

@@ -1762,7 +1762,9 @@ nsresult nsFrame::GetContentAndOffsetsFromPoint(nsIPresContext* aCX,
       aContentOffsetEnd = aContentOffset +1;
     else 
     {
-      if ((thisRect.x + thisRect.width) < aPoint.x  || thisRect.y > aPoint.y)
+      //if we are a collapsed frame then dont check to see if we need to skip past this content
+      //see bug http://bugzilla.mozilla.org/show_bug.cgi?id=103888
+      if (thisRect.width && thisRect.height && ((thisRect.x + thisRect.width) < aPoint.x  || thisRect.y > aPoint.y))
       {
         aBeginFrameContent = PR_FALSE;
         aContentOffset++;

layout/html/base/src/nsFrame.cpp

@@ -1762,7 +1762,9 @@ nsresult nsFrame::GetContentAndOffsetsFromPoint(nsIPresContext* aCX,
       aContentOffsetEnd = aContentOffset +1;
     else 
     {
-      if ((thisRect.x + thisRect.width) < aPoint.x  || thisRect.y > aPoint.y)
+      //if we are a collapsed frame then dont check to see if we need to skip past this content
+      //see bug http://bugzilla.mozilla.org/show_bug.cgi?id=103888
+      if (thisRect.width && thisRect.height && ((thisRect.x + thisRect.width) < aPoint.x  || thisRect.y > aPoint.y))
       {
         aBeginFrameContent = PR_FALSE;
         aContentOffset++;

layout/html/base/src/nsPresShell.cpp

@@ -1478,6 +1478,9 @@ PresShell::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   } else if (aIID.Equals(NS_GET_IID(nsISelectionController))) {
     nsISelectionController* tmp = this;
     *aInstancePtr = (void*) tmp;
+  } else if (aIID.Equals(NS_GET_IID(nsISelectionDisplay))) {
+    nsISelectionController* tmp = this;
+    *aInstancePtr = (void*) tmp;
   } else if (aIID.Equals(NS_GET_IID(nsISupportsWeakReference))) {
     nsISupportsWeakReference* tmp = this;
     *aInstancePtr = (void*) tmp;