Revert of Refactor DeviceMotionEventPump to use //device/generic_sensor instead of //device/sensors

content/renderer/device_sensors/device_motion_event_pump.cc

Index: content/renderer/device_sensors/device_motion_event_pump.cc
diff --git a/content/renderer/device_sensors/device_motion_event_pump.cc b/content/renderer/device_sensors/device_motion_event_pump.cc
index 240ca24fe9cf4d934d7f31acf0c0ea297d66b76a..94d7f3f7b1e5d81f6c5aaef1c2f218348f22cf4d 100644
--- a/content/renderer/device_sensors/device_motion_event_pump.cc
+++ b/content/renderer/device_sensors/device_motion_event_pump.cc
@@ -2,328 +2,38 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/device_sensors/device_motion_event_pump.h"
+#include "device_motion_event_pump.h"
 
-#include "base/memory/ptr_util.h"
-#include "content/public/common/service_names.mojom.h"
 #include "content/public/renderer/render_thread.h"
-#include "mojo/public/cpp/bindings/interface_request.h"
-#include "services/device/public/interfaces/constants.mojom.h"
-#include "services/service_manager/public/cpp/connector.h"
 #include "third_party/WebKit/public/platform/modules/device_orientation/WebDeviceMotionListener.h"
-
-namespace {
-
-constexpr int kMaxReadAttemptsCount = 10;
-
-// TODO(juncai): Extracting mojo::ScopedSharedBufferMapping reading
-// functionality into a helper class.
-// http://crbug.com/727788
-bool TryReadFromBuffer(const device::SensorReadingSharedBuffer* buffer,
-                       device::SensorReading* result) {
-  const device::OneWriterSeqLock& seqlock = buffer->seqlock.value();
-  auto version = seqlock.ReadBegin();
-  auto reading_data = buffer->reading;
-  if (seqlock.ReadRetry(version))
-    return false;
-  *result = reading_data;
-  return true;
-}
-
-// Updates sensor reading from shared buffer.
-bool UpdateSensorReading(const device::SensorReadingSharedBuffer* buffer,
-                         device::SensorReading* result) {
-  int read_attempts = 0;
-  while (!TryReadFromBuffer(buffer, result)) {
-    if (++read_attempts == kMaxReadAttemptsCount)
-      return false;
-  }
-
-  return true;
-}
-
-}  // namespace
 
 namespace content {
 
 DeviceMotionEventPump::DeviceMotionEventPump(RenderThread* thread)
-    : PlatformEventObserver<blink::WebDeviceMotionListener>(thread),
-      accelerometer_(this, device::mojom::SensorType::ACCELEROMETER),
-      linear_acceleration_sensor_(
-          this,
-          device::mojom::SensorType::LINEAR_ACCELERATION),
-      gyroscope_(this, device::mojom::SensorType::GYROSCOPE),
-      state_(PumpState::STOPPED) {}
+    : DeviceSensorMojoClientMixin<
+          DeviceSensorEventPump<blink::WebDeviceMotionListener>,
+          device::mojom::MotionSensor>(thread) {}
 
 DeviceMotionEventPump::~DeviceMotionEventPump() {
-  PlatformEventObserver<blink::WebDeviceMotionListener>::StopIfObserving();
 }
 
-void DeviceMotionEventPump::Start(blink::WebPlatformEventListener* listener) {
-  DVLOG(2) << "requested start";
-
-  if (state_ != PumpState::STOPPED)
-    return;
-
-  DCHECK(!timer_.IsRunning());
-
-  state_ = PumpState::PENDING_START;
-  PlatformEventObserver<blink::WebDeviceMotionListener>::Start(listener);
+void DeviceMotionEventPump::FireEvent() {
+  DCHECK(listener());
+  device::MotionData data;
+  if (reader_->GetLatestData(&data) && data.all_available_sensors_are_active)
+    listener()->DidChangeDeviceMotion(data);
 }
 
-void DeviceMotionEventPump::Stop() {
-  DVLOG(2) << "requested stop";
-
-  if (state_ == PumpState::STOPPED)
-    return;
-
-  DCHECK((state_ == PumpState::PENDING_START && !timer_.IsRunning()) ||
-         (state_ == PumpState::RUNNING && timer_.IsRunning()));
-
-  if (timer_.IsRunning())
-    timer_.Stop();
-
-  PlatformEventObserver<blink::WebDeviceMotionListener>::Stop();
-  state_ = PumpState::STOPPED;
-}
-
-void DeviceMotionEventPump::SendStartMessage() {
-  auto request = mojo::MakeRequest(&sensor_provider_);
-
-  // When running layout tests, those observers should not listen to the
-  // actual hardware changes. In order to make that happen, don't connect
-  // the other end of the mojo pipe to anything.
-  if (!RenderThreadImpl::current() ||
-      RenderThreadImpl::current()->layout_test_mode()) {
-    return;
-  }
-
-  if (!accelerometer_.sensor && !linear_acceleration_sensor_.sensor &&
-      !gyroscope_.sensor) {
-    RenderThread::Get()->GetConnector()->BindInterface(
-        device::mojom::kServiceName, std::move(request));
-    sensor_provider_.set_connection_error_handler(
-        base::Bind(&DeviceMotionEventPump::HandleSensorProviderError,
-                   base::Unretained(this)));
-    GetSensor(&accelerometer_);
-    GetSensor(&linear_acceleration_sensor_);
-    GetSensor(&gyroscope_);
-  } else {
-    if (accelerometer_.sensor)
-      accelerometer_.sensor->Resume();
-
-    if (linear_acceleration_sensor_.sensor)
-      linear_acceleration_sensor_.sensor->Resume();
-
-    if (gyroscope_.sensor)
-      gyroscope_.sensor->Resume();
-
-    DidStart();
-  }
-}
-
-void DeviceMotionEventPump::SendStopMessage() {
-  // SendStopMessage() gets called both when the page visibility changes and if
-  // all device motion event listeners are unregistered. Since removing the
-  // event listener is more rare than the page visibility changing,
-  // Sensor::Suspend() is used to optimize this case for not doing extra work.
-  if (accelerometer_.sensor)
-    accelerometer_.sensor->Suspend();
-
-  if (linear_acceleration_sensor_.sensor)
-    linear_acceleration_sensor_.sensor->Suspend();
-
-  if (gyroscope_.sensor)
-    gyroscope_.sensor->Suspend();
+bool DeviceMotionEventPump::InitializeReader(base::SharedMemoryHandle handle) {
+  if (!reader_)
+    reader_.reset(new DeviceMotionSharedMemoryReader());
+  return reader_->Initialize(handle);
 }
 
 void DeviceMotionEventPump::SendFakeDataForTesting(void* fake_data) {
   device::MotionData data = *static_cast<device::MotionData*>(fake_data);
+
   listener()->DidChangeDeviceMotion(data);
 }
 
-DeviceMotionEventPump::SensorEntry::SensorEntry(
-    DeviceMotionEventPump* pump,
-    device::mojom::SensorType sensor_type)
-    : event_pump(pump), type(sensor_type), client_binding(this) {}
-
-DeviceMotionEventPump::SensorEntry::~SensorEntry() {}
-
-void DeviceMotionEventPump::SensorEntry::RaiseError() {
-  HandleSensorError();
-}
-
-void DeviceMotionEventPump::SensorEntry::SensorReadingChanged() {
-  // Since DeviceMotionEventPump::FireEvent is called in a certain
-  // frequency, the |shared_buffer| is read frequently, and
-  // PlatformSensorConfiguration::set_suppress_on_change_events()
-  // is set to true, so this method is not called and doesn't need
-  // to be implemented.
-  NOTREACHED();
-}
-
-void DeviceMotionEventPump::SensorEntry::OnSensorCreated(
-    device::mojom::SensorInitParamsPtr params,
-    device::mojom::SensorClientRequest client_request) {
-  if (!params) {
-    HandleSensorError();
-    if (event_pump->CanStart())
-      event_pump->DidStart();
-    return;
-  }
-
-  constexpr size_t kReadBufferSize = sizeof(device::SensorReadingSharedBuffer);
-
-  DCHECK_EQ(0u, params->buffer_offset % kReadBufferSize);
-
-  mode = params->mode;
-  default_config = params->default_configuration;
-
-  DCHECK(sensor.is_bound());
-  client_binding.Bind(std::move(client_request));
-
-  shared_buffer_handle = std::move(params->memory);
-  DCHECK(!shared_buffer);
-  shared_buffer =
-      shared_buffer_handle->MapAtOffset(kReadBufferSize, params->buffer_offset);
-
-  if (!shared_buffer) {
-    HandleSensorError();
-    if (event_pump->CanStart())
-      event_pump->DidStart();
-    return;
-  }
-
-  DCHECK_GT(params->minimum_frequency, 0.0);
-  DCHECK_GE(params->maximum_frequency, params->minimum_frequency);
-  DCHECK_GE(device::mojom::SensorConfiguration::kMaxAllowedFrequency,
-            params->maximum_frequency);
-
-  default_config.set_frequency(kDefaultPumpFrequencyHz);
-  default_config.set_suppress_on_change_events(true);
-
-  sensor->AddConfiguration(default_config,
-                           base::Bind(&SensorEntry::OnSensorAddConfiguration,
-                                      base::Unretained(this)));
-}
-
-void DeviceMotionEventPump::SensorEntry::OnSensorAddConfiguration(
-    bool success) {
-  if (!success)
-    HandleSensorError();
-  if (event_pump->CanStart())
-    event_pump->DidStart();
-}
-
-void DeviceMotionEventPump::SensorEntry::HandleSensorError() {
-  sensor.reset();
-  shared_buffer_handle.reset();
-  shared_buffer.reset();
-  client_binding.Close();
-}
-
-bool DeviceMotionEventPump::SensorEntry::SensorReadingCouldBeRead() {
-  if (!sensor)
-    return false;
-
-  const device::SensorReadingSharedBuffer* buffer =
-      static_cast<const device::SensorReadingSharedBuffer*>(
-          shared_buffer.get());
-  if (!UpdateSensorReading(buffer, &reading)) {
-    HandleSensorError();
-    return false;
-  }
-
-  return true;
-}
-
-void DeviceMotionEventPump::FireEvent() {
-  device::MotionData data;
-  // The device orientation spec states that interval should be in milliseconds.
-  // https://w3c.github.io/deviceorientation/spec-source-orientation.html#devicemotion
-  data.interval = kDefaultPumpDelayMicroseconds / 1000;
-
-  DCHECK(listener());
-
-  GetDataFromSharedMemory(&data);
-  listener()->DidChangeDeviceMotion(data);
-}
-
-void DeviceMotionEventPump::DidStart() {
-  DVLOG(2) << "did start sensor event pump";
-
-  if (state_ != PumpState::PENDING_START)
-    return;
-
-  DCHECK(!timer_.IsRunning());
-
-  timer_.Start(FROM_HERE,
-               base::TimeDelta::FromMicroseconds(kDefaultPumpDelayMicroseconds),
-               this, &DeviceMotionEventPump::FireEvent);
-  state_ = PumpState::RUNNING;
-}
-
-bool DeviceMotionEventPump::CanStart() const {
-  if (accelerometer_.sensor && !accelerometer_.shared_buffer)
-    return false;
-
-  if (linear_acceleration_sensor_.sensor &&
-      !linear_acceleration_sensor_.shared_buffer) {
-    return false;
-  }
-
-  if (gyroscope_.sensor && !gyroscope_.shared_buffer)
-    return false;
-
-  return true;
-}
-
-void DeviceMotionEventPump::GetDataFromSharedMemory(device::MotionData* data) {
-  if (accelerometer_.SensorReadingCouldBeRead()) {
-    data->acceleration_including_gravity_x =
-        accelerometer_.reading.values[0].value();
-    data->acceleration_including_gravity_y =
-        accelerometer_.reading.values[1].value();
-    data->acceleration_including_gravity_z =
-        accelerometer_.reading.values[2].value();
-    data->has_acceleration_including_gravity_x = true;
-    data->has_acceleration_including_gravity_y = true;
-    data->has_acceleration_including_gravity_z = true;
-  }
-
-  if (linear_acceleration_sensor_.SensorReadingCouldBeRead()) {
-    data->acceleration_x =
-        linear_acceleration_sensor_.reading.values[0].value();
-    data->acceleration_y =
-        linear_acceleration_sensor_.reading.values[1].value();
-    data->acceleration_z =
-        linear_acceleration_sensor_.reading.values[2].value();
-    data->has_acceleration_x = true;
-    data->has_acceleration_y = true;
-    data->has_acceleration_z = true;
-  }
-
-  if (gyroscope_.SensorReadingCouldBeRead()) {
-    data->rotation_rate_alpha = gyroscope_.reading.values[0].value();
-    data->rotation_rate_beta = gyroscope_.reading.values[1].value();
-    data->rotation_rate_gamma = gyroscope_.reading.values[2].value();
-    data->has_rotation_rate_alpha = true;
-    data->has_rotation_rate_beta = true;
-    data->has_rotation_rate_gamma = true;
-  }
-}
-
-void DeviceMotionEventPump::GetSensor(SensorEntry* sensor_entry) {
-  auto request = mojo::MakeRequest(&sensor_entry->sensor);
-  sensor_provider_->GetSensor(sensor_entry->type, std::move(request),
-                              base::Bind(&SensorEntry::OnSensorCreated,
-                                         base::Unretained(sensor_entry)));
-  sensor_entry->sensor.set_connection_error_handler(base::Bind(
-      &SensorEntry::HandleSensorError, base::Unretained(sensor_entry)));
-}
-
-void DeviceMotionEventPump::HandleSensorProviderError() {
-  sensor_provider_.reset();
-}
-
 }  // namespace content