Bug 1048752. Part 37: GetGeometryForFrame should return a rect instead of an nsresult. r=tn

--HG--
extra : rebase_source : f49846cc50de2a3a616a991d81b38bf6c1d9a2c5

layout/base/nsCaret.cpp

@@ -273,16 +273,20 @@ void nsCaret::SetCaretReadOnly(bool inMakeReadonly)
   SchedulePaint();
 }
 
-/* static */ nsresult
+/* static */ nsRect
 nsCaret::GetGeometryForFrame(nsIFrame* aFrame,
                              int32_t   aFrameOffset,
-                             nsRect*   aRect,
                              nscoord*  aBidiIndicatorSize)
 {
   nsPoint framePos(0, 0);
+  nsRect rect;
   nsresult rv = aFrame->GetPointFromOffset(aFrameOffset, &framePos);
-  if (NS_FAILED(rv))
+  if (NS_FAILED(rv)) {
-    return rv;
+    if (aBidiIndicatorSize) {
+      *aBidiIndicatorSize = 0;
+    }
+    return rect;
+  }
 
   nsIFrame* frame = aFrame->GetContentInsertionFrame();
   if (!frame) {
@@ -303,7 +307,7 @@ nsCaret::GetGeometryForFrame(nsIFrame* aFrame,
   nscoord height = ascent + descent;
   framePos.y = baseline - ascent;
   Metrics caretMetrics = ComputeMetrics(aFrame, aFrameOffset, height);
-  *aRect = nsRect(framePos, nsSize(caretMetrics.mCaretWidth, height));
+  rect = nsRect(framePos, nsSize(caretMetrics.mCaretWidth, height));
 
   // Clamp the x-position to be within our scroll frame. If we don't, then it
   // clips us, and we don't appear at all. See bug 335560.
@@ -313,20 +317,21 @@ nsCaret::GetGeometryForFrame(nsIFrame* aFrame,
     // First, use the scrollFrame to get at the scrollable view that we're in.
     nsIScrollableFrame *sf = do_QueryFrame(scrollFrame);
     nsIFrame *scrolled = sf->GetScrolledFrame();
-    nsRect caretInScroll = *aRect + aFrame->GetOffsetTo(scrolled);
+    nsRect caretInScroll = rect + aFrame->GetOffsetTo(scrolled);
 
     // Now see if thet caret extends beyond the view's bounds. If it does,
     // then snap it back, put it as close to the edge as it can.
     nscoord overflow = caretInScroll.XMost() -
       scrolled->GetVisualOverflowRectRelativeToSelf().width;
-    if (overflow > 0)
+    if (overflow > 0) {
-      aRect->x -= overflow;
+      rect.x -= overflow;
+    }
   }
 
-  if (aBidiIndicatorSize)
+  if (aBidiIndicatorSize) {
     *aBidiIndicatorSize = caretMetrics.mBidiIndicatorSize;
-
+  }
-  return NS_OK;
+  return rect;
 }
 
 static nsIFrame*
@@ -372,7 +377,7 @@ nsCaret::GetGeometry(nsISelection* aSelection, nsRect* aRect)
   nsIFrame* frame = GetFrameAndOffset(
       static_cast<Selection*>(aSelection), nullptr, 0, &frameOffset);
   if (frame) {
-    GetGeometryForFrame(frame, frameOffset, aRect, nullptr);
+    *aRect = GetGeometryForFrame(frame, frameOffset, nullptr);
   }
   return frame;
 }
@@ -818,12 +823,7 @@ nsCaret::ComputeCaretRects(nsIFrame* aFrame, int32_t aFrameOffset,
   NS_ASSERTION(aFrame, "Should have a frame here");
 
   nscoord bidiIndicatorSize;
-  nsresult rv =
+  *aCaretRect = GetGeometryForFrame(aFrame, aFrameOffset, &bidiIndicatorSize);
-    GetGeometryForFrame(aFrame, aFrameOffset, aCaretRect, &bidiIndicatorSize);
-  if (NS_FAILED(rv)) {
-    *aCaretRect = *aHookRect = nsRect();
-    return;
-  }
 
   // on RTL frames the right edge of mCaretRect must be equal to framePos
   const nsStyleVisibility* vis = aFrame->StyleVisibility();

layout/base/nsCaret.h

@@ -164,10 +164,9 @@ protected:
     };
     static Metrics ComputeMetrics(nsIFrame* aFrame, int32_t aOffset,
                                   nscoord aCaretHeight);
-    static nsresult GetGeometryForFrame(nsIFrame* aFrame,
+    static nsRect GetGeometryForFrame(nsIFrame* aFrame,
-                                        int32_t   aFrameOffset,
+                                      int32_t   aFrameOffset,
-                                        nsRect*   aRect,
+                                      nscoord*  aBidiIndicatorSize);
-                                        nscoord*  aBidiIndicatorSize);
 
     void          ComputeCaretRects(nsIFrame* aFrame, int32_t aFrameOffset,
                                     nsRect* aCaretRect, nsRect* aHookRect);