Cleanup old device_sensors code

After M63, DataFetcher* classes were removed and replaced by generic_sensor.
Hence, code related to device_sensors can be removed. This patch does the same.

Change-Id: I979326056b36319c7623746ca9bd518726ad197c
Signed-off-by: Gajendra N <gajendra.n@samsung.com>
(cherry picked from commit eb347d19aa7dfafd774f867267f3a766fb56f3b2)

diff --git a/tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_impl_tizen.cc b/tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_impl_tizen.cc
deleted file mode 100644 (file)
index 5ac64bf..0000000
--- a/tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_impl_tizen.cc
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/browser/device_sensors/data_fetcher_impl_tizen.h"
-
-#include "base/logging.h"
-#include "base/memory/singleton.h"
-#include "build/tizen_version.h"
-
-namespace content {
-
-static sensor_h sensor_orientation_;
-static sensor_h sensor_accelerometer_;
-static sensor_h sensor_gyroscope_;
-static sensor_listener_h listener_orientation_;
-static sensor_listener_h listener_accelerometer_;
-static sensor_listener_h listener_gyroscope_;
-
-DataFetcherImplTizen::DataFetcherImplTizen()
-    : device_motion_buffer_(NULL),
-      device_orientation_buffer_(NULL),
-      has_last_motion_data_(false),
-      last_motion_timestamp_(0),
-      is_orientation_buffer_ready_(false) {
-  sensor_get_default_sensor(SENSOR_ORIENTATION, &sensor_orientation_);
-  sensor_get_default_sensor(SENSOR_ACCELEROMETER, &sensor_accelerometer_);
-  sensor_get_default_sensor(SENSOR_GYROSCOPE, &sensor_gyroscope_);
-
-  sensor_create_listener(sensor_orientation_, &listener_orientation_);
-  sensor_create_listener(sensor_accelerometer_, &listener_accelerometer_);
-  sensor_create_listener(sensor_gyroscope_, &listener_gyroscope_);
-}
-
-DataFetcherImplTizen::~DataFetcherImplTizen() {
-  sensor_listener_unset_event_cb(listener_orientation_);
-  sensor_listener_stop(listener_orientation_);
-  sensor_destroy_listener(listener_orientation_);
-
-  sensor_listener_unset_event_cb(listener_accelerometer_);
-  sensor_listener_stop(listener_accelerometer_);
-  sensor_destroy_listener(listener_accelerometer_);
-
-  sensor_listener_stop(listener_gyroscope_);
-  sensor_destroy_listener(listener_gyroscope_);
-}
-
-DataFetcherImplTizen* DataFetcherImplTizen::GetInstance() {
-  return base::Singleton<DataFetcherImplTizen,
-                         base::LeakySingletonTraits<DataFetcherImplTizen> >::get();
-}
-
-bool DataFetcherImplTizen::StartFetchingDeviceMotionData(
-    DeviceMotionHardwareBuffer* buffer) {
-  DCHECK(buffer);
-  {
-    base::AutoLock autolock(motion_buffer_lock_);
-    device_motion_buffer_ = buffer;
-  }
-  sensor_listener_set_event_cb(
-      listener_accelerometer_, kDeviceSensorIntervalMicroseconds / 1000,
-      DataFetcherImplTizen::onAccelerationChanged, this);
-  return Start(CONSUMER_TYPE_MOTION);
-}
-
-void DataFetcherImplTizen::StopFetchingDeviceMotionData() {
-  Stop(CONSUMER_TYPE_MOTION);
-  {
-    base::AutoLock autolock(motion_buffer_lock_);
-    if (device_motion_buffer_) {
-      sensor_listener_unset_event_cb(listener_accelerometer_);
-      device_motion_buffer_ = NULL;
-    }
-  }
-}
-
-bool DataFetcherImplTizen::StartFetchingDeviceOrientationData(
-    DeviceOrientationHardwareBuffer* buffer) {
-  DCHECK(buffer);
-  {
-    base::AutoLock autolock(orientation_buffer_lock_);
-    device_orientation_buffer_ = buffer;
-  }
-  sensor_listener_set_event_cb(
-      listener_orientation_, kDeviceSensorIntervalMicroseconds / 1000,
-      DataFetcherImplTizen::onOrientationChanged, this);
-  bool success = Start(CONSUMER_TYPE_ORIENTATION);
-
-  {
-    base::AutoLock autolock(orientation_buffer_lock_);
-    // If Start() was unsuccessful then set the buffer ready flag to true
-    // to start firing all-null events.
-    SetOrientationBufferReadyStatus(!success);
-  }
-  return success;
-}
-
-void DataFetcherImplTizen::StopFetchingDeviceOrientationData() {
-  Stop(CONSUMER_TYPE_ORIENTATION);
-  {
-    base::AutoLock autolock(orientation_buffer_lock_);
-    if (device_orientation_buffer_) {
-      SetOrientationBufferReadyStatus(false);
-      sensor_listener_unset_event_cb(listener_orientation_);
-      device_orientation_buffer_ = NULL;
-    }
-  }
-}
-
-bool DataFetcherImplTizen::Start(ConsumerType type) {
-  switch(type) {
-  case CONSUMER_TYPE_ORIENTATION:
-    return (SENSOR_ERROR_NONE == sensor_listener_start(listener_orientation_));
-  case CONSUMER_TYPE_MOTION:
-    if (SENSOR_ERROR_NONE != sensor_listener_start(listener_accelerometer_)) {
-      return false;
-    }
-    return (SENSOR_ERROR_NONE == sensor_listener_start(listener_gyroscope_));
-  default:
-    NOTREACHED();
-    return false;
-  }
-
-}
-
-void DataFetcherImplTizen::Stop(ConsumerType type) {
-  switch(type) {
-  case CONSUMER_TYPE_ORIENTATION:
-    sensor_listener_stop(listener_orientation_);
-    return;
-  case CONSUMER_TYPE_MOTION:
-    sensor_listener_stop(listener_accelerometer_);
-    sensor_listener_stop(listener_gyroscope_);
-    memset(&last_motion_data_, 0, sizeof(last_motion_data_));
-    has_last_motion_data_ = false;
-    return;
-  default:
-    NOTREACHED();
-    return;
-  }
-}
-
-//static
-void DataFetcherImplTizen::onOrientationChanged(sensor_h sensor,
-    sensor_event_s *event, void* userData) {
-  DataFetcherImplTizen *fetcher = static_cast<DataFetcherImplTizen*>(userData);
-  base::AutoLock autolock(fetcher->orientation_buffer_lock_);
-
-  if (!fetcher->device_orientation_buffer_)
-    return;
-
-  fetcher->device_orientation_buffer_->seqlock.WriteBegin();
-
-  float azimuth = event->values[0];
-  float pitch = event->values[1];
-  float roll = event->values[2];
-
-  fetcher->device_orientation_buffer_->data.alpha = azimuth;
-  fetcher->device_orientation_buffer_->data.has_alpha = true;
-  fetcher->device_orientation_buffer_->data.beta = pitch;
-  fetcher->device_orientation_buffer_->data.has_beta = true;
-  fetcher->device_orientation_buffer_->data.gamma = roll;
-  fetcher->device_orientation_buffer_->data.has_gamma = true;
-  fetcher->device_orientation_buffer_->seqlock.WriteEnd();
-
-  if (!fetcher->is_orientation_buffer_ready_)
-    fetcher->SetOrientationBufferReadyStatus(true);
-}
-
-//static
-void DataFetcherImplTizen::onAccelerationChanged(sensor_h sensor,
-    sensor_event_s *event, void* userData) {
-  DataFetcherImplTizen *self = static_cast<DataFetcherImplTizen*>(userData);
-
-  float x = event->values[0];
-  float y = event->values[1];
-  float z = event->values[2];
-
-  float gravityX = x * 0.2f;
-  float gravityY = y * 0.2f;
-  float gravityZ = z * 0.2f;
-  bool accelerationAvailable = false;
-
-  unsigned long long timestamp = event->timestamp;
-
-  double interval = static_cast<double>(
-      self->last_motion_timestamp_
-          ? (timestamp - self->last_motion_timestamp_) / 1000
-          : kDeviceSensorIntervalMicroseconds / 1000);
-  self->last_motion_timestamp_ = timestamp;
-
-  if (self->has_last_motion_data_) {
-    const DeviceMotionHardwareBuffer* m = self->last_motion_data_;
-    gravityX +=
-        (m->data.acceleration_including_gravity_x - m->data.acceleration_x) *
-        0.8f;
-    gravityY +=
-        (m->data.acceleration_including_gravity_x - m->data.acceleration_y) *
-        0.8f;
-    gravityZ +=
-        (m->data.acceleration_including_gravity_z - m->data.acceleration_z) *
-        0.8f;
-    accelerationAvailable = true;
-  }
-
-  float alpha, beta, gamma;
-  bool rotationRateAvailable = false;
-
-  sensor_event_s event_gyroscope;
-  if (!sensor_listener_read_data(listener_gyroscope_, &event_gyroscope))
-    rotationRateAvailable = true;
-
-  alpha = event_gyroscope.values[0];
-  beta = event_gyroscope.values[1];
-  gamma = event_gyroscope.values[2];
-
-  self->device_motion_buffer_->seqlock.WriteBegin();
-
-  self->device_motion_buffer_->data.acceleration_including_gravity_x = x;
-  self->device_motion_buffer_->data.has_acceleration_including_gravity_x = true;
-  self->device_motion_buffer_->data.acceleration_including_gravity_x = y;
-  self->device_motion_buffer_->data.has_acceleration_including_gravity_x = true;
-  self->device_motion_buffer_->data.acceleration_including_gravity_z = z;
-  self->device_motion_buffer_->data.has_acceleration_including_gravity_z = true;
-
-  self->device_motion_buffer_->data.acceleration_x = x - gravityX;
-  self->device_motion_buffer_->data.has_acceleration_x = accelerationAvailable;
-  self->device_motion_buffer_->data.acceleration_y = y - gravityY;
-  self->device_motion_buffer_->data.has_acceleration_y = accelerationAvailable;
-  self->device_motion_buffer_->data.acceleration_z = z - gravityZ;
-  self->device_motion_buffer_->data.has_acceleration_z = accelerationAvailable;
-
-  self->device_motion_buffer_->data.rotation_rate_alpha = alpha;
-  self->device_motion_buffer_->data.has_rotation_rate_alpha =
-      rotationRateAvailable;
-  self->device_motion_buffer_->data.rotation_rate_beta = beta;
-  self->device_motion_buffer_->data.has_rotation_rate_beta =
-      rotationRateAvailable;
-  self->device_motion_buffer_->data.rotation_rate_gamma = gamma;
-  self->device_motion_buffer_->data.has_rotation_rate_gamma =
-      rotationRateAvailable;
-
-  self->device_motion_buffer_->data.all_available_sensors_are_active =
-      (accelerationAvailable && rotationRateAvailable);
-
-  self->last_motion_data_ = self->device_motion_buffer_;
-  self->has_last_motion_data_ = true;
-
-  self->device_motion_buffer_->data.interval = interval;
-
-  self->device_motion_buffer_->seqlock.WriteEnd();
-}
-
-void DataFetcherImplTizen::SetOrientationBufferReadyStatus(bool ready) {
-  device_orientation_buffer_->seqlock.WriteBegin();
-  device_orientation_buffer_->data.absolute = ready;
-  device_orientation_buffer_->data.all_available_sensors_are_active = ready;
-  device_orientation_buffer_->seqlock.WriteEnd();
-  is_orientation_buffer_ready_ = ready;
-}
-
-} // namespace content

diff --git a/tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_impl_tizen.h b/tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_impl_tizen.h
deleted file mode 100644 (file)
index 18a259d..0000000
--- a/tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_impl_tizen.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef DATA_FETCHER_IMPL_TIZEN_H_
-#define DATA_FETCHER_IMPL_TIZEN_H_
-
-#include <sensor/sensor.h>
-
-#include "base/synchronization/lock.h"
-#include "device/sensors/device_sensors_consts.h"
-#include "device/sensors/public/cpp/device_motion_hardware_buffer.h"
-#include "device/sensors/public/cpp/device_orientation_hardware_buffer.h"
-
-namespace base {
-template<typename T> struct DefaultSingletonTraits;
-}
-
-namespace content {
-
-using namespace device;
-
-// FIXME: This class should be moved to device namespace.
-class DataFetcherImplTizen {
- public:
-  static DataFetcherImplTizen* GetInstance();
-
-  // Shared memory related methods.
-  bool StartFetchingDeviceMotionData(DeviceMotionHardwareBuffer* buffer);
-  void StopFetchingDeviceMotionData();
-
-  bool StartFetchingDeviceOrientationData(
-      DeviceOrientationHardwareBuffer* buffer);
-  void StopFetchingDeviceOrientationData();
-
-  virtual bool Start(ConsumerType);
-  virtual void Stop(ConsumerType);
-
- protected:
-  DataFetcherImplTizen();
-  virtual ~DataFetcherImplTizen();
-  static void onOrientationChanged(sensor_h sensor, sensor_event_s *event, void* userData);
-  static void onAccelerationChanged(sensor_h sensor, sensor_event_s *event, void* userData);
-
- private:
-  friend struct base::DefaultSingletonTraits<DataFetcherImplTizen>;
-
-  void SetOrientationBufferReadyStatus(bool ready);
-
-  DeviceMotionHardwareBuffer* device_motion_buffer_;
-  DeviceOrientationHardwareBuffer* device_orientation_buffer_;
-  DeviceMotionHardwareBuffer* last_motion_data_;
-  bool has_last_motion_data_;
-  unsigned long long last_motion_timestamp_;
-  bool is_orientation_buffer_ready_;
-
-  base::Lock motion_buffer_lock_;
-  base::Lock orientation_buffer_lock_;
-
-  DISALLOW_COPY_AND_ASSIGN(DataFetcherImplTizen);
-};
-
-} // namespace content
-
-#endif  // DATA_FETCHER_IMPL_TIZEN_H_

diff --git a/tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_shared_memory_tizen.cc b/tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_shared_memory_tizen.cc
deleted file mode 100644 (file)
index 29e1cc2..0000000
--- a/tizen_src/chromium_impl/content/browser/device_sensors/data_fetcher_shared_memory_tizen.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#if defined(OS_TIZEN)
-#include "content/browser/device_sensors/data_fetcher_impl_tizen.h"
-#endif
-
-#include "base/logging.h"
-#include "content/browser/device_sensors/data_fetcher_shared_memory.h"
-#include "device/sensors/public/cpp/device_motion_hardware_buffer.h"
-#include "device/sensors/public/cpp/device_orientation_hardware_buffer.h"
-#include "tizen/system_info.h"
-
-namespace content {
-
-DataFetcherSharedMemory::DataFetcherSharedMemory() {
-}
-
-DataFetcherSharedMemory::~DataFetcherSharedMemory() {
-}
-
-bool DataFetcherSharedMemory::Start(ConsumerType consumer_type, void* buffer) {
-  if (!(IsMobileProfile() || IsWearableProfile()))
-    return false;
-
-  DCHECK(buffer);
-
-  switch (consumer_type) {
-    case CONSUMER_TYPE_MOTION:
-      return DataFetcherImplTizen::GetInstance()->
-          StartFetchingDeviceMotionData(
-              static_cast<DeviceMotionHardwareBuffer*>(buffer));
-    case CONSUMER_TYPE_ORIENTATION:
-      return DataFetcherImplTizen::GetInstance()->
-          StartFetchingDeviceOrientationData(
-              static_cast<DeviceOrientationHardwareBuffer*>(buffer));
-    default:
-      NOTREACHED();
-  }
-  return false;
-}
-
-bool DataFetcherSharedMemory::Stop(ConsumerType consumer_type) {
-  if (!(IsMobileProfile() || IsWearableProfile()))
-    return false;
-
-  switch (consumer_type) {
-    case CONSUMER_TYPE_MOTION:
-      DataFetcherImplTizen::GetInstance()->StopFetchingDeviceMotionData();
-      return true;
-    case CONSUMER_TYPE_ORIENTATION:
-      DataFetcherImplTizen::GetInstance()->StopFetchingDeviceOrientationData();
-      return true;
-    default:
-      NOTREACHED();
-  }
-  return false;
-}
-
-#if !defined(EWK_BRINGUP)
-DataFetcherSharedMemory::FetcherType DataFetcherSharedMemory::GetType() const {
-  return FETCHER_TYPE_SEPARATE_THREAD;
-}
-#endif
-
-}  // namespace content