Bug 331440: Remove eSelectDir from nsSelectionAmount enum, and all references to it. r+sr=roc

layout/generic/nsFrame.cpp

@@ -4545,8 +4545,6 @@ nsFrame::GetFrameFromDirection(nsPresContext* aPresContext, nsPeekOffsetStruct *
         }
       }
     }
-    if (aPos->mAmount == eSelectDir)
-      aPos->mAmount = eSelectNoAmount;//just get to next frame.
     nsCOMPtr<nsIBidirectionalEnumerator> frameTraversal;
     result = NS_NewFrameTraversal(getter_AddRefs(frameTraversal),
 #ifdef IBMBIDI

layout/generic/nsIFrame.h

@@ -240,8 +240,7 @@ enum nsSelectionAmount {
   eSelectBeginLine = 3,
   eSelectEndLine   = 4,
   eSelectNoAmount  = 5,   //just bounce back current offset.
-  eSelectDir       = 6,   //select next/previous frame based on direction
-  eSelectParagraph = 7    //select a "paragraph"
+  eSelectParagraph = 6    //select a "paragraph"
 };
 
 enum nsDirection {

layout/generic/nsSelection.cpp

@@ -1448,7 +1448,6 @@ nsSelection::MoveCaret(PRUint32 aKeycode, PRBool aContinueSelection, nsSelection
         default:
           // If the current position is not a frame boundary, it's enough just to take the Bidi level of the current frame
           if ((pos.mContentOffset != frameStart && pos.mContentOffset != frameEnd)
-              || (eSelectDir == aAmount)
               || (eSelectLine == aAmount))
           {
             mShell->SetCaretBidiLevel(NS_GET_EMBEDDING_LEVEL(theFrame));

layout/generic/nsTextFrame.cpp

@@ -4630,7 +4630,6 @@ nsTextFrame::PeekOffset(nsPresContext* aPresContext, nsPeekOffsetStruct *aPos)
       }
       else
       {
-        aPos->mAmount = eSelectDir;//go to "next" or previous frame based on direction not THIS frame
         result = GetFrameFromDirection(aPresContext, aPos);
         if (NS_SUCCEEDED(result) && aPos->mResultFrame && aPos->mResultFrame!= this)
           return aPos->mResultFrame->PeekOffset(aPresContext, aPos);
@@ -4993,17 +4992,6 @@ nsTextFrame::PeekOffset(nsPresContext* aPresContext, nsPeekOffsetStruct *aPos)
     }
     break;
 
-#ifdef IBMBIDI
-    case eSelectDir:
-      result = GetFrameFromDirection(aPresContext, aPos);
-      if (NS_SUCCEEDED(result) && aPos->mResultFrame && aPos->mResultFrame!= this)
-        return aPos->mResultFrame->PeekOffset(aPresContext, aPos);
-      else {
-        return result;
-      }
-      break;
-#endif
-
     default:
       result = NS_ERROR_FAILURE; break;
   }