Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(733)

Unified Diff: ui/events/device_data_manager.cc

Issue 685793002: Move all event related devices from ui/events/ to ui/events/devices/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@internal-touchscreens
Patch Set: fix ozone Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/device_data_manager.h ('k') | ui/events/device_hotplug_event_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/device_data_manager.cc
diff --git a/ui/events/device_data_manager.cc b/ui/events/device_data_manager.cc
deleted file mode 100644
index a9e8578dd1f3d4590020c1b638206a61e02924ad..0000000000000000000000000000000000000000
--- a/ui/events/device_data_manager.cc
+++ /dev/null
@@ -1,160 +0,0 @@
-// 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 "ui/events/device_data_manager.h"
-
-#include "base/at_exit.h"
-#include "base/bind.h"
-#include "base/logging.h"
-#include "ui/events/input_device_event_observer.h"
-#include "ui/gfx/display.h"
-#include "ui/gfx/geometry/point3_f.h"
-
-namespace ui {
-
-namespace {
-
-bool InputDeviceEquals(const ui::InputDevice& a, const ui::InputDevice& b) {
- return a.id == b.id;
-}
-
-} // namespace
-
-// static
-DeviceDataManager* DeviceDataManager::instance_ = NULL;
-
-DeviceDataManager::DeviceDataManager() {
- CHECK(!instance_) << "Can not create multiple instances of DeviceDataManager";
- instance_ = this;
-
- base::AtExitManager::RegisterTask(
- base::Bind(&base::DeletePointer<DeviceDataManager>, this));
-
- for (int i = 0; i < kMaxDeviceNum; ++i) {
- touch_device_to_display_map_[i] = gfx::Display::kInvalidDisplayID;
- touch_radius_scale_map_[i] = 1.0;
- }
-}
-
-DeviceDataManager::~DeviceDataManager() {
- CHECK_EQ(this, instance_);
- instance_ = NULL;
-}
-
-// static
-DeviceDataManager* DeviceDataManager::instance() { return instance_; }
-
-// static
-void DeviceDataManager::CreateInstance() {
- if (instance())
- return;
-
- new DeviceDataManager();
-}
-
-// static
-DeviceDataManager* DeviceDataManager::GetInstance() {
- CHECK(instance_) << "DeviceDataManager was not created.";
- return instance_;
-}
-
-// static
-bool DeviceDataManager::HasInstance() {
- return instance_ != NULL;
-}
-
-void DeviceDataManager::ClearTouchTransformerRecord() {
- for (int i = 0; i < kMaxDeviceNum; i++) {
- touch_device_transformer_map_[i] = gfx::Transform();
- touch_device_to_display_map_[i] = gfx::Display::kInvalidDisplayID;
- touch_radius_scale_map_[i] = 1.0;
- }
-}
-
-bool DeviceDataManager::IsTouchDeviceIdValid(
- unsigned int touch_device_id) const {
- return (touch_device_id > 0 && touch_device_id < kMaxDeviceNum);
-}
-
-void DeviceDataManager::UpdateTouchInfoForDisplay(
- int64_t display_id,
- unsigned int touch_device_id,
- const gfx::Transform& touch_transformer) {
- if (IsTouchDeviceIdValid(touch_device_id)) {
- touch_device_to_display_map_[touch_device_id] = display_id;
- touch_device_transformer_map_[touch_device_id] = touch_transformer;
- }
-}
-
-void DeviceDataManager::UpdateTouchRadiusScale(unsigned int touch_device_id,
- double scale) {
- if (IsTouchDeviceIdValid(touch_device_id))
- touch_radius_scale_map_[touch_device_id] = scale;
-}
-
-void DeviceDataManager::ApplyTouchRadiusScale(unsigned int touch_device_id,
- double* radius) {
- if (IsTouchDeviceIdValid(touch_device_id))
- *radius = (*radius) * touch_radius_scale_map_[touch_device_id];
-}
-
-void DeviceDataManager::ApplyTouchTransformer(unsigned int touch_device_id,
- float* x,
- float* y) {
- if (IsTouchDeviceIdValid(touch_device_id)) {
- gfx::Point3F point(*x, *y, 0.0);
- const gfx::Transform& trans =
- touch_device_transformer_map_[touch_device_id];
- trans.TransformPoint(&point);
- *x = point.x();
- *y = point.y();
- }
-}
-
-int64_t DeviceDataManager::GetDisplayForTouchDevice(
- unsigned int touch_device_id) const {
- if (IsTouchDeviceIdValid(touch_device_id))
- return touch_device_to_display_map_[touch_device_id];
- return gfx::Display::kInvalidDisplayID;
-}
-
-void DeviceDataManager::OnTouchscreenDevicesUpdated(
- const std::vector<TouchscreenDevice>& devices) {
- if (devices.size() == touchscreen_devices_.size() &&
- std::equal(devices.begin(),
- devices.end(),
- touchscreen_devices_.begin(),
- InputDeviceEquals)) {
- return;
- }
- touchscreen_devices_ = devices;
- FOR_EACH_OBSERVER(InputDeviceEventObserver,
- observers_,
- OnTouchscreenDeviceConfigurationChanged());
-}
-
-void DeviceDataManager::OnKeyboardDevicesUpdated(
- const std::vector<KeyboardDevice>& devices) {
- if (devices.size() == keyboard_devices_.size() &&
- std::equal(devices.begin(),
- devices.end(),
- keyboard_devices_.begin(),
- InputDeviceEquals)) {
- return;
- }
- keyboard_devices_ = devices;
- FOR_EACH_OBSERVER(InputDeviceEventObserver,
- observers_,
- OnKeyboardDeviceConfigurationChanged());
-}
-
-void DeviceDataManager::AddObserver(InputDeviceEventObserver* observer) {
- observers_.AddObserver(observer);
-}
-
-void DeviceDataManager::RemoveObserver(InputDeviceEventObserver* observer) {
- observers_.RemoveObserver(observer);
-}
-
-} // namespace ui
« no previous file with comments | « ui/events/device_data_manager.h ('k') | ui/events/device_hotplug_event_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698