Always update cursor visibility

ash/display/cursor_window_controller.cc

 // Copyright 2014 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 "ash/display/cursor_window_controller.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
@@ skipping 10 matching lines @@
 #include "ui/gfx/display.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
 
 namespace ash {
 
 class CursorWindowDelegate : public aura::WindowDelegate {
  public:
   CursorWindowDelegate() : is_cursor_compositing_enabled_(false) {}
   ~CursorWindowDelegate() override {}
-

[Albert Bodenhamer, 2015/05/14 16:42:02]

Why the whitespace change?

   // aura::WindowDelegate overrides:
   gfx::Size GetMinimumSize() const override { return size_; }
   gfx::Size GetMaximumSize() const override { return size_; }
   void OnBoundsChanged(const gfx::Rect& old_bounds,
                        const gfx::Rect& new_bounds) override {}
   ui::TextInputClient* GetFocusedTextInputClient() override { return nullptr; }
   gfx::NativeCursor GetCursor(const gfx::Point& point) override {
     return gfx::kNullCursor;
   }
   int GetNonClientComponent(const gfx::Point& point) const override {
@@ skipping 132 matching lines @@
   UpdateCursorImage();
   UpdateCursorVisibility();
 }
 
 void CursorWindowController::SetCursorSet(ui::CursorSetType cursor_set) {
   cursor_set_ = cursor_set;
   UpdateCursorImage();
 }
 
 void CursorWindowController::SetVisibility(bool visible) {
-  if (!cursor_window_)

[Albert Bodenhamer, 2015/05/14 16:42:02]

What is the removed code supposed to accomplish? Is this just removing an
incorrect optimization?

[oshima, 2015/05/14 16:58:52]

The visibility state has to be updated regardless of cursor_window_ so that when
composition is enabled, it uses the correct visibility state. (see CL
description)

-    return;
   visible_ = visible;
   UpdateCursorVisibility();
 }
 
 void CursorWindowController::SetContainer(aura::Window* container) {
   if (container_ == container)
     return;
   container_ = container;
   if (!container) {
     cursor_window_.reset();
@@ skipping 68 matching lines @@
     cursor_window_->SetBounds(gfx::Rect(delegate_->size()));
     cursor_window_->SchedulePaintInRect(
         gfx::Rect(cursor_window_->bounds().size()));
     UpdateLocation();
   }
 }
 
 void CursorWindowController::UpdateCursorVisibility() {
   if (!cursor_window_)
     return;
+

[Albert Bodenhamer, 2015/05/14 16:42:02]

And here?

   bool visible = (visible_ && cursor_type_ != ui::kCursorNone);
   if (visible)
     cursor_window_->Show();
   else
     cursor_window_->Hide();
 }
 
 }  // namespace ash