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..470ea8f6cddb0e642c843028883fcc99dde7d1d7 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,29 @@ class RenderWidgetHostViewMac : public content::RenderWidgetHostViewBase {
   // no effect if there are no pending requests.
   void AckPendingSwapBuffers();
 
+  // Returns true and stores first rectangle for character range if the
+  // requested |range| is already cached, otherwise returns false.
+  bool GetCachedFirstRectForCharacterRange(NSRange range, NSRect* rect,
+                                           NSRange* actual_range);
+
+  // Returns true if there is line break in |range| and stores line breaking
+  // point to |line_breaking_point|. The |line_breaking_point| is valid only if

[Nico, 2012/07/21 16:43:27]

s/line_breaking_point/line_break_point/

[Seigo Nonaka, 2012/07/23 08:36:55]

Done.

+  // this function returns true.
+  bool GetLineBreakIdx(const std::vector<gfx::Rect>& bounds,

[Nico, 2012/07/21 16:43:27]

nit: No abbreviations in method names

[Seigo Nonaka, 2012/07/23 08:36:55]

Done.

+                       const ui::Range& range,
+                       size_t* line_break_point);
+
+  // Returns composition character boundary rectangle. The |range| is
+  // composition based range. Also stores |actual_range| which is corresponding
+  // to actually used range for returned rectangle.
+  gfx::Rect GetFirstRectForCompositionRange(const ui::Range& range,
+                                            ui::Range* actual_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 +450,13 @@ class RenderWidgetHostViewMac : public content::RenderWidgetHostViewBase {
   //   pairs of (route_id, gpu_host_id).
   std::list<std::pair<int32, int32> > pending_swap_buffers_acks_;
 
+  // The current composition character range and it's bounds.

[Nico, 2012/07/21 16:43:27]

s/it's/its/

[Seigo Nonaka, 2012/07/23 08:36:55]

Done.

+  ui::Range composition_range_;
+  std::vector<gfx::Rect> composition_bounds_;
+
+  // The current caret bounds.
+  gfx::Rect caret_rect_;
+
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
 };