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

content/browser/renderer_host/render_widget_host_view_mac.mm

 // 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.
 
 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
 
 #import <objc/runtime.h>
 #include <OpenGL/gl.h>
 #include <QuartzCore/QuartzCore.h>
 
@@ skipping 452 matching lines @@
       fullscreen_parent_host_view_(NULL),
       overlay_view_weak_factory_(this),
       software_frame_weak_ptr_factory_(this) {
   software_frame_manager_.reset(new SoftwareFrameManager(
       software_frame_weak_ptr_factory_.GetWeakPtr()));
   // |cocoa_view_| owns us and we will be deleted when |cocoa_view_|
   // goes away.  Since we autorelease it, our caller must put
   // |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)];
   [cocoa_view_ setLayer:background_layer_];
   [cocoa_view_ setWantsLayer:YES];
 
   render_widget_host_->SetView(this);
 }
 
 RenderWidgetHostViewMac::~RenderWidgetHostViewMac() {
@@ skipping 143 matching lines @@
   DestroyCompositedIOSurfaceLayer(kRemoveLayerFromHierarchy);
   compositing_iosurface_ = NULL;
   compositing_iosurface_context_ = NULL;
 }
 
 bool RenderWidgetHostViewMac::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(RenderWidgetHostViewMac, message)
     IPC_MESSAGE_HANDLER(ViewHostMsg_PluginFocusChanged, OnPluginFocusChanged)
     IPC_MESSAGE_HANDLER(ViewHostMsg_StartPluginIme, OnStartPluginIme)
+    IPC_MESSAGE_HANDLER(ViewMsg_GetRenderedTextCompleted,
+      OnGetRenderedTextCompleted)

[Alexei Svitkine (slow), 2014/06/23 14:35:15]

Nit: Align.

[sarka, 2014/06/25 05:16:47]

Done.

     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void RenderWidgetHostViewMac::InitAsChild(
     gfx::NativeView parent_view) {
 }
 
 void RenderWidgetHostViewMac::InitAsPopup(
@@ skipping 406 matching lines @@
     [cocoa_view_ setToolTipAtMousePoint:tooltip_nsstring];
   }
 }
 
 bool RenderWidgetHostViewMac::SupportsSpeech() const {
   return [NSApp respondsToSelector:@selector(speakString:)] &&
          [NSApp respondsToSelector:@selector(stopSpeaking:)];
 }
 
 void RenderWidgetHostViewMac::SpeakSelection() {
+  if (selected_text_.empty()) {
+    if (render_widget_host_) {

[Alexei Svitkine (slow), 2014/06/23 14:35:15]

Nit: Combine with previous if.

[sarka, 2014/06/25 05:16:47]

Done.

+      // Route an IPC message to get content as text for a web contents.
+      render_widget_host_->Send(new ViewMsg_GetRenderedText(
+          render_widget_host_->GetRoutingID()));
+      return;
+    }
+  }
   if ([NSApp respondsToSelector:@selector(speakString:)])
     [NSApp speakString:base::SysUTF8ToNSString(selected_text_)];
 }
 
 bool RenderWidgetHostViewMac::IsSpeaking() const {
   return [NSApp respondsToSelector:@selector(isSpeaking)] &&
          [NSApp isSpeaking];
 }
 
 void RenderWidgetHostViewMac::StopSpeaking() {
+  // Clear selected text when StopSpeaking is called

[Alexei Svitkine (slow), 2014/06/23 14:35:16]

Why? |selected_text_| is supposed to be tracking what's selected on the renderer
size. So unless the selection changed there, I don't think we should be clearing
it.

[sarka, 2014/06/25 05:16:47]

Done.

+  if (selected_text_.size())
+    selected_text_.clear();
   if ([NSApp respondsToSelector:@selector(stopSpeaking:)])
     [NSApp stopSpeaking:cocoa_view_];
 }
 
 //
 // RenderWidgetHostViewCocoa uses the stored selection text,
 // which implements NSServicesRequests protocol.
 //
 void RenderWidgetHostViewMac::SelectionChanged(const base::string16& text,
                                                size_t offset,
@@ skipping 961 matching lines @@
 
 void RenderWidgetHostViewMac::OnPluginFocusChanged(bool focused,
                                                    int plugin_id) {
   [cocoa_view_ pluginFocusChanged:(focused ? YES : NO) forPlugin:plugin_id];
 }
 
 void RenderWidgetHostViewMac::OnStartPluginIme() {
   [cocoa_view_ setPluginImeActive:YES];
 }
 
+void RenderWidgetHostViewMac::OnGetRenderedTextCompleted(const std::string& text) {

[Alexei Svitkine (slow), 2014/06/23 14:35:15]

Nit: This is over 80 chars, wrap at the (

[sarka, 2014/06/25 05:16:48]

Done.

+  // Let TTS speak the text returned from call back
+  if (text.empty())
+    return;
+
+  if ([NSApp respondsToSelector:@selector(speakString:)])
+      [NSApp speakString:base::SysUTF8ToNSString(text)];

[Alexei Svitkine (slow), 2014/06/23 14:35:15]

Nit: Indent 2 less.

[sarka, 2014/06/25 05:16:47]

Done.

+

[Alexei Svitkine (slow), 2014/06/23 14:35:15]

Nit: Remove empty line.

[sarka, 2014/06/25 05:16:47]

Done.

+}
+
 gfx::Rect RenderWidgetHostViewMac::GetScaledOpenGLPixelRect(
     const gfx::Rect& rect) {
   gfx::Rect src_gl_subrect = rect;
   src_gl_subrect.set_y(GetViewBounds().height() - rect.bottom());
 
   return gfx::ToEnclosingRect(gfx::ScaleRect(src_gl_subrect,
                                              ViewScaleFactor()));
 }
 
 void RenderWidgetHostViewMac::AddPendingLatencyInfo(
@@ skipping 208 matching lines @@
   if (self) {
     self.acceptsTouchEvents = YES;
     editCommand_helper_.reset(new RenderWidgetHostViewMacEditCommandHelper);
     editCommand_helper_->AddEditingSelectorsToClass([self class]);
 
     renderWidgetHostView_.reset(r);
     canBeKeyView_ = YES;
     focusedPluginIdentifier_ = -1;
     renderWidgetHostView_->backing_store_scale_factor_ =
         ui::GetScaleFactorForNativeView(self);
-

[Alexei Svitkine (slow), 2014/06/23 14:35:15]

Nit: Revert unnecessary whitespace change.

[sarka, 2014/06/25 05:16:47]

Done.

     // OpenGL support:
     if ([self respondsToSelector:
         @selector(setWantsBestResolutionOpenGLSurface:)]) {
       [self setWantsBestResolutionOpenGLSurface:YES];
     }
     handlingGlobalFrameDidChange_ = NO;
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(didChangeScreenParameters:)
                name:NSApplicationDidChangeScreenParametersNotification
@@ skipping 1640 matching lines @@
 
 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding
 // regions that are not draggable. (See ControlRegionView in
 // native_app_window_cocoa.mm). This requires the render host view to be
 // draggable by default.
 - (BOOL)mouseDownCanMoveWindow {
   return YES;
 }
 
 @end