Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / renderer / device_sensors / device_sensor_event_pump.h

diff --git a/src/content/renderer/device_sensors/device_sensor_event_pump.h b/src/content/renderer/device_sensors/device_sensor_event_pump.h
index f369928..43e0f64 100644 (file)
--- a/src/content/renderer/device_sensors/device_sensor_event_pump.h
+++ b/src/content/renderer/device_sensors/device_sensor_event_pump.h
@@ -6,6 +6,7 @@
 #define CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_SENSOR_EVENT_PUMP_H_
 
 #include "base/memory/shared_memory.h"
+#include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "content/public/renderer/platform_event_observer.h"
 
@@ -15,11 +16,13 @@ template <typename ListenerType>
 class CONTENT_EXPORT DeviceSensorEventPump
     : NON_EXPORTED_BASE(public PlatformEventObserver<ListenerType>) {
  public:
-  // Default delay between subsequent firing of events.
-  static const int kDefaultPumpDelayMillis = 50;
+  // Default rate for firing events.
+  static const int kDefaultPumpFrequencyHz = 60;
+  static const int kDefaultPumpDelayMicroseconds =
+      base::Time::kMicrosecondsPerSecond / kDefaultPumpFrequencyHz;
 
   // PlatformEventObserver
-  virtual void Start(blink::WebPlatformEventListener* listener) OVERRIDE {
+  virtual void Start(blink::WebPlatformEventListener* listener) override {
     DVLOG(2) << "requested start";
 
     if (state_ != STOPPED)
@@ -31,7 +34,7 @@ class CONTENT_EXPORT DeviceSensorEventPump
     state_ = PENDING_START;
   }
 
-  virtual void Stop() OVERRIDE {
+  virtual void Stop() override {
     DVLOG(2) << "stop";
 
     if (state_ == STOPPED)
@@ -49,11 +52,11 @@ class CONTENT_EXPORT DeviceSensorEventPump
  protected:
   explicit DeviceSensorEventPump(RenderThread* thread)
       : PlatformEventObserver<ListenerType>(thread),
-        pump_delay_millis_(kDefaultPumpDelayMillis),
-        state_(STOPPED) {
-  }
+        pump_delay_microseconds_(kDefaultPumpDelayMicroseconds),
+        state_(STOPPED) {}
 
   virtual ~DeviceSensorEventPump() {
+    PlatformEventObserver<ListenerType>::StopIfObserving();
   }
 
   // The pump is a tri-state automaton with allowed transitions as follows:
@@ -77,8 +80,9 @@ class CONTENT_EXPORT DeviceSensorEventPump
 
     if (InitializeReader(handle)) {
       timer_.Start(FROM_HERE,
-                   base::TimeDelta::FromMilliseconds(pump_delay_millis_),
-                   this, &DeviceSensorEventPump::FireEvent);
+                   base::TimeDelta::FromMicroseconds(pump_delay_microseconds_),
+                   this,
+                   &DeviceSensorEventPump::FireEvent);
       state_ = RUNNING;
     }
   }
@@ -86,7 +90,7 @@ class CONTENT_EXPORT DeviceSensorEventPump
   virtual void FireEvent() = 0;
   virtual bool InitializeReader(base::SharedMemoryHandle handle) = 0;
 
-  int pump_delay_millis_;
+  int pump_delay_microseconds_;
   PumpState state_;
   base::RepeatingTimer<DeviceSensorEventPump> timer_;