Split cursor location from UserDisplayManager.

services/ui/ws/user_display_manager.cc

 // Copyright 2016 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 "services/ui/ws/user_display_manager.h"
 
 #include <utility>
 
 #include "services/ui/display/screen_manager.h"
 #include "services/ui/ws/display.h"
@@ skipping 17 matching lines @@
 
 }  // namespace
 
 UserDisplayManager::UserDisplayManager(ws::DisplayManager* display_manager,
                                        UserDisplayManagerDelegate* delegate,
                                        const UserId& user_id)
     : display_manager_(display_manager),
       delegate_(delegate),
       user_id_(user_id),
       got_valid_frame_decorations_(
-          delegate->GetFrameDecorationsForUser(user_id, nullptr)),
-      current_cursor_location_(0) {}
+          delegate->GetFrameDecorationsForUser(user_id, nullptr)) {}
 
 UserDisplayManager::~UserDisplayManager() {}
 
 void UserDisplayManager::OnFrameDecorationValuesChanged() {
   if (!got_valid_frame_decorations_) {
     got_valid_frame_decorations_ = true;
     display_manager_observers_.ForAllPtrs([this](
         mojom::DisplayManagerObserver* observer) { CallOnDisplays(observer); });
     return;
   }
@@ skipping 36 matching lines @@
 void UserDisplayManager::OnPrimaryDisplayChanged(int64_t primary_display_id) {
   if (!got_valid_frame_decorations_)
     return;
 
   display_manager_observers_.ForAllPtrs(
       [primary_display_id](mojom::DisplayManagerObserver* observer) {
         observer->OnPrimaryDisplayChanged(primary_display_id);
       });
 }
 
-void UserDisplayManager::OnMouseCursorLocationChanged(const gfx::Point& point) {
-  current_cursor_location_ =
-      static_cast<base::subtle::Atomic32>(
-          (point.x() & 0xFFFF) << 16 | (point.y() & 0xFFFF));
-  if (cursor_location_memory()) {
-    base::subtle::NoBarrier_Store(cursor_location_memory(),
-                                  current_cursor_location_);
-  }
-}
-
-mojo::ScopedSharedBufferHandle UserDisplayManager::GetCursorLocationMemory() {
-  if (!cursor_location_handle_.is_valid()) {
-    // Create our shared memory segment to share the cursor state with our
-    // window clients.
-    cursor_location_handle_ =
-        mojo::SharedBufferHandle::Create(sizeof(base::subtle::Atomic32));
-
-    if (!cursor_location_handle_.is_valid())
-      return mojo::ScopedSharedBufferHandle();
-
-    cursor_location_mapping_ =
-        cursor_location_handle_->Map(sizeof(base::subtle::Atomic32));
-    if (!cursor_location_mapping_)
-      return mojo::ScopedSharedBufferHandle();
-    base::subtle::NoBarrier_Store(cursor_location_memory(),
-                                  current_cursor_location_);
-  }
-
-  return cursor_location_handle_->Clone(
-      mojo::SharedBufferHandle::AccessMode::READ_ONLY);
-}
-
 void UserDisplayManager::AddObserver(
     mojom::DisplayManagerObserverPtr observer) {
   mojom::DisplayManagerObserver* observer_impl = observer.get();
   display_manager_observers_.AddPtr(std::move(observer));
   OnObserverAdded(observer_impl);
 }
 
 void UserDisplayManager::OnObserverAdded(
     mojom::DisplayManagerObserver* observer) {
   // Many clients key off the frame decorations to size widgets. Wait for frame
@@ skipping 31 matching lines @@
     mojom::DisplayManagerObserver* observer) {
   // TODO(kylechar): Pass internal display id to clients here.
   observer->OnDisplays(
       GetAllDisplays(),
       display::ScreenManager::GetInstance()->GetPrimaryDisplayId(),
       display::kInvalidDisplayId);
 }
 
 }  // namespace ws
 }  // namespace ui