Merge lp:~abreu-alexandre/oxide/accelerometer-support into lp:~oxide-developers/oxide/oxide.trunk

[Alexandre Abreu]

WIP

Unmerged revisions

1276. By Alexandre Abreu on 2015-11-12

simple port to trunk

1275. By Alexandre Abreu on 2015-11-12

pull trunk

1274. By Alexandre Abreu on 2015-11-12

back to trunk

=== modified file 'qt/build/system.gyp'
--- qt/build/system.gyp	2015-10-28 19:09:39 +0000
+++ qt/build/system.gyp	2015-11-13 20:15:31 +0000
@@ -91,6 +91,23 @@
       },
     },
     {
+      'target_name': 'Qt5Sensors',
+      'type': 'none',
+      'direct_dependent_settings': {
+        'cflags_cc': [
+          '<!@(<(pkg_config) --cflags Qt5Sensors)'
+        ]
+      },
+      'link_settings': {
+        'ldflags': [
+          '<!@(<(pkg_config) --libs-only-L --libs-only-other Qt5Sensors)',
+        ],
+        'libraries': [
+          '<!@(<(pkg_config) --libs-only-l Qt5Sensors)',
+        ],
+      },
+    },
+    {
       'target_name': 'Qt5Positioning',
       'type': 'none',
       'direct_dependent_settings': {
 
=== added file 'qt/core/browser/oxide_data_fetcher_shared_memory.cc'
--- qt/core/browser/oxide_data_fetcher_shared_memory.cc	1970-01-01 00:00:00 +0000
+++ qt/core/browser/oxide_data_fetcher_shared_memory.cc	2015-11-13 20:15:31 +0000
@@ -0,0 +1,215 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "oxide_data_fetcher_shared_memory.h"
+
+#include "base/logging.h"
+#include "base/metrics/histogram.h"
+
+#include "qt/core/browser/oxide_qt_accelerometer.h"
+
+namespace {
+
+static bool SetMotionBuffer(content::DeviceMotionHardwareBuffer* buffer,
+    bool enabled) {
+  if (!buffer)
+    return false;
+  buffer->seqlock.WriteBegin();
+  buffer->data.allAvailableSensorsAreActive = enabled;
+  buffer->seqlock.WriteEnd();
+  return true;
+}
+
+static bool SetOrientationBuffer(
+    content::DeviceOrientationHardwareBuffer* buffer, bool enabled) {
+  if (!buffer)
+    return false;
+  buffer->seqlock.WriteBegin();
+  buffer->data.allAvailableSensorsAreActive = enabled;
+  buffer->seqlock.WriteEnd();
+  return true;
+}
+
+static bool SetLightBuffer(content::DeviceLightHardwareBuffer* buffer,
+                           double lux) {
+  if (!buffer)
+    return false;
+  buffer->seqlock.WriteBegin();
+  buffer->data.value = lux;
+  buffer->seqlock.WriteEnd();
+  return true;
+}
+
+}  // namespace
+
+namespace oxide {
+
+OxideDataFetcherSharedMemory::OxideDataFetcherSharedMemory()
+    : motion_buffer_(nullptr),
+    orientation_buffer_(nullptr),
+    light_buffer_(nullptr) {
+}
+
+OxideDataFetcherSharedMemory::~OxideDataFetcherSharedMemory() {
+}
+
+void FetchOrientation(
+      oxide::qt::AccelerometerSensorReader *sensor,
+      content::DeviceOrientationHardwareBuffer* buffer) {
+  DCHECK(buffer);
+  DCHECK(sensor);
+
+  double axis_value[3];
+  if (!sensor->GetData(axis_value)) {
+    return;
+  }
+
+  const double kRad2deg = 180.0 / M_PI;
+  double beta = kRad2deg * atan2(-axis_value[1], axis_value[2]);
+  double gamma = kRad2deg * asin(axis_value[0]);
+
+  if (beta == 180.0) {
+    beta = -180;
+  }
+  if (gamma == 90.0) {
+    gamma = nextafter(90, 0);
+  }
+
+  DCHECK_GE(beta, -180.0);
+  DCHECK_LT(beta,  180.0);
+  DCHECK_GE(gamma, -90.0);
+  DCHECK_LT(gamma,  90.0);
+
+  buffer->seqlock.WriteBegin();
+  buffer->data.beta = beta;
+  buffer->data.hasBeta = true;
+  buffer->data.gamma = gamma;
+  buffer->data.hasGamma = true;
+  buffer->data.allAvailableSensorsAreActive = true;
+  buffer->seqlock.WriteEnd();
+}
+
+void FetchMotion(
+      oxide::qt::AccelerometerSensorReader* sensor,
+      content::DeviceMotionHardwareBuffer* buffer) {
+  DCHECK(buffer);
+  DCHECK(sensor);
+
+  double axis_value[3];
+  if (!sensor->GetData(axis_value)) {
+    return;
+  }
+
+  buffer->seqlock.WriteBegin();
+  buffer->data.accelerationIncludingGravityX = axis_value[0];
+  buffer->data.hasAccelerationIncludingGravityX = true;
+  buffer->data.accelerationIncludingGravityY = axis_value[1];
+  buffer->data.hasAccelerationIncludingGravityY = true;
+  buffer->data.accelerationIncludingGravityZ = axis_value[2];
+  buffer->data.hasAccelerationIncludingGravityZ = true;
+  buffer->data.allAvailableSensorsAreActive = true;
+  buffer->seqlock.WriteEnd();
+}
+
+void OxideDataFetcherSharedMemory::Fetch(unsigned consumer_bitmask) {
+  DCHECK(base::MessageLoop::current() == GetPollingMessageLoop());
+  DCHECK(consumer_bitmask & content::CONSUMER_TYPE_ORIENTATION ||
+         consumer_bitmask & content::CONSUMER_TYPE_MOTION ||
+         consumer_bitmask & content::CONSUMER_TYPE_LIGHT);
+
+  if (consumer_bitmask & content::CONSUMER_TYPE_ORIENTATION) {
+    FetchOrientation(orientation_sensor_.get(), orientation_buffer_);
+  }
+  if (consumer_bitmask & content::CONSUMER_TYPE_MOTION) {
+    FetchMotion(motion_sensor_.get(), motion_buffer_);
+  }
+}
+
+content::DataFetcherSharedMemoryBase::FetcherType
+OxideDataFetcherSharedMemory::GetType() const {
+  return content::DataFetcherSharedMemoryBase::FETCHER_TYPE_POLLING_CALLBACK;
+}
+
+bool OxideDataFetcherSharedMemory::Start(
+      content::ConsumerType consumer_type,
+      void* buffer) {
+  DCHECK(buffer);
+
+  switch (consumer_type) {
+    case content::CONSUMER_TYPE_MOTION:
+      {
+        if (!motion_sensor_.get()) {
+          motion_sensor_.reset(
+              new oxide::qt::AccelerometerSensorReader());
+        }
+
+        motion_buffer_ =
+          static_cast<content::DeviceMotionHardwareBuffer*>(buffer);
+
+        UMA_HISTOGRAM_BOOLEAN("InertialSensor.MotionDefaultAvailable", false);
+
+        return SetMotionBuffer(motion_buffer_, true);
+      }
+    case content::CONSUMER_TYPE_ORIENTATION:
+      {
+        if (!orientation_sensor_.get()) {
+          orientation_sensor_.reset(
+              new oxide::qt::AccelerometerSensorReader());
+        }
+
+        orientation_buffer_ =
+          static_cast<content::DeviceOrientationHardwareBuffer*>(buffer);
+
+        UMA_HISTOGRAM_BOOLEAN("InertialSensor.OrientationDefaultAvailable",
+                              false);
+
+        return SetOrientationBuffer(orientation_buffer_, true);
+      }
+    case content::CONSUMER_TYPE_LIGHT:
+      {
+        light_buffer_ =
+          static_cast<content::DeviceLightHardwareBuffer*>(buffer);
+
+        return SetLightBuffer(
+            light_buffer_,
+            std::numeric_limits<double>::infinity());
+      }
+    default:
+      NOTREACHED();
+  }
+  return false;
+}
+
+bool OxideDataFetcherSharedMemory::Stop(content::ConsumerType consumer_type) {
+  switch (consumer_type) {
+    case content::CONSUMER_TYPE_MOTION:
+      motion_sensor_.reset(nullptr);
+
+      return SetMotionBuffer(motion_buffer_, false);
+    case content::CONSUMER_TYPE_ORIENTATION:
+      orientation_sensor_.reset(nullptr);
+
+      return SetOrientationBuffer(orientation_buffer_, false);
+    case content::CONSUMER_TYPE_LIGHT:
+      return SetLightBuffer(light_buffer_, -1);
+    default:
+      NOTREACHED();
+  }
+  return false;
+}
+
+} // namespace oxide
 
=== added file 'qt/core/browser/oxide_data_fetcher_shared_memory.h'
--- qt/core/browser/oxide_data_fetcher_shared_memory.h	1970-01-01 00:00:00 +0000
+++ qt/core/browser/oxide_data_fetcher_shared_memory.h	2015-11-13 20:15:31 +0000
@@ -0,0 +1,54 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_DEVICE_SENSORS_DATA_FETCHER_SHARED_MEMORY_H_
+#define _OXIDE_DEVICE_SENSORS_DATA_FETCHER_SHARED_MEMORY_H_
+
+#include "content/browser/device_sensors/data_fetcher_shared_memory.h"
+
+namespace oxide {
+
+namespace qt {
+class AccelerometerSensorReader;
+}
+
+class CONTENT_EXPORT OxideDataFetcherSharedMemory
+    : public content::DataFetcherSharedMemory {
+
+ public:
+  OxideDataFetcherSharedMemory();
+  ~OxideDataFetcherSharedMemory() override;
+
+ private:
+  bool Start(content::ConsumerType consumer_type, void* buffer) override;
+  bool Stop(content::ConsumerType consumer_type) override;
+
+  void Fetch(unsigned consumer_bitmask) override;
+  content::DataFetcherSharedMemoryBase::FetcherType GetType() const override;
+  scoped_ptr<oxide::qt::AccelerometerSensorReader> motion_sensor_;
+  scoped_ptr<oxide::qt::AccelerometerSensorReader> orientation_sensor_;
+
+  content::DeviceMotionHardwareBuffer* motion_buffer_;
+  content::DeviceOrientationHardwareBuffer* orientation_buffer_;
+  content::DeviceLightHardwareBuffer* light_buffer_;
+
+  DISALLOW_COPY_AND_ASSIGN(OxideDataFetcherSharedMemory);
+};
+
+}
+
+#endif // _OXIDE_DEVICE_SENSORS_DATA_FETCHER_SHARED_MEMORY_H_
 
=== added file 'qt/core/browser/oxide_qt_accelerometer.cc'
--- qt/core/browser/oxide_qt_accelerometer.cc	1970-01-01 00:00:00 +0000
+++ qt/core/browser/oxide_qt_accelerometer.cc	2015-11-13 20:15:31 +0000
@@ -0,0 +1,91 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "oxide_qt_accelerometer.h"
+#include "oxide_qt_accelerometer_p.h"
+
+
+namespace oxide {
+namespace qt {
+
+AccelerometerSensorReader::AccelerometerSensorReader()
+  : instance_(AccelerometerSensorReaderImpl::GetInstance()) {
+}
+
+bool AccelerometerSensorReader::GetData(double buf[3]) {
+  return instance_->GetData(buf);
+}
+
+QWeakPointer<AccelerometerSensorReaderImpl> AccelerometerSensorReaderImpl::instance_;
+
+QSharedPointer<AccelerometerSensorReaderImpl> AccelerometerSensorReaderImpl::GetInstance() {
+  QSharedPointer<AccelerometerSensorReaderImpl> instance =
+    instance_.toStrongRef();
+
+  if (!instance.data()) {
+    instance =
+      QSharedPointer<AccelerometerSensorReaderImpl>(
+          new AccelerometerSensorReaderImpl());
+
+    instance->accelerometer_.moveToThread(&instance->thread_);
+    instance->connect(
+        &instance->accelerometer_,
+        SIGNAL(readingChanged()),
+        SLOT(updateSensor()),
+        Qt::DirectConnection);
+    instance->thread_.start();
+    QMetaObject::invokeMethod(&instance->accelerometer_, "start", Qt::QueuedConnection);
+
+    instance_ = instance;
+  }
+  return instance;
+}
+
+bool AccelerometerSensorReaderImpl::GetData(double buf[3]) {
+  if (!initialized_) {
+    return false;
+  }
+
+  mutex_.lock();
+  buf[0] = x_;
+  buf[1] = y_;
+  buf[2] = z_;
+  mutex_.unlock();
+
+  return true;
+}
+
+void AccelerometerSensorReaderImpl::updateSensor() {
+  QAccelerometerReading *accelerometer = accelerometer_.reading();
+  if (!accelerometer) {
+    return;
+  }
+
+  mutex_.lock();
+  x_ = accelerometer->x();
+  y_ = accelerometer->y();
+  z_ = accelerometer->z();
+  initialized_ = true;
+  mutex_.unlock();
+}
+
+AccelerometerSensorReaderImpl::AccelerometerSensorReaderImpl()
+  : initialized_(false) {
+}
+
+} // namespace qt
+} // namespace oxide
 
=== added file 'qt/core/browser/oxide_qt_accelerometer.h'
--- qt/core/browser/oxide_qt_accelerometer.h	1970-01-01 00:00:00 +0000
+++ qt/core/browser/oxide_qt_accelerometer.h	2015-11-13 20:15:31 +0000
@@ -0,0 +1,39 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_QT_CORE_BROWSER_ACCELEROMETER_H_
+#define _OXIDE_QT_CORE_BROWSER_ACCELEROMETER_H_
+
+#include <QtCore>
+
+namespace oxide {
+namespace qt {
+
+class AccelerometerSensorReaderImpl;
+
+class AccelerometerSensorReader {
+public:
+  AccelerometerSensorReader();
+  bool GetData(double buf[3]);
+private:
+  QSharedPointer<AccelerometerSensorReaderImpl> instance_;
+};
+
+} // namespace qt
+} // namespace oxide
+
+#endif // _OXIDE_QT_CORE_BROWSER_ACCELEROMETER_H_
 
=== added file 'qt/core/browser/oxide_qt_accelerometer_p.h'
--- qt/core/browser/oxide_qt_accelerometer_p.h	1970-01-01 00:00:00 +0000
+++ qt/core/browser/oxide_qt_accelerometer_p.h	2015-11-13 20:15:31 +0000
@@ -0,0 +1,53 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_QT_CORE_BROWSER_ACCELEROMETER_P_H_
+#define _OXIDE_QT_CORE_BROWSER_ACCELEROMETER_P_H_
+
+#include <QtCore>
+#include <QAccelerometer>
+
+namespace oxide {
+namespace qt {
+
+class AccelerometerSensorReaderImpl: public QObject {
+  Q_OBJECT
+public:
+  static QSharedPointer<AccelerometerSensorReaderImpl> GetInstance();
+
+  bool GetData(double buf[3]);
+
+protected Q_SLOTS:
+  void updateSensor();
+
+private:
+  AccelerometerSensorReaderImpl();
+
+  double x_, y_, z_;
+  bool initialized_;
+  QAccelerometer accelerometer_;
+  QThread thread_;
+  QMutex mutex_;
+
+  //TODO: to QWeakPointer
+  static QWeakPointer<AccelerometerSensorReaderImpl> instance_;
+};
+
+} // namespace qt
+} // namespace oxide
+
+#endif // _OXIDE_QT_CORE_BROWSER_ACCELEROMETER_P_H_
 
=== modified file 'qt/core/browser/oxide_qt_browser_startup.cc'
--- qt/core/browser/oxide_qt_browser_startup.cc	2015-04-20 19:22:23 +0000
+++ qt/core/browser/oxide_qt_browser_startup.cc	2015-11-13 20:15:31 +0000
@@ -30,6 +30,8 @@
 #include "qt/core/app/oxide_qt_platform_delegate.h"
 #include "qt/core/gpu/oxide_qt_gl_context_dependent.h"
 
+#include "content/browser/device_sensors/device_inertial_sensor_service.h"
+#include "oxide_data_fetcher_shared_memory.h"
 #include "oxide_qt_web_context.h"
 
 namespace oxide {
@@ -48,7 +50,10 @@
 
 BrowserStartup::BrowserStartup()
     : process_model_is_from_env_(false),
-      process_model_(oxide::PROCESS_MODEL_UNDEFINED) {}
+      process_model_(oxide::PROCESS_MODEL_UNDEFINED) {
+  content::DeviceInertialSensorService::GetInstance()->SetDataFetcherForTesting(
+      new OxideDataFetcherSharedMemory());
+}
 
 // static
 BrowserStartup* BrowserStartup::GetInstance() {
 
=== modified file 'qt/core/core.gyp'
--- qt/core/core.gyp	2015-10-28 19:09:39 +0000
+++ qt/core/core.gyp	2015-11-13 20:15:31 +0000
@@ -30,6 +30,7 @@
         '../build/system.gyp:Qt5Gui-private',
         '../build/system.gyp:Qt5Positioning',
         '../build/system.gyp:Qt5Network',
+        '../build/system.gyp:Qt5Sensors',
         '../../shared/shared.gyp:oxide_shared',
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/content/content.gyp:content_browser',
@@ -60,6 +61,7 @@
       'sources': [
         '<(INTERMEDIATE_DIR)/moc_oxide_qt_browser_platform_integration.cc',
         '<(INTERMEDIATE_DIR)/moc_oxide_qt_input_method_context.cc',
+        '<(INTERMEDIATE_DIR)/moc_oxide_qt_accelerometer_p.cc',
         'api/internal/oxideqmediacapturedevices_p.cc',
         'api/internal/oxideqwebpreferences_p.cc',
         'app/oxide_qt_main.cc',
@@ -69,6 +71,11 @@
         'browser/input/oxide_qt_input_method_context.cc',
         'browser/input/oxide_qt_input_method_context.h',
         'browser/input/oxide_qt_input_method_context_client.h',
+        'browser/oxide_qt_accelerometer_p.h',
+        'browser/oxide_qt_accelerometer.h',
+        'browser/oxide_qt_accelerometer.cc',
+        'browser/oxide_data_fetcher_shared_memory.cc',
+        'browser/oxide_data_fetcher_shared_memory.h',
         'browser/oxide_qt_browser_platform_integration.cc',
         'browser/oxide_qt_browser_platform_integration.h',
         'browser/oxide_qt_browser_startup.cc',
@@ -151,6 +158,11 @@
       ],
       'actions': [
         {
+          'action_name': 'moc_oxide_qt_accelerometer_p.cc',
+          'moc_input': 'browser/oxide_qt_accelerometer_p.h',
+          'includes': [ 'moc.gypi' ]
+        },
+        {
           'action_name': 'oxide_qt_clipboard.moc',
           'moc_input': 'browser/oxide_qt_clipboard.cc',
           'includes': [ 'moc.gypi' ]