Fix mouse lock on chromeos

ui/aura/shared/compound_event_filter.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 "ui/aura/shared/compound_event_filter.h"
 
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/env.h"
@@ skipping 19 matching lines @@
   DCHECK(window->GetRootWindow());
   return client::GetActivationClient(window->GetRootWindow())->
       GetActiveWindow();
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // CompoundEventFilter, public:
 
-CompoundEventFilter::CompoundEventFilter() : update_cursor_visibility_(true) {
+CompoundEventFilter::CompoundEventFilter() : cursor_hidden_by_filter_(false) {
 }
 
 CompoundEventFilter::~CompoundEventFilter() {
   // Additional filters are not owned by CompoundEventFilter and they
   // should all be removed when running here. |filters_| has
   // check_empty == true and will DCHECK failure if it is not empty.
 }
 
 // static
 gfx::NativeCursor CompoundEventFilter::CursorForWindowComponent(
@@ skipping 89 matching lines @@
         (filter = it.GetNext()) != NULL) {
       status = filter->OnTouchEvent(event);
     }
   }
   return status;
 }
 
 void CompoundEventFilter::SetCursorVisibilityOnEvent(aura::Window* target,
                                                      ui::Event* event,
                                                      bool show) {
-  if (update_cursor_visibility_ && !(event->flags() & ui::EF_IS_SYNTHESIZED)) {
+  if (!(event->flags() & ui::EF_IS_SYNTHESIZED)) {
     client::CursorClient* client =
         client::GetCursorClient(target->GetRootWindow());
-    if (client)
-      client->ShowCursor(show);
+    if (client) {
+      if (show && cursor_hidden_by_filter_) {
+        cursor_hidden_by_filter_ = false;
+        client->ShowCursor(true);
+      } else if (client->IsCursorVisible() && !show &&
+                 !cursor_hidden_by_filter_) {
+        cursor_hidden_by_filter_ = true;
+        client->ShowCursor(false);
+      }
+    }
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CompoundEventFilter, EventFilter implementation:
 
 ui::TouchStatus CompoundEventFilter::PreHandleTouchEvent(
     Window* target,
     ui::TouchEvent* event) {
   // TODO(sad): Move the implementation into OnTouchEvent once touch-events are
@@ skipping 77 matching lines @@
       GetActiveWindow(window) != window) {
     window->GetFocusManager()->SetFocusedWindow(
         FindFocusableWindowFor(window), event);
   }
 
   return static_cast<ui::EventResult>(result);
 }
 
 }  // namespace shared
 }  // namespace aura