Use cached composition bounds for firstRectForCharacterRange

content/browser/renderer_host/render_widget_host_view_mac.h

Index: content/browser/renderer_host/render_widget_host_view_mac.h
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
index 447c7c7f826e16bc1db737e84ae700ab1f9bd33c..d1568cf3342fd8cf4e61e52ce6ce617658a41e35 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.h
+++ b/content/browser/renderer_host/render_widget_host_view_mac.h
@@ -331,6 +331,28 @@ class RenderWidgetHostViewMac : public content::RenderWidgetHostViewBase {
   // no effect if there are no pending requests.
   void AckPendingSwapBuffers();
 
+  // Returns true and store first rectangle for character range if the requested
+  // |range| is already cached otherwise return false.
+  bool GetCachedFirstRectForCharacterRange(NSRange range, NSRect* rect);
+
+  // Returns true if there is line break in |range| and store line breaking
+  // point to |line_breaking_point|. The |line_breaking_point| is valid only if
+  // this function returns true.
+  bool GetLineBreakIdx(const std::vector<gfx::Rect>& bounds,
+                       const ui::Range& range,
+                       size_t* line_break_point);
+
+  // Returns composition character boundary rectangle. The |range| is
+  // composition based range. This function returns previous caret rectangle if
+  // the requested range is invalid or the latest composition is not sent from
+  // renderer.
+  gfx::Rect GetFirstRectForCompositionRange(const ui::Range& range);
+
+  // Converts from given whole character range to composition oriented range. If
+  // the conversion failed, return ui::Range::InvalidRange.
+  ui::Range ConvertCharacterRangeToCompositionRange(
+      const ui::Range& request_range);
+
   // These member variables should be private, but the associated ObjC class
   // needs access to them and can't be made a friend.
 
@@ -427,6 +449,10 @@ class RenderWidgetHostViewMac : public content::RenderWidgetHostViewBase {
   //   pairs of (route_id, gpu_host_id).
   std::list<std::pair<int32, int32> > pending_swap_buffers_acks_;
 
+  ui::Range composition_range_;
+  std::vector<gfx::Rect> composition_bounds_;
+  gfx::Rect caret_rect_;

[James Su, 2012/07/04 01:44:04]

caret_rect_ is not used at all.

[Seigo Nonaka, 2012/07/04 06:56:58]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
 };