[MacViews] Implemented text context menu

content/browser/renderer_host/render_widget_host_view_mac.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 CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 #include <IOSurface/IOSurface.h>
 #include <stddef.h>
@@ skipping 249 matching lines @@
   bool IsSurfaceAvailableForCopy() const override;
   void Show() override;
   void Hide() override;
   bool IsShowing() override;
   void WasUnOccluded() override;
   void WasOccluded() override;
   gfx::Rect GetViewBounds() const override;
   void SetShowingContextMenu(bool showing) override;
   void SetActive(bool active) override;
   void ShowDefinitionForSelection() override;
-  bool SupportsSpeech() const override;
   void SpeakSelection() override;
-  bool IsSpeaking() const override;
-  void StopSpeaking() override;
   void SetBackgroundColor(SkColor color) override;
   void SetNeedsBeginFrames(bool needs_begin_frames) override;
 
   // Implementation of RenderWidgetHostViewBase.
   void InitAsPopup(RenderWidgetHostView* parent_host_view,
                    const gfx::Rect& pos) override;
   void InitAsFullscreen(RenderWidgetHostView* reference_host_view) override;
   void Focus() override;
   void UpdateCursor(const WebCursor& cursor) override;
   void SetIsLoading(bool is_loading) override;
@@ skipping 83 matching lines @@
   void OnDisplayMetricsChanged(const display::Display& display,
                                uint32_t metrics) override;
 
   // Forwards the mouse event to the renderer.
   void ForwardMouseEvent(const blink::WebMouseEvent& event);
 
   void KillSelf();
 
   void SetTextInputActive(bool active);
 
-  const std::string& selected_text() const { return selected_text_; }
+  const base::string16& selected_text() const { return selected_text_; }
   const gfx::Range& composition_range() const { return composition_range_; }
   const base::string16& selection_text() const { return selection_text_; }
   size_t selection_text_offset() const { return selection_text_offset_; }
 
   // Returns true and stores first rectangle for character range if the
   // requested |range| is already cached, otherwise returns false.
   // Exposed for testing.
   CONTENT_EXPORT bool GetCachedFirstRectForCharacterRange(
       NSRange range, NSRect* rect, NSRange* actual_range);
 
@@ skipping 90 matching lines @@
   friend class RenderWidgetHostViewMacTest;
 
   // Returns whether this render view is a popup (autocomplete window).
   bool IsPopup() const;
 
   // Shuts down the render_widget_host_.  This is a separate function so we can
   // invoke it from the message loop.
   void ShutdownHost();
 
   // IPC message handlers.
+  // TODO(spqchan): Change |text| to be the type string16.

[Alexei Svitkine (slow), 2017/02/03 15:43:30]

Nit: Still my previous comment of giving more context here - or moving this to
the .cc file.

The context here could be " in order to avoid a string conversion in Xyz()".

[spqchan, 2017/02/03 23:32:10]

Done.

   void OnGetRenderedTextCompleted(const std::string& text);
 
   // Send updated vsync parameters to the top level display.
   void UpdateDisplayVSyncParameters();
 
-  // Dispatches a TTS session.
-  void SpeakText(const std::string& text);
-
   // Get the focused view that should be used for retrieving the text selection.
   RenderWidgetHostViewBase* GetFocusedViewForTextSelection();
 
   // Adds/Removes frame observer based on state.
   void UpdateNeedsBeginFramesInternal();
 
   // The associated view. This is weak and is inserted into the view hierarchy
   // to own this RenderWidgetHostViewMac object. Set to nil at the start of the
   // destructor.
   RenderWidgetHostViewCocoa* cocoa_view_;
 
   // Indicates if the page is loading.
   bool is_loading_;
 
   // Whether it's allowed to pause waiting for a new frame.
   bool allow_pause_for_resize_or_repaint_;
 
   // The last scroll offset of the view.
   gfx::Vector2dF last_scroll_offset_;
 
   // The text to be shown in the tooltip, supplied by the renderer.
   base::string16 tooltip_text_;
 
   // True when this view acts as a platform view hack for a
   // RenderWidgetHostViewGuest.
   bool is_guest_view_hack_;
 
   // selected text on the renderer.

[tapted, 2017/02/03 10:14:51]

nit (while you're here) selected -> Selected

[spqchan, 2017/02/03 23:32:10]

Done.

-  std::string selected_text_;
+  base::string16 selected_text_;
 
   // The window used for popup widgets.
   base::scoped_nsobject<NSWindow> popup_window_;
 
   // The fullscreen window used for pepper flash.
   base::scoped_nsobject<NSWindow> pepper_fullscreen_window_;
   base::scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_;
   // Our parent host view, if this is fullscreen.  NULL otherwise.
   RenderWidgetHostViewMac* fullscreen_parent_host_view_;
 
@@ skipping 11 matching lines @@
 
   // Whether a request for begin frames has been issued.
   bool needs_begin_frames_;
 
   // Whether a request to flush input has been issued.
   bool needs_flush_input_;
 
   // TODO(ekaramad): Remove the following locals and get the selection
   // information directly from TextInputManager.
   // A buffer containing the text inside and around the current selection range.
   base::string16 selection_text_;

[tapted, 2017/02/03 10:14:51]

huh - this is new. A little confusing having |selected_text_| and
|selection_text_| -- I think this is only text selected in an editable element
(and from the TODO I guess it's going away).

[spqchan, 2017/02/03 23:32:10]

Added a comment for it

 
   // The offset of the text stored in |selection_text_| relative to the start of
   // the web page.
   size_t selection_text_offset_;
 
   // The current selection range relative to the start of the web page.
   gfx::Range selection_range_;
 
   // Factory used to safely scope delayed calls to ShutdownHost().
   base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_