| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index 3a40ebe1e6011855c3a74eae94b41ec501998fff..c1b19daceebcef3f805bdc9e2393242834176c5f 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -2519,17 +2519,21 @@ void RenderViewImpl::didFocus() {
|
| // TODO(jcivelli): when https://bugs.webkit.org/show_bug.cgi?id=33389 is fixed
|
| // we won't have to test for user gesture anymore and we can
|
| // move that code back to render_widget.cc
|
| - if (webview() && webview()->mainFrame() &&
|
| - webview()->mainFrame()->isProcessingUserGesture()) {
|
| - Send(new ViewHostMsg_Focus(routing_id_));
|
| + if (webview() && webview()->mainFrame()) {
|
| + if (webview()->mainFrame()->isProcessingUserGesture() ||
|
| + !RenderThreadImpl::current()->require_user_gesture_for_focus()) {
|
| + Send(new ViewHostMsg_Focus(routing_id_));
|
| + }
|
| }
|
| }
|
|
|
| void RenderViewImpl::didBlur() {
|
| // TODO(jcivelli): see TODO above in didFocus().
|
| - if (webview() && webview()->mainFrame() &&
|
| - webview()->mainFrame()->isProcessingUserGesture()) {
|
| - Send(new ViewHostMsg_Blur(routing_id_));
|
| + if (webview() && webview()->mainFrame()) {
|
| + if (webview()->mainFrame()->isProcessingUserGesture() ||
|
| + !RenderThreadImpl::current()->require_user_gesture_for_focus()) {
|
| + Send(new ViewHostMsg_Blur(routing_id_));
|
| + }
|
| }
|
| }
|
|
|
|
|