Backing out bug 371839 to fix bug 372139.

layout/generic/nsTextFrame.cpp

@@ -85,7 +85,6 @@
 #include "nsFrameSelection.h"
 #include "nsISelection.h"
 #include "nsIDOMRange.h"
-#include "nsIRange.h"
 #include "nsILookAndFeel.h"
 #include "nsCSSRendering.h"
 #include "nsContentUtils.h"
@@ -349,9 +348,6 @@ public:
                          PRBool aSelected,
                          nsSpread aSpread);
   
-  // Only called when actually inside the right range, etc.
-  void DoSetSelected(PRBool aSelected, PRBool aSelectionEmpty);
-  
   virtual PRBool PeekOffsetNoAmount(PRBool aForward, PRInt32* aOffset);
   virtual PRBool PeekOffsetCharacter(PRBool aForward, PRInt32* aOffset);
   virtual PRBool PeekOffsetWord(PRBool aForward, PRBool aWordSelectEatSpace, PRBool aIsKeyboardSelect,
@@ -4235,6 +4231,9 @@ nsTextFrame::GetPositionHelper(const nsPoint&  aPoint,
   return NS_OK;
 }
 
+// [HACK] Foward Declarations
+void ForceDrawFrame(nsFrame * aFrame);
+
 //null range means the whole thing
 NS_IMETHODIMP
 nsTextFrame::SetSelected(nsPresContext* aPresContext,
@@ -4251,69 +4250,67 @@ nsTextFrame::SetSelected(nsPresContext* aPresContext,
   if (aSelected && ParentDisablesSelection())
     return NS_OK;
 
+#if 0
+  PRBool isSelected = ((GetStateBits() & NS_FRAME_SELECTED_CONTENT) == NS_FRAME_SELECTED_CONTENT);
+  if (!aSelected && !isSelected) //already set thanks
+  {
+    return NS_OK;
+  }
+#endif
+
   // check whether style allows selection
   PRBool selectable;
   IsSelectable(&selectable, nsnull);
   if (!selectable)
     return NS_OK;//do not continue no selection for this frame.
 
-  // The offsets within our node spanned by the range
+  PRBool found = PR_FALSE;
-  PRInt32 startOffset;
+  if (aRange) {
+    //lets see if the range contains us, if so we must redraw!
+    nsCOMPtr<nsIDOMNode> endNode;
     PRInt32 endOffset;
-  nsCOMPtr<nsIRange> range(do_QueryInterface(aRange));
+    nsCOMPtr<nsIDOMNode> startNode;
-  if (range) {
+    PRInt32 startOffset;
-    if (GetContent() == range->GetStartParent()) {
+    aRange->GetEndContainer(getter_AddRefs(endNode));
-      startOffset = range->StartOffset();
+    aRange->GetEndOffset(&endOffset);
-    } else {
+    aRange->GetStartContainer(getter_AddRefs(startNode));
-      startOffset = 0;
+    aRange->GetStartOffset(&startOffset);
+    nsCOMPtr<nsIDOMNode> thisNode = do_QueryInterface(GetContent());
+
+    if (thisNode == startNode)
+    {
+      if ((mContentOffset + mContentLength) >= startOffset)
+      {
+        found = PR_TRUE;
+        if (thisNode == endNode)
+        { //special case
+          if (endOffset == startOffset) //no need to redraw since drawing takes place with cursor
+            found = PR_FALSE;
+
+          if (mContentOffset > endOffset)
+            found = PR_FALSE;
+        }
+      }
+    }
+    else if (thisNode == endNode)
+    {
+      if (mContentOffset < endOffset)
+        found = PR_TRUE;
+      else
+      {
+        found = PR_FALSE;
+      }
+    }
+    else
+    {
+      found = PR_TRUE;
+    }
+  }
+  else {
+    // null range means the whole thing
+    found = PR_TRUE;
   }
 
-    if (GetContent() == range->GetEndParent()) {
-      endOffset = range->EndOffset();
-    } else {
-      endOffset = PR_INT32_MAX;
-    }
-  } else {
-    startOffset = 0;
-    endOffset = PR_INT32_MAX;
-  }
-
-  PRBool empty = (startOffset == endOffset);
-
-  nsTextFrame* start = this;
-  nsTextFrame* cur;
-  for (cur = start; cur;
-       cur = NS_STATIC_CAST(nsTextFrame*, cur->GetNextContinuation())) {
-    if (cur->mContentOffset >= endOffset) {
-      break;
-    }
-
-    if (cur->mContentOffset + cur->mContentLength > startOffset) {
-      cur->DoSetSelected(aSelected, empty);
-    }
-  }
-  for (cur = NS_STATIC_CAST(nsTextFrame*, start->GetPrevContinuation());
-       cur;
-       cur = NS_STATIC_CAST(nsTextFrame*, cur->GetPrevContinuation())) {
-    // XXXbz is it cheaper to just always call DoSetSelected on our immediate
-    // prev continuation and then not have to do additions when comparing to
-    // startOffset?  Not like it matters, since this is always getting called
-    // on mContent's primary frame as far as I can tell...
-    if (cur->mContentOffset + cur->mContentLength <= startOffset) {
-      break;
-    }
-
-    if (cur->mContentOffset < endOffset) {
-      cur->DoSetSelected(aSelected, empty);
-    }
-  }
-
-  return NS_OK;
-}
-
-void
-nsTextFrame::DoSetSelected(PRBool aSelected, PRBool aSelectionEmpty)
-{  
   if ( aSelected )
     AddStateBits(NS_FRAME_SELECTED_CONTENT);
   else
@@ -4323,7 +4320,7 @@ nsTextFrame::DoSetSelected(PRBool aSelected, PRBool aSelectionEmpty)
     PRInt32 offset;
     PRInt32 length;
 
-    nsresult rv = GetContentAndOffsetsForSelection(GetPresContext(),
+    nsresult rv = GetContentAndOffsetsForSelection(aPresContext,
                                                    getter_AddRefs(content),
                                                    &offset, &length);
     if (NS_SUCCEEDED(rv) && content) {
@@ -4343,13 +4340,26 @@ nsTextFrame::DoSetSelected(PRBool aSelected, PRBool aSelectionEmpty)
       delete details;
     }
   }
-  if (!aSelectionEmpty){ // Otherwise, this is the caret, which will repaint
+  if (found){ //if range contains this frame...
-                         // itself.
     // Selection might change our border, content and outline appearance
     // But textframes can't have an outline. So just use the simple
     // bounds
     Invalidate(nsRect(0, 0, mRect.width, mRect.height), PR_FALSE);
   }
+  if (aSpread == eSpreadDown)
+  {
+    nsIFrame* frame = GetPrevContinuation();
+    while(frame){
+      frame->SetSelected(aPresContext, aRange,aSelected,eSpreadNone);
+      frame = frame->GetPrevContinuation();
+    }
+    frame = GetNextContinuation();
+    while (frame){
+      frame->SetSelected(aPresContext, aRange,aSelected,eSpreadNone);
+      frame = frame->GetNextContinuation();
+    }
+  }
+  return NS_OK;
 }
 
 NS_IMETHODIMP