small changes for 22752 ctrl left and right. r=cmanske

layout/generic/nsFrame.cpp

@@ -1187,9 +1187,9 @@ nsresult nsFrame::GetContentAndOffsetsFromPoint(nsIPresContext* aCX,
   result = mContent->GetParent(*aNewContent);
   if (*aNewContent){
     result = (*aNewContent)->IndexOf(mContent, aContentOffset);
-    if (NS_FAILED(result)) 
+    if (NS_FAILED(result) || aContentOffset < 0) 
     {
-      return result;
+      return (result?result:NS_ERROR_FAILURE);
     }
     aBeginFrameContent = PR_TRUE;
     if (thisRect.Contains(aPoint))

layout/generic/nsTextFrame.cpp

@@ -2591,6 +2591,10 @@ nsTextFrame::PeekOffset(nsIPresContext* aPresContext, nsPeekOffsetStruct *aPos)
         {
           if (NS_SUCCEEDED(result = aPos->mResultFrame->PeekOffset(aPresContext, aPos)))
             return NS_OK;//else fall through
+          else if (aPos->mDirection == eDirNext)
+            aPos->mContentOffset = mContentOffset + mContentLength;
+          else
+            aPos->mContentOffset = mContentOffset;
         }
         else 
           aPos->mResultContent = mContent;

layout/html/base/src/nsFrame.cpp

@@ -1187,9 +1187,9 @@ nsresult nsFrame::GetContentAndOffsetsFromPoint(nsIPresContext* aCX,
   result = mContent->GetParent(*aNewContent);
   if (*aNewContent){
     result = (*aNewContent)->IndexOf(mContent, aContentOffset);
-    if (NS_FAILED(result)) 
+    if (NS_FAILED(result) || aContentOffset < 0) 
     {
-      return result;
+      return (result?result:NS_ERROR_FAILURE);
     }
     aBeginFrameContent = PR_TRUE;
     if (thisRect.Contains(aPoint))

layout/html/base/src/nsTextFrame.cpp

@@ -2591,6 +2591,10 @@ nsTextFrame::PeekOffset(nsIPresContext* aPresContext, nsPeekOffsetStruct *aPos)
         {
           if (NS_SUCCEEDED(result = aPos->mResultFrame->PeekOffset(aPresContext, aPos)))
             return NS_OK;//else fall through
+          else if (aPos->mDirection == eDirNext)
+            aPos->mContentOffset = mContentOffset + mContentLength;
+          else
+            aPos->mContentOffset = mContentOffset;
         }
         else 
           aPos->mResultContent = mContent;