exo: Clean up cursor code

components/exo/pointer.cc

 // Copyright 2015 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 "components/exo/pointer.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #include "components/exo/pointer_delegate.h"
@@ skipping 101 matching lines @@
   // Update hotspot.
   if (hotspot != hotspot_) {
     hotspot_ = hotspot;
     cursor_changed = true;
   }
 
   // Early out if cursor did not change.
   if (!cursor_changed)
     return;
 
-  // If |surface_| is set then ascynchrounsly capture a snapshot of cursor,
+  // If |surface_| is set then asynchronously capture a snapshot of cursor,
   // otherwise cancel pending capture and immediately set the cursor to "none".
   if (surface_) {
     CaptureCursor();
   } else {
     cursor_capture_weak_ptr_factory_.InvalidateWeakPtrs();
     cursor_ = ui::kCursorNone;
     UpdateCursor();
   }
 }
 
@@ skipping 26 matching lines @@
       delegate_->OnPointerEnter(target, event->location_f(),
                                 event->button_flags());
       location_ = event->location_f();
       focus_ = target;
       focus_->AddSurfaceObserver(this);
       focus_->RegisterCursorProvider(this);
     }
     delegate_->OnPointerFrame();
   }
 
-  if (focus_ && event->IsMouseEvent() && event->type() != ui::ET_MOUSE_EXITED) {
+  if (!focus_)
+    return;
+
+  if (event->IsMouseEvent() && event->type() != ui::ET_MOUSE_EXITED) {
     // Generate motion event if location changed. We need to check location
     // here as mouse movement can generate both "moved" and "entered" events
     // but OnPointerMotion should only be called if location changed since
     // OnPointerEnter was called.
     if (!SameLocation(event, location_)) {
       location_ = event->location_f();
       delegate_->OnPointerMotion(event->time_stamp(), location_);
       delegate_->OnPointerFrame();
     }
   }
 
   switch (event->type()) {
     case ui::ET_MOUSE_PRESSED:
-    case ui::ET_MOUSE_RELEASED:
-      if (focus_) {
-        delegate_->OnPointerButton(event->time_stamp(),
-                                   event->changed_button_flags(),
-                                   event->type() == ui::ET_MOUSE_PRESSED);
-        delegate_->OnPointerFrame();
-      }
+    case ui::ET_MOUSE_RELEASED: {
+      delegate_->OnPointerButton(event->time_stamp(),
+                                 event->changed_button_flags(),
+                                 event->type() == ui::ET_MOUSE_PRESSED);
+      delegate_->OnPointerFrame();
       break;
-    case ui::ET_SCROLL:
-      if (focus_) {
-        ui::ScrollEvent* scroll_event = static_cast<ui::ScrollEvent*>(event);
-        delegate_->OnPointerScroll(
-            event->time_stamp(),
-            gfx::Vector2dF(scroll_event->x_offset(), scroll_event->y_offset()),
-            false);
-        delegate_->OnPointerFrame();
-      }
+    }
+    case ui::ET_SCROLL: {
+      ui::ScrollEvent* scroll_event = static_cast<ui::ScrollEvent*>(event);
+      delegate_->OnPointerScroll(
+          event->time_stamp(),
+          gfx::Vector2dF(scroll_event->x_offset(), scroll_event->y_offset()),
+          false);
+      delegate_->OnPointerFrame();
       break;
-    case ui::ET_MOUSEWHEEL:
-      if (focus_) {
-        delegate_->OnPointerScroll(
-            event->time_stamp(),
-            static_cast<ui::MouseWheelEvent*>(event)->offset(), true);
-        delegate_->OnPointerFrame();
-      }
+    }
+    case ui::ET_MOUSEWHEEL: {
+      delegate_->OnPointerScroll(
+          event->time_stamp(),
+          static_cast<ui::MouseWheelEvent*>(event)->offset(), true);
+      delegate_->OnPointerFrame();
       break;
-    case ui::ET_SCROLL_FLING_START:
-      if (focus_) {
-        delegate_->OnPointerScrollStop(event->time_stamp());
-        delegate_->OnPointerFrame();
-      }
+    }
+    case ui::ET_SCROLL_FLING_START: {
+      delegate_->OnPointerScrollStop(event->time_stamp());
+      delegate_->OnPointerFrame();
       break;
-    case ui::ET_SCROLL_FLING_CANCEL:
-      if (focus_) {
-        delegate_->OnPointerScrollCancel(event->time_stamp());
-        delegate_->OnPointerFrame();
-      }
+    }
+    case ui::ET_SCROLL_FLING_CANCEL: {
+      delegate_->OnPointerScrollCancel(event->time_stamp());
+      delegate_->OnPointerFrame();
       break;
+    }
     case ui::ET_MOUSE_MOVED:
     case ui::ET_MOUSE_DRAGGED:
     case ui::ET_MOUSE_ENTERED:
     case ui::ET_MOUSE_EXITED:
     case ui::ET_MOUSE_CAPTURE_CHANGED:
       break;
     default:
       NOTREACHED();
       break;
   }
 
-  if (focus_)
-    UpdateCursorScale();
+  UpdateCursorScale();
 }
 
 void Pointer::OnScrollEvent(ui::ScrollEvent* event) {
   OnMouseEvent(event);
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// WMHelper::CursorObserver overrides:
+
 void Pointer::OnCursorSetChanged(ui::CursorSetType cursor_set) {
   if (focus_)
     UpdateCursorScale();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SurfaceDelegate overrides:
 
 void Pointer::OnSurfaceCommit() {
   surface_->CheckIfSurfaceHierarchyNeedsCommitToNewSurfaces();
@@ skipping 64 matching lines @@
 
   if (scale != cursor_scale_) {
     cursor_scale_ = scale;
     if (surface_)
       CaptureCursor();
   }
 }
 
 void Pointer::CaptureCursor() {
   DCHECK(surface_);
+  DCHECK(focus_);
 
   // Set UI scale before submitting capture request.
   surface_->window()->layer()->SetTransform(
       gfx::GetScaleTransform(gfx::Point(), cursor_scale_));
 
   float primary_device_scale_factor =
       display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor();
 
   std::unique_ptr<cc::CopyOutputRequest> request =
       cc::CopyOutputRequest::CreateBitmapRequest(
@@ skipping 43 matching lines @@
 void Pointer::UpdateCursor() {
   DCHECK(focus_);
 
   aura::client::CursorClient* cursor_client =
       aura::client::GetCursorClient(focus_->window()->GetRootWindow());
   if (cursor_client)
     cursor_client->SetCursor(cursor_);
 }
 
 }  // namespace exo