Fix a mouse lock problem on Windows where in clicks outside the web page would also cause mouse loc…

content/browser/renderer_host/render_widget_host_view_aura.cc

 // 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_aura.h"
 
 #include <set>
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
@@ skipping 327 matching lines @@
     return;
   }
 
   aura::Window* target = static_cast<aura::Window*>(event->target());
   if (target != window_ &&
       (!popup_parent_host_view_ ||
        target != popup_parent_host_view_->window_)) {
     // If we enter this code path it means that we did not receive any focus
     // lost notifications for the popup window. Ensure that blink is aware
     // of the fact that focus was lost for the host window by sending a Blur
-    // notification. We also set a flag in the view indicating that we need
-    // to force a Focus notification on the next mouse down.
-    if (popup_parent_host_view_ && popup_parent_host_view_->host_) {
-      popup_parent_host_view_->set_focus_on_mouse_down_ = true;
+    // notification.
+    if (popup_parent_host_view_ && popup_parent_host_view_->host_)
       popup_parent_host_view_->host_->Blur();
-    }
     // Note: popup_parent_host_view_ may be NULL when there are multiple
     // popup children per view. See: RenderWidgetHostViewAura::InitAsPopup().
     Shutdown();
   }
 }
 
 // We have to implement the WindowObserver interface on a separate object
 // because clang doesn't like implementing multiple interfaces that have
 // methods with the same name. This object is owned by the
 // RenderWidgetHostViewAura.
@@ skipping 101 matching lines @@
       synthetic_move_sent_(false),
       cursor_visibility_state_in_renderer_(UNKNOWN),
 #if defined(OS_WIN)
       legacy_render_widget_host_HWND_(NULL),
       legacy_window_destroyed_(false),
       showing_context_menu_(false),
 #endif
       has_snapped_to_boundary_(false),
       is_guest_view_hack_(is_guest_view_hack),
       begin_frame_observer_proxy_(this),
-      set_focus_on_mouse_down_(false),
       weak_ptr_factory_(this) {
   if (!is_guest_view_hack_)
     host_->SetView(this);
 
   window_observer_.reset(new WindowObserver(this));
 
   aura::client::SetTooltipText(window_, &tooltip_);
   aura::client::SetActivationDelegate(window_, this);
   aura::client::SetFocusChangeObserver(window_, this);
   window_->set_layer_owner_delegate(delegated_frame_host_.get());
@@ skipping 255 matching lines @@
 }
 
 void RenderWidgetHostViewAura::SetKeyboardFocus() {
 #if defined(OS_WIN)
   if (CanFocus()) {
     aura::WindowTreeHost* host = window_->GetHost();
     if (host)
       ::SetFocus(host->GetAcceleratedWidget());
   }
 #endif
-  if (host_ && set_focus_on_mouse_down_) {
-    set_focus_on_mouse_down_ = false;
-    host_->Focus();
-  }
 }
 
 RenderFrameHostImpl* RenderWidgetHostViewAura::GetFocusedFrame() {
   if (!host_->IsRenderView())
     return NULL;
   RenderViewHost* rvh = RenderViewHost::From(host_);
   FrameTreeNode* focused_frame =
       rvh->GetDelegate()->GetFrameTree()->GetFocusedFrame();
   if (!focused_frame)
     return NULL;
@@ skipping 750 matching lines @@
 
 void RenderWidgetHostViewAura::UnlockMouse() {
   tooltip_disabler_.reset();
 
   aura::Window* root_window = window_->GetRootWindow();
   if (!mouse_locked_ || !root_window)
     return;
 
   mouse_locked_ = false;
 
-#if !defined(OS_WIN)
-  window_->ReleaseCapture();
-#else
+  if (window_->HasCapture())
+    window_->ReleaseCapture();
+
+#if defined(OS_WIN)
   ::ClipCursor(NULL);
 #endif
+
   window_->MoveCursorTo(unlocked_mouse_position_);
   aura::client::CursorClient* cursor_client =
       aura::client::GetCursorClient(root_window);
   if (cursor_client) {
     cursor_client->UnlockCursor();
     cursor_client->ShowCursor();
   }
 
   host_->LostMouseLock();
 }
@@ skipping 1297 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewBase, public:
 
 // static
 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }
 
 }  // namespace content