RenderTextHarfBuzz: Allow mid-glyph cursors in multi-grapheme clusters

ui/gfx/render_text.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_GFX_RENDER_TEXT_H_
 #define UI_GFX_RENDER_TEXT_H_
 
 #include <algorithm>
 #include <cstring>
 #include <string>
@@ skipping 19 matching lines @@
 #include "ui/gfx/size_f.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/gfx/vector2d.h"
 
 class SkCanvas;
 class SkDrawLooper;
 struct SkPoint;
 class SkShader;
 class SkTypeface;
 
+namespace base {
+namespace i18n {
+class BreakIterator;
+}
+}
+
 namespace gfx {
 
 class Canvas;
 class Font;
 class RenderTextTest;
 
 namespace internal {
 
 // Internal helper class used by derived classes to draw text through Skia.
 class SkiaTextRenderer {
@@ skipping 375 matching lines @@
 
  protected:
   RenderText();
 
   const BreakList<SkColor>& colors() const { return colors_; }
   const std::vector<BreakList<bool> >& styles() const { return styles_; }
 
   const std::vector<internal::Line>& lines() const { return lines_; }
   void set_lines(std::vector<internal::Line>* lines) { lines_.swap(*lines); }
 
+  base::i18n::BreakIterator* grapheme_iterator() {
+      return grapheme_iterator_.get();

[msw, 2014/07/25 00:37:00]

nit: fix indent

[ckocagil, 2014/07/29 23:13:41]

Done.

+  }
+
   // Returns the baseline of the current text.  The return value depends on
   // the text and its layout while the return value of GetBaseline() doesn't.
   // GetAlignmentOffset() takes into account the difference between them.
   //
   // We'd like a RenderText to show the text always on the same baseline
   // regardless of the text, so the text does not jump up or down depending
   // on the text.  However, underlying layout engines return different baselines
   // depending on the text.  In general, layout engines determine the minimum
   // bounding box for the text and return the baseline from the top of the
   // bounding box.  So the baseline changes depending on font metrics used to
@@ skipping 253 matching lines @@
   // Text shadows to be drawn.
   ShadowValues shadows_;
 
   // A list of valid layout text line break positions.
   BreakList<size_t> line_breaks_;
 
   // Lines computed by EnsureLayout. These should be invalidated with
   // ResetLayout and on |display_rect_| changes.
   std::vector<internal::Line> lines_;
 
+  // ICU grapheme iterator for the layout text. Can be NULL in case of an error.
+  scoped_ptr<base::i18n::BreakIterator> grapheme_iterator_;

[msw, 2014/07/25 00:37:00]

Move this to RenderTextHarfBuzz if it's only used in that impl for now. You
should be able to initalize it on ItemizeText, right?

[ckocagil, 2014/07/29 23:13:41]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(RenderText);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_RENDER_TEXT_H_