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 470 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];
+

[Alexei Svitkine (slow), 2014/06/27 15:54:30]

Hmm, I don't understand why the diff looks so. I checked the current file at
TOT, and it has a blank line here, so your diff _shouldn't_ look like it's
adding a line to this place, since there's one already.

Can you check how you produced the diff to make sure it's diffing against
master? (else your patch might not apply).

[sarka, 2014/06/27 16:26:14]

This is really strange. I had to throw in an extra line there since there wasn't
any before i submitted the patch.

   background_layer_.reset([[CALayer alloc] init]);
   [background_layer_
       setBackgroundColor:CGColorGetConstantColor(kCGColorWhite)];
   [background_layer_ setGeometryFlipped:YES];
   [background_layer_ setContentsGravity:kCAGravityTopLeft];
   [cocoa_view_ setLayer:background_layer_];
   [cocoa_view_ setWantsLayer:YES];
 
   render_widget_host_->SetView(this);
 }
@@ skipping 580 matching lines @@
 }
 
 void RenderWidgetHostViewMac::SpeakSelection() {
   if (![NSApp respondsToSelector:@selector(speakString:)])
     return;
 
   if (selected_text_.empty() && render_widget_host_) {
     // 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;
+    return;
   }
 
   [NSApp speakString:base::SysUTF8ToNSString(selected_text_)];
 }
 
 bool RenderWidgetHostViewMac::IsSpeaking() const {
   return [NSApp respondsToSelector:@selector(isSpeaking)] &&
          [NSApp isSpeaking];
 }
 
@@ skipping 1231 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);
+
     // 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