Manky attempt with TextInputClient

ui/views/cocoa/bridged_content_view.mm

 // 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.
 
 #import "ui/views/cocoa/bridged_content_view.h"
 
 #include "base/logging.h"
 #import "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #import "base/mac/sdk_forward_declarations.h"
 #include "base/strings/sys_string_conversions.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "ui/base/cocoa/appkit_utils.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_mac.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/text_edit_commands.h"
 #include "ui/base/ime/text_input_client.h"
+#include "ui/base/text/text_properties.h"
 #include "ui/compositor/canvas_painter.h"
 #import "ui/events/cocoa/cocoa_event_utils.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/dom/dom_code.h"
 #import "ui/events/keycodes/keyboard_code_conversion_mac.h"
 #include "ui/gfx/canvas_paint_mac.h"
 #include "ui/gfx/decorated_text.h"
 #include "ui/gfx/geometry/rect.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
 #include "ui/gfx/path.h"
@@ skipping 47 matching lines @@
 }
 
 // Dispatch |event| to |menu_controller| and return true if |event| is
 // swallowed.
 bool DispatchEventToMenu(MenuController* menu_controller, ui::KeyEvent* event) {
   return menu_controller &&
          menu_controller->OnWillDispatchKeyEvent(event) ==
              ui::POST_DISPATCH_NONE;
 }
 
-// Returns true if |client| has RTL text.
-bool IsTextRTL(const ui::TextInputClient* client) {
-  return client && client->GetTextDirection() == base::i18n::RIGHT_TO_LEFT;
-}
-
-// Returns the boundary rectangle for composition characters in the
-// |requested_range|. Sets |actual_range| corresponding to the returned
-// rectangle. For cases, where there is no composition text or the
-// |requested_range| lies outside the composition range, a zero width rectangle
-// corresponding to the caret bounds is returned. Logic used is similar to
-// RenderWidgetHostViewMac::GetCachedFirstRectForCharacterRange(...).
-gfx::Rect GetFirstRectForRangeHelper(const ui::TextInputClient* client,
-                                     const gfx::Range& requested_range,
-                                     gfx::Range* actual_range) {
-  // NSRange doesn't support reversed ranges.
-  DCHECK(!requested_range.is_reversed());
-  DCHECK(actual_range);
-
-  // Set up default return values, to be returned in case of unusual cases.
-  gfx::Rect default_rect;
-  *actual_range = gfx::Range::InvalidRange();
-  if (!client)
-    return default_rect;
-
-  default_rect = client->GetCaretBounds();
-  default_rect.set_width(0);
-
-  // If possible, modify actual_range to correspond to caret position.
-  gfx::Range selection_range;
-  if (client->GetSelectionRange(&selection_range)) {
-    // Caret bounds correspond to end index of selection_range.
-    *actual_range = gfx::Range(selection_range.end());
-  }
-
-  gfx::Range composition_range;
-  if (!client->HasCompositionText() ||
-      !client->GetCompositionTextRange(&composition_range) ||
-      !composition_range.Contains(requested_range))
-    return default_rect;
-
-  DCHECK(!composition_range.is_reversed());
-
-  const size_t from = requested_range.start() - composition_range.start();
-  const size_t to = requested_range.end() - composition_range.start();
-
-  // Pick the first character's bounds as the initial rectangle, then grow it to
-  // the full |requested_range| if possible.
-  const bool request_is_composition_end = from == composition_range.length();
-  const size_t first_index = request_is_composition_end ? from - 1 : from;
-  gfx::Rect union_rect;
-  if (!client->GetCompositionCharacterBounds(first_index, &union_rect))
-    return default_rect;
-
-  // If requested_range is empty, return a zero width rectangle corresponding to
-  // it.
-  if (from == to) {
-    if (request_is_composition_end && !IsTextRTL(client)) {
-      // In case of an empty requested range at end of composition, return the
-      // rectangle to the right of the last compositioned character.
-      union_rect.set_origin(union_rect.top_right());
-    }
-    union_rect.set_width(0);
-    *actual_range = requested_range;
-    return union_rect;
-  }
-
-  // Toolkit-views textfields are always single-line, so no need to check for
-  // line breaks.
-  for (size_t i = from + 1; i < to; i++) {
-    gfx::Rect current_rect;
-    if (client->GetCompositionCharacterBounds(i, &current_rect)) {
-      union_rect.Union(current_rect);
-    } else {
-      *actual_range =
-          gfx::Range(requested_range.start(), i + composition_range.start());
-      return union_rect;
-    }
-  }
-  *actual_range = requested_range;
-  return union_rect;
-}
-
 // Returns the string corresponding to |requested_range| for the given |client|.
 // If a gfx::Range::InvalidRange() is passed, the full string stored by |client|
 // is returned. Sets |actual_range| corresponding to the returned string.
 base::string16 AttributedSubstringForRangeHelper(
     const ui::TextInputClient* client,
     const gfx::Range& requested_range,
     gfx::Range* actual_range) {
   // NSRange doesn't support reversed ranges.
   DCHECK(!requested_range.is_reversed());
   DCHECK(actual_range);
@@ skipping 1008 matching lines @@
 }
 
 - (void)moveWordLeftAndModifySelection:(id)sender {
   [self handleAction:ui::TextEditCommand::MOVE_WORD_LEFT_AND_MODIFY_SELECTION
              keyCode:ui::VKEY_LEFT
              domCode:ui::DomCode::ARROW_LEFT
           eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN];
 }
 
 - (void)moveToLeftEndOfLine:(id)sender {
-  IsTextRTL(textInputClient_) ? [self moveToEndOfLine:sender]
-                              : [self moveToBeginningOfLine:sender];
+  ui::IsTextRTL(textInputClient_) ? [self moveToEndOfLine:sender]
+                                  : [self moveToBeginningOfLine:sender];
 }
 
 - (void)moveToRightEndOfLine:(id)sender {
-  IsTextRTL(textInputClient_) ? [self moveToBeginningOfLine:sender]
-                              : [self moveToEndOfLine:sender];
+  ui::IsTextRTL(textInputClient_) ? [self moveToBeginningOfLine:sender]
+                                  : [self moveToEndOfLine:sender];
 }
 
 - (void)moveToLeftEndOfLineAndModifySelection:(id)sender {
-  IsTextRTL(textInputClient_)
+  ui::IsTextRTL(textInputClient_)
       ? [self moveToEndOfLineAndModifySelection:sender]
       : [self moveToBeginningOfLineAndModifySelection:sender];
 }
 
 - (void)moveToRightEndOfLineAndModifySelection:(id)sender {
-  IsTextRTL(textInputClient_)
+  ui::IsTextRTL(textInputClient_)
       ? [self moveToBeginningOfLineAndModifySelection:sender]
       : [self moveToEndOfLineAndModifySelection:sender];
 }
 
 // Graphical Element transposition
 
 - (void)transpose:(id)sender {
   [self handleAction:ui::TextEditCommand::TRANSPOSE
              keyCode:ui::VKEY_T
              domCode:ui::DomCode::US_T
@@ skipping 154 matching lines @@
   // For events that AppKit sends via doCommandBySelector:, first attempt to
   // handle as a Widget accelerator. Forward along the responder chain only if
   // the Widget doesn't handle it.
   if (![self handleUnhandledKeyDownAsKeyEvent])
     [[self nextResponder] doCommandBySelector:selector];
 }
 
 - (NSRect)firstRectForCharacterRange:(NSRange)range
                          actualRange:(NSRangePointer)actualNSRange {
   gfx::Range actualRange;
-  gfx::Rect rect = GetFirstRectForRangeHelper(textInputClient_,
-                                              gfx::Range(range), &actualRange);
+  gfx::Rect rect = ui::GetFirstRectForTextInputRange(
+      textInputClient_, gfx::Range(range), &actualRange);
   if (actualNSRange)
     *actualNSRange = actualRange.ToNSRange();
   return gfx::ScreenRectToNSRect(rect);
 }
 
 - (BOOL)hasMarkedText {
   return textInputClient_ && textInputClient_->HasCompositionText();
 }
 
 - (void)insertText:(id)text replacementRange:(NSRange)replacementRange {
@@ skipping 118 matching lines @@
   return [hostedView_->GetNativeViewAccessible() accessibilityHitTest:point];
 }
 
 - (id)accessibilityFocusedUIElement {
   if (!hostedView_)
     return nil;
   return [hostedView_->GetNativeViewAccessible() accessibilityFocusedUIElement];
 }
 
 @end