[MacViews] Implemented text context menu

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"
 #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/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/decorated_text_mac.h"

[tapted, 2016/12/21 11:20:27]

nit: import

[spqchan, 2016/12/21 22:00:13]

Done.

 #include "ui/gfx/geometry/rect.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
 #include "ui/gfx/path.h"
 #import "ui/gfx/path_mac.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 #import "ui/views/cocoa/bridged_native_widget.h"
 #import "ui/views/cocoa/drag_drop_client_mac.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_controller.h"
@@ skipping 169 matching lines @@
   DCHECK([event type] == NSKeyDown || [event type] == NSKeyUp);
   DCHECK_EQ(1u, [[event characters] length]);
 
   // [NSEvent characters] already considers the pressed key modifiers. Hence
   // send ui::EF_NONE as the key modifier to the KeyEvent constructor.
   // E.g. For Alt+S, [NSEvent characters] is 'ß' and not 'S'.
   return ui::KeyEvent([[event characters] characterAtIndex:0],
                       ui::KeyboardCodeFromNSEvent(event), ui::EF_NONE);
 }
 
-NSAttributedString* GetAttributedString(
-    const gfx::DecoratedText& decorated_text) {
-  base::scoped_nsobject<NSMutableAttributedString> str(
-      [[NSMutableAttributedString alloc]
-          initWithString:base::SysUTF16ToNSString(decorated_text.text)]);
-  [str beginEditing];
-
-  NSValue* const line_style =
-      @(NSUnderlineStyleSingle | NSUnderlinePatternSolid);
-
-  for (const auto& attribute : decorated_text.attributes) {
-    DCHECK(!attribute.range.is_reversed());
-    DCHECK_LE(attribute.range.end(), [str length]);
-
-    NSMutableDictionary* attrs = [NSMutableDictionary dictionary];
-    NSRange range = attribute.range.ToNSRange();
-
-    if (attribute.font.GetNativeFont())
-      attrs[NSFontAttributeName] = attribute.font.GetNativeFont();
-
-    // NSFont does not have underline as an attribute. Hence handle it
-    // separately.
-    const bool underline = attribute.font.GetStyle() & gfx::Font::UNDERLINE;
-    if (underline)
-      attrs[NSUnderlineStyleAttributeName] = line_style;
-
-    if (attribute.strike)
-      attrs[NSStrikethroughStyleAttributeName] = line_style;
-
-    [str setAttributes:attrs range:range];
-  }
-
-  [str endEditing];
-  return str.autorelease();
-}
-
 ui::TextEditCommand GetTextEditCommandForMenuAction(SEL action) {
   if (action == @selector(undo:))
     return ui::TextEditCommand::UNDO;
   if (action == @selector(redo:))
     return ui::TextEditCommand::REDO;
   if (action == @selector(cut:))
     return ui::TextEditCommand::CUT;
   if (action == @selector(copy:))
     return ui::TextEditCommand::COPY;
   if (action == @selector(paste:))
     return ui::TextEditCommand::PASTE;
   if (action == @selector(selectAll:))
     return ui::TextEditCommand::SELECT_ALL;
   return ui::TextEditCommand::INVALID_COMMAND;
 }
 
 }  // namespace
 
+// TODO(spqchan): Implement support with the Speech submenu is the main menu.

[tapted, 2016/12/21 11:20:27]

is -> in

[spqchan, 2016/12/21 22:00:13]

Done.

 @interface BridgedContentView ()
 
 // Returns the active menu controller corresponding to |hostedView_|,
 // nil otherwise.
 - (MenuController*)activeMenuController;
 
 // Passes |event| to the InputMethod for dispatch.
 - (void)handleKeyEvent:(ui::KeyEvent*)event;
 
 // Allows accelerators to be handled at different points in AppKit key event
@@ skipping 550 matching lines @@
     return;
 
   views::WordLookupClient* wordLookupClient = target->GetWordLookupClient();
   if (!wordLookupClient)
     return;
 
   gfx::Point locationInTarget = locationInContent;
   views::View::ConvertPointToTarget(hostedView_, target, &locationInTarget);
   gfx::DecoratedText decoratedWord;
   gfx::Point baselinePoint;
-  if (!wordLookupClient->GetDecoratedWordAtPoint(
+  if (!wordLookupClient->GetDecoratedWordAndBaselineAtPoint(
           locationInTarget, &decoratedWord, &baselinePoint)) {
     return;
   }
 
   // Convert |baselinePoint| to the coordinate system of |hostedView_|.
   views::View::ConvertPointToTarget(target, hostedView_, &baselinePoint);
   NSPoint baselinePointAppKit = NSMakePoint(
       baselinePoint.x(), NSHeight([self frame]) - baselinePoint.y());
-  [self showDefinitionForAttributedString:GetAttributedString(decoratedWord)
+  [self showDefinitionForAttributedString:
+            gfx::GetAttributedStringFromDecoratedText(decoratedWord)
                                   atPoint:baselinePointAppKit];
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NSResponder Action Messages. Keep sorted according NSResponder.h (from the
 // 10.9 SDK). The list should eventually be complete. Anything not defined will
 // beep when interpretKeyEvents: would otherwise call it.
 // TODO(tapted): Make this list complete, except for insert* methods which are
 // dispatched as regular key events in doCommandBySelector:.
 
@@ skipping 611 matching lines @@
   return [hostedView_->GetNativeViewAccessible() accessibilityHitTest:point];
 }
 
 - (id)accessibilityFocusedUIElement {
   if (!hostedView_)
     return nil;
   return [hostedView_->GetNativeViewAccessible() accessibilityFocusedUIElement];
 }
 
 @end