Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(401)

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 342143004: Defect 248426: Speak rendered text when no selection is made on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Nit based on comments Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 dd2e8bf7f1afeb46f509b5220073d013eacd5c2b..c80aafb118dec15468948a364ccd2a0ab35d4de6 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -739,6 +739,8 @@ 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_GetRenderedTextCompleted,
+ OnGetRenderedTextCompleted)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
return handled;
@@ -880,6 +882,10 @@ void RenderWidgetHostViewMac::SendVSyncParametersToRenderer() {
render_widget_host_->UpdateVSyncParameters(vsync_timebase_, vsync_interval_);
}
+void RenderWidgetHostViewMac::SpeakText(const std::string& text) {
+ [NSApp speakString:base::SysUTF8ToNSString(text)];
+}
+
void RenderWidgetHostViewMac::UpdateBackingStoreScaleFactor() {
if (!render_widget_host_)
return;
@@ -1185,8 +1191,19 @@ bool RenderWidgetHostViewMac::SupportsSpeech() const {
}
void RenderWidgetHostViewMac::SpeakSelection() {
- if ([NSApp respondsToSelector:@selector(speakString:)])
- [NSApp speakString:base::SysUTF8ToNSString(selected_text_)];
+ if (![NSApp respondsToSelector:@selector(speakString:)])
+ return;
+
+ if (selected_text_.empty() && render_widget_host_) {
+ // If there's no selection, speak all text. Send an asynchronous IPC
+ // request for fetching all the text for a webcontent.
+ // ViewMsg_GetRenderedTextCompleted is sent back to IPC Message receiver.
+ render_widget_host_->Send(new ViewMsg_GetRenderedText(
+ render_widget_host_->GetRoutingID()));
+ return;
+ }
+
+ SpeakText(selected_text_);
}
bool RenderWidgetHostViewMac::IsSpeaking() const {
@@ -2169,6 +2186,11 @@ void RenderWidgetHostViewMac::OnStartPluginIme() {
[cocoa_view_ setPluginImeActive:YES];
}
+void RenderWidgetHostViewMac::OnGetRenderedTextCompleted(
+ const std::string& text) {
+ SpeakText(text);
+}
+
gfx::Rect RenderWidgetHostViewMac::GetScaledOpenGLPixelRect(
const gfx::Rect& rect) {
gfx::Rect src_gl_subrect = rect;

Powered by Google App Engine
This is Rietveld 408576698