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

ui/gfx/render_text_harfbuzz.h

 // Copyright 2014 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_HARFBUZZ_H_
 #define UI_GFX_RENDER_TEXT_HARFBUZZ_H_
 
+#include "base/i18n/break_iterator.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "third_party/harfbuzz-ng/src/hb.h"
 #include "third_party/icu/source/common/unicode/ubidi.h"
 #include "third_party/icu/source/common/unicode/uscript.h"
 #include "ui/gfx/render_text.h"
 
 namespace gfx {
 
 namespace internal {
 
 struct GFX_EXPORT TextRunHarfBuzz {
   TextRunHarfBuzz();
   ~TextRunHarfBuzz();
 
   // Returns the index of the first glyph that corresponds to the character at
   // |pos|.
   size_t CharToGlyph(size_t pos) const;
 
   // Returns the corresponding glyph range of the given character range.
   // |range| is in text-space (0 corresponds to |GetLayoutText()[0]|). Returned
   // value is in run-space (0 corresponds to the first glyph in the run).
   Range CharRangeToGlyphRange(const Range& range) const;
 
+  // Writes the character and glyph ranges of the cluster containing |pos|.
+  void GetClusterAt(size_t pos, Range* chars, Range* glyphs) const;
+
+  // Returns bounds of the grapheme at |text_index|. Handles multi-grapheme

[msw, 2014/06/29 22:29:10]

nit: s/bounds of the grapheme/the grapheme bounds/ for a one-liner.

[ckocagil, 2014/07/24 21:46:56]

Done.

+  // glyphs.
+  Range GetGraphemeBounds(const base::string16& text, size_t text_index);
+
   // Returns whether the given shaped run contains any missing glyphs.
   bool HasMissingGlyphs() const;
 
-  // Returns the X coordinate of the leading or |trailing| edge of the glyph
-  // starting at |text_index|, relative to the left of the text (not the view).
-  int GetGlyphXBoundary(size_t text_index, bool trailing) const;
+  base::i18n::BreakIterator* GetGraphemeIterator(const base::string16& text);
 
   int width;
   int preceding_run_widths;
   Range range;
   bool is_rtl;
   UBiDiLevel level;
   UScriptCode script;
+  scoped_ptr<base::i18n::BreakIterator> grapheme_iterator;
 
   scoped_ptr<uint16[]> glyphs;
   scoped_ptr<SkPoint[]> positions;
-  scoped_ptr<uint32[]> glyph_to_char;
+  std::vector<uint32> glyph_to_char;
   size_t glyph_count;
 
   skia::RefPtr<SkTypeface> skia_face;
   int font_size;
   int font_style;
   bool strike;
   bool diagonal_strike;
   bool underline;
 
  private:
@@ skipping 62 matching lines @@
   std::vector<int32_t> logical_to_visual_;
 
   bool needs_layout_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderTextHarfBuzz);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_RENDER_TEXT_HARFBUZZ_H_