Use showing_context_menu_ from RenderWidgetHostViewBase to avoid MouseLeave event on Context Menu

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 <utility>
 
 #include "base/auto_reset.h"
@@ skipping 456 matching lines @@
       can_compose_inline_(true),
       has_composition_text_(false),
       accept_return_character_(false),
       last_swapped_software_frame_scale_factor_(1.f),
       paint_canvas_(NULL),
       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_or_key_event_(false),
       device_scale_factor_(0.0f),
       weak_ptr_factory_(this) {
   if (!is_guest_view_hack_)
     host_->SetView(this);
 
@@ skipping 302 matching lines @@
       rvh->GetDelegate()->GetFrameTree()->GetFocusedFrame();
   if (!focused_frame)
     return nullptr;
 
   return focused_frame->current_frame_host();
 }
 
 bool RenderWidgetHostViewAura::CanRendererHandleEvent(
     const ui::MouseEvent* event,
     bool mouse_locked,
     bool selection_popup) {

[sadrul, 2016/02/12 15:30:12]

Oh, and while you are here, make this a const function please.

-#if defined(OS_WIN)
-  bool showing_context_menu = showing_context_menu_;
-  showing_context_menu_ = false;
-#endif
-
   if (event->type() == ui::ET_MOUSE_CAPTURE_CHANGED)
     return false;
 
   if (event->type() == ui::ET_MOUSE_EXITED) {
     if (mouse_locked || selection_popup)
       return false;
 #if defined(OS_WIN)
     // Don't forward the mouse leave message which is received when the context
     // menu is displayed by the page. This confuses the page and causes state
     // changes.
-    if (showing_context_menu)
+    if (showing_context_menu_)

[sadrul, 2016/02/12 01:06:52]

IsShowingContextMenu()

       return false;
 #endif
     return true;
   }
 
 #if defined(OS_WIN)
   // Renderer cannot handle WM_XBUTTON or NC events.
   switch (event->native_event().message) {
     case WM_XBUTTONDOWN:
     case WM_XBUTTONUP:
@@ skipping 1888 matching lines @@
 bool RenderWidgetHostViewAura::OnShowContextMenu(
     const ContextMenuParams& params) {
 #if defined(OS_WIN)
   last_context_menu_params_.reset();
 
   if (params.source_type == ui::MENU_SOURCE_LONG_PRESS) {
     last_context_menu_params_.reset(new ContextMenuParams);
     *last_context_menu_params_ = params;
     return false;
   }
-  showing_context_menu_ = true;
 #endif
   return true;
 }
 
 void RenderWidgetHostViewAura::SetSelectionControllerClientForTest(
     scoped_ptr<TouchSelectionControllerClientAura> client) {
   selection_controller_client_.swap(client);
   CreateSelectionController();
 }
 
@@ skipping 336 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewBase, public:
 
 // static
 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }
 
 }  // namespace content