[Device Sensors] Move Mojo communication to UI thread on Android

content/browser/device_sensors/sensor_manager_android.cc

 // 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 "content/browser/device_sensors/sensor_manager_android.h"
 
 #include <string.h>
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
@@ skipping 40 matching lines @@
 namespace content {
 
 SensorManagerAndroid::SensorManagerAndroid()
     : number_active_device_motion_sensors_(0),
       device_light_buffer_(nullptr),
       device_motion_buffer_(nullptr),
       device_orientation_buffer_(nullptr),
       motion_buffer_initialized_(false),
       orientation_buffer_initialized_(false),
       is_shutdown_(false) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   memset(received_motion_data_, 0, sizeof(received_motion_data_));
   device_sensors_.Reset(Java_DeviceSensors_getInstance(
       AttachCurrentThread(), base::android::GetApplicationContext()));
 }
 
 SensorManagerAndroid::~SensorManagerAndroid() {
 }
 
 bool SensorManagerAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 SensorManagerAndroid* SensorManagerAndroid::GetInstance() {
   return base::Singleton<

[timvolodine, 2016/10/31 15:51:45]

maybe also DCHECK UI thread here

[blundell, 2016/11/09 15:07:43]

Done.

       SensorManagerAndroid,
       base::LeakySingletonTraits<SensorManagerAndroid>>::get();
 }
 
 void SensorManagerAndroid::GotOrientation(JNIEnv*,
                                           const JavaParamRef<jobject>&,
                                           double alpha,
                                           double beta,
                                           double gamma) {
   base::AutoLock autolock(orientation_buffer_lock_);
@@ skipping 115 matching lines @@
 
   if (!device_light_buffer_)
     return;
 
   device_light_buffer_->seqlock.WriteBegin();
   device_light_buffer_->data.value = value;
   device_light_buffer_->seqlock.WriteEnd();
 }
 
 bool SensorManagerAndroid::Start(ConsumerType consumer_type) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!device_sensors_.is_null());
   int rate_in_microseconds = (consumer_type == CONSUMER_TYPE_LIGHT)
                                  ? kLightSensorIntervalMicroseconds
                                  : kDeviceSensorIntervalMicroseconds;
   return Java_DeviceSensors_start(
       AttachCurrentThread(), device_sensors_, reinterpret_cast<intptr_t>(this),
       static_cast<jint>(consumer_type), rate_in_microseconds);
 }
 
 void SensorManagerAndroid::Stop(ConsumerType consumer_type) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!device_sensors_.is_null());
   Java_DeviceSensors_stop(AttachCurrentThread(), device_sensors_,
                           static_cast<jint>(consumer_type));
 }
 
 int SensorManagerAndroid::GetNumberActiveDeviceMotionSensors() {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!device_sensors_.is_null());
   return Java_DeviceSensors_getNumberActiveDeviceMotionSensors(
       AttachCurrentThread(), device_sensors_);
 }
 
 SensorManagerAndroid::OrientationSensorType
 SensorManagerAndroid::GetOrientationSensorTypeUsed() {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!device_sensors_.is_null());
   return static_cast<SensorManagerAndroid::OrientationSensorType>(
       Java_DeviceSensors_getOrientationSensorTypeUsed(AttachCurrentThread(),
                                                       device_sensors_));
 }
 
 // ----- Shared memory API methods
 
 // --- Device Light
 
 void SensorManagerAndroid::StartFetchingDeviceLightData(
     DeviceLightHardwareBuffer* buffer) {
-  if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    StartFetchingLightDataOnUI(buffer);
-  } else {
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE,
-        base::Bind(&SensorManagerAndroid::StartFetchingLightDataOnUI,
-                   base::Unretained(this),
-                   buffer));
-  }
-}
-
-void SensorManagerAndroid::StartFetchingLightDataOnUI(
-    DeviceLightHardwareBuffer* buffer) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(buffer);
   if (is_shutdown_)
     return;
 
   {
     base::AutoLock autolock(light_buffer_lock_);
     device_light_buffer_ = buffer;
     SetLightBufferValue(-1);
   }
   bool success = Start(CONSUMER_TYPE_LIGHT);
   if (!success) {
     base::AutoLock autolock(light_buffer_lock_);
     SetLightBufferValue(std::numeric_limits<double>::infinity());
   }
 }
 
 void SensorManagerAndroid::StopFetchingDeviceLightData() {
-  if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    StopFetchingLightDataOnUI();
-    return;
-  }
-
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(&SensorManagerAndroid::StopFetchingLightDataOnUI,
-                 base::Unretained(this)));
-}
-
-void SensorManagerAndroid::StopFetchingLightDataOnUI() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (is_shutdown_)
     return;
 
   Stop(CONSUMER_TYPE_LIGHT);
   {
     base::AutoLock autolock(light_buffer_lock_);
     if (device_light_buffer_) {
       SetLightBufferValue(-1);
       device_light_buffer_ = nullptr;
     }
   }
 }
 
 void SensorManagerAndroid::SetLightBufferValue(double lux) {
   device_light_buffer_->seqlock.WriteBegin();
   device_light_buffer_->data.value = lux;
   device_light_buffer_->seqlock.WriteEnd();
 }
 
 // --- Device Motion
 
 void SensorManagerAndroid::StartFetchingDeviceMotionData(
     DeviceMotionHardwareBuffer* buffer) {
-  if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    StartFetchingMotionDataOnUI(buffer);
-  } else {
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE,
-        base::Bind(&SensorManagerAndroid::StartFetchingMotionDataOnUI,
-                   base::Unretained(this),
-                   buffer));
-  }
-}
-
-void SensorManagerAndroid::StartFetchingMotionDataOnUI(
-    DeviceMotionHardwareBuffer* buffer) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(buffer);
   if (is_shutdown_)
     return;
 
   {
     base::AutoLock autolock(motion_buffer_lock_);
     device_motion_buffer_ = buffer;
     ClearInternalMotionBuffers();
   }
   Start(CONSUMER_TYPE_MOTION);
 
   // If no motion data can ever be provided, the number of active device motion
   // sensors will be zero. In that case flag the shared memory buffer
   // as ready to read, as it will not change anyway.
   number_active_device_motion_sensors_ = GetNumberActiveDeviceMotionSensors();
   {
     base::AutoLock autolock(motion_buffer_lock_);
     CheckMotionBufferReadyToRead();
   }
 }
 
 void SensorManagerAndroid::StopFetchingDeviceMotionData() {
-  if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    StopFetchingMotionDataOnUI();
-    return;
-  }
-
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(&SensorManagerAndroid::StopFetchingMotionDataOnUI,
-                 base::Unretained(this)));
-}
-
-void SensorManagerAndroid::StopFetchingMotionDataOnUI() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (is_shutdown_)
     return;
 
   Stop(CONSUMER_TYPE_MOTION);
   {
     base::AutoLock autolock(motion_buffer_lock_);
     if (device_motion_buffer_) {
       ClearInternalMotionBuffers();
       device_motion_buffer_ = nullptr;
@@ skipping 33 matching lines @@
 void SensorManagerAndroid::ClearInternalMotionBuffers() {
   memset(received_motion_data_, 0, sizeof(received_motion_data_));
   number_active_device_motion_sensors_ = 0;
   SetMotionBufferReadyStatus(false);
 }
 
 // --- Device Orientation
 
 void SensorManagerAndroid::StartFetchingDeviceOrientationData(
     DeviceOrientationHardwareBuffer* buffer) {
-  if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    StartFetchingOrientationDataOnUI(buffer);
-  } else {
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE,
-        base::Bind(&SensorManagerAndroid::StartFetchingOrientationDataOnUI,
-                   base::Unretained(this),
-                   buffer));
-  }
-}
-
-void SensorManagerAndroid::StartFetchingOrientationDataOnUI(
-    DeviceOrientationHardwareBuffer* buffer) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(buffer);
   if (is_shutdown_)
     return;
 
   {
     base::AutoLock autolock(orientation_buffer_lock_);
     device_orientation_buffer_ = buffer;
   }
   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.
     SetOrientationBufferStatus(buffer, !success /* ready */,
         false /* absolute */);
     orientation_buffer_initialized_ = !success;
   }
 
   if (!success)
     UpdateDeviceOrientationHistogram(NOT_AVAILABLE);
 }
 
 void SensorManagerAndroid::StopFetchingDeviceOrientationData() {
-  if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    StopFetchingOrientationDataOnUI();
-    return;
-  }
-
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(&SensorManagerAndroid::StopFetchingOrientationDataOnUI,
-                 base::Unretained(this)));
-}
-
-void SensorManagerAndroid::StopFetchingOrientationDataOnUI() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (is_shutdown_)
     return;
 
   Stop(CONSUMER_TYPE_ORIENTATION);
   {
     base::AutoLock autolock(orientation_buffer_lock_);
     if (device_orientation_buffer_) {
       SetOrientationBufferStatus(device_orientation_buffer_, false, false);
       orientation_buffer_initialized_ = false;
       device_orientation_buffer_ = nullptr;
     }
   }
 }
 
 void SensorManagerAndroid::StartFetchingDeviceOrientationAbsoluteData(
     DeviceOrientationHardwareBuffer* buffer) {
-  if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    StartFetchingOrientationAbsoluteDataOnUI(buffer);
-  } else {
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE,
-        base::Bind(
-            &SensorManagerAndroid::StartFetchingOrientationAbsoluteDataOnUI,
-            base::Unretained(this),
-            buffer));
-  }
-}
-
-void SensorManagerAndroid::StopFetchingDeviceOrientationAbsoluteData() {
-  if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    StopFetchingOrientationAbsoluteDataOnUI();
-    return;
-  }
-
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(&SensorManagerAndroid::StopFetchingOrientationAbsoluteDataOnUI,
-                 base::Unretained(this)));
-}
-
-void SensorManagerAndroid::StartFetchingOrientationAbsoluteDataOnUI(
-    DeviceOrientationHardwareBuffer* buffer) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(buffer);
   if (is_shutdown_)
     return;
 
   {
     base::AutoLock autolock(orientation_absolute_buffer_lock_);
     device_orientation_absolute_buffer_ = buffer;
   }
   bool success = Start(CONSUMER_TYPE_ORIENTATION_ABSOLUTE);
 
   {
     base::AutoLock autolock(orientation_absolute_buffer_lock_);
     // If Start() was unsuccessful then set the buffer ready flag to true
     // to start firing all-null events.
     SetOrientationBufferStatus(buffer, !success /* ready */,
         false /* absolute */);
     orientation_absolute_buffer_initialized_ = !success;
   }
 }
 
-void SensorManagerAndroid::StopFetchingOrientationAbsoluteDataOnUI() {
+void SensorManagerAndroid::StopFetchingDeviceOrientationAbsoluteData() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (is_shutdown_)
     return;
 
   Stop(CONSUMER_TYPE_ORIENTATION_ABSOLUTE);
   {
     base::AutoLock autolock(orientation_absolute_buffer_lock_);
     if (device_orientation_absolute_buffer_) {
       SetOrientationBufferStatus(device_orientation_absolute_buffer_, false,
           false);
       orientation_absolute_buffer_initialized_ = false;
       device_orientation_absolute_buffer_ = nullptr;
     }
   }
 }
 
 void SensorManagerAndroid::Shutdown() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   is_shutdown_ = true;
 }
 
 }  // namespace content