Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / browser / device_sensors / device_inertial_sensor_service.cc

diff --git a/src/content/browser/device_sensors/device_inertial_sensor_service.cc b/src/content/browser/device_sensors/device_inertial_sensor_service.cc
index cf96820..840ce25 100644 (file)
--- a/src/content/browser/device_sensors/device_inertial_sensor_service.cc
+++ b/src/content/browser/device_sensors/device_inertial_sensor_service.cc
@@ -12,7 +12,8 @@
 namespace content {
 
 DeviceInertialSensorService::DeviceInertialSensorService()
-    : num_motion_readers_(0),
+    : num_light_readers_(0),
+      num_motion_readers_(0),
       num_orientation_readers_(0),
       is_shutdown_(false) {
 }
@@ -59,6 +60,10 @@ bool DeviceInertialSensorService::ChangeNumberConsumers(
       num_orientation_readers_ += delta;
       DCHECK_GE(num_orientation_readers_ , 0);
       return true;
+    case CONSUMER_TYPE_LIGHT:
+      num_light_readers_ += delta;
+      DCHECK_GE(num_light_readers_, 0);
+      return true;
     default:
       NOTREACHED();
   }
@@ -72,6 +77,8 @@ int DeviceInertialSensorService::GetNumberConsumers(
       return num_motion_readers_;
     case CONSUMER_TYPE_ORIENTATION:
       return num_orientation_readers_;
+    case CONSUMER_TYPE_LIGHT:
+      return num_light_readers_;
     default:
       NOTREACHED();
   }
@@ -86,12 +93,17 @@ DeviceInertialSensorService::GetSharedMemoryHandleForProcess(
 }
 
 void DeviceInertialSensorService::Shutdown() {
-  data_fetcher_.reset();
+  if (data_fetcher_) {
+    data_fetcher_->StopFetchingAllDeviceData();
+    data_fetcher_.reset();
+  }
   is_shutdown_ = true;
 }
 
 void DeviceInertialSensorService::SetDataFetcherForTesting(
     DataFetcherSharedMemory* test_data_fetcher) {
+  if (data_fetcher_)
+    data_fetcher_->StopFetchingAllDeviceData();
   data_fetcher_.reset(test_data_fetcher);
 }