Defect 248426: Speak rendered text when no selection is made on Mac

content/browser/renderer_host/render_widget_host_view_mac.mm

Index: content/browser/renderer_host/render_widget_host_view_mac.mm
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index aa202cced95c8ebd868c9525be457e1d8d1aaf44..85c1556bf9276fd643c7c9814fa28c03991b67d6 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -465,7 +465,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget)
   // |GetNativeView()| into the view hierarchy right after calling us.
   cocoa_view_ = [[[RenderWidgetHostViewCocoa alloc]
                   initWithRenderWidgetHostViewMac:this] autorelease];
-
   background_layer_.reset([[CALayer alloc] init]);
   [background_layer_
       setBackgroundColor:CGColorGetConstantColor(kCGColorWhite)];
@@ -629,6 +628,7 @@ bool RenderWidgetHostViewMac::OnMessageReceived(const IPC::Message& message) {
   IPC_BEGIN_MESSAGE_MAP(RenderWidgetHostViewMac, message)
     IPC_MESSAGE_HANDLER(ViewHostMsg_PluginFocusChanged, OnPluginFocusChanged)
     IPC_MESSAGE_HANDLER(ViewHostMsg_StartPluginIme, OnStartPluginIme)
+    IPC_MESSAGE_HANDLER(ViewMsg_ExtractedDataFromRect, OnExtractedDataFromRect)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
@@ -1055,6 +1055,15 @@ bool RenderWidgetHostViewMac::SupportsSpeech() const {
 }
 
 void RenderWidgetHostViewMac::SpeakSelection() {
+  if (!selected_text_.size()) {

[Alexei Svitkine (slow), 2014/06/19 14:55:09]

empty()

+    if (render_widget_host_) {
+      // Route an IPC message to get SmartClipData from Rect
+      gfx::Rect rect(0, 0, GetViewBounds().width(), GetViewBounds().height());
+      render_widget_host_->Send(new ViewMsg_GetSmartClipDataFromRect(
+        render_widget_host_->GetRoutingID(), rect));
+      return;
+    }
+  }
   if ([NSApp respondsToSelector:@selector(speakString:)])
     [NSApp speakString:base::SysUTF8ToNSString(selected_text_)];
 }
@@ -1065,6 +1074,9 @@ bool RenderWidgetHostViewMac::IsSpeaking() const {
 }
 
 void RenderWidgetHostViewMac::StopSpeaking() {
+  // Clear selected text when StopSpeaking is called
+  if (selected_text_.size())
+    selected_text_.clear();
   if ([NSApp respondsToSelector:@selector(stopSpeaking:)])
     [NSApp stopSpeaking:cocoa_view_];
 }
@@ -2042,6 +2054,14 @@ void RenderWidgetHostViewMac::OnStartPluginIme() {
   [cocoa_view_ setPluginImeActive:YES];
 }
 
+void RenderWidgetHostViewMac::OnExtractedDataFromRect(const std::string& text) {
+  // Let TTS speak the text returned from call back
+  if (text.size()) {

[Alexei Svitkine (slow), 2014/06/19 14:55:09]

!empty()

+    if ([NSApp respondsToSelector:@selector(speakString:)])
+      [NSApp speakString:base::SysUTF8ToNSString(text)];
+  }
+}
+
 gfx::Rect RenderWidgetHostViewMac::GetScaledOpenGLPixelRect(
     const gfx::Rect& rect) {
   gfx::Rect src_gl_subrect = rect;
@@ -2270,7 +2290,6 @@ void RenderWidgetHostViewMac::AcceleratedLayerDidDrawFrame(bool succeeded) {
     focusedPluginIdentifier_ = -1;
     renderWidgetHostView_->backing_store_scale_factor_ =
         ui::GetScaleFactorForNativeView(self);
-

[Alexei Svitkine (slow), 2014/06/19 14:55:09]

Nit: Remove superflous change

     // OpenGL support:
     if ([self respondsToSelector:
         @selector(setWantsBestResolutionOpenGLSurface:)]) {
@@ -3895,6 +3914,7 @@ extern NSString *NSTextInputReplacementRangeAttributeName;
 //
 @implementation RenderWidgetHostViewCocoa(NSServicesRequests)
 
+

[Alexei Svitkine (slow), 2014/06/19 14:55:09]

Nit: Remove superflous change

 - (BOOL)writeSelectionToPasteboard:(NSPasteboard*)pboard
                              types:(NSArray*)types {
   const std::string& str = renderWidgetHostView_->selected_text();