Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / renderer / device_sensors / device_motion_event_pump.cc

diff --git a/src/content/renderer/device_sensors/device_motion_event_pump.cc b/src/content/renderer/device_sensors/device_motion_event_pump.cc
index 0143d19..aca6df5 100644 (file)
--- a/src/content/renderer/device_sensors/device_motion_event_pump.cc
+++ b/src/content/renderer/device_sensors/device_motion_event_pump.cc
@@ -10,23 +10,13 @@
 
 namespace content {
 
-DeviceMotionEventPump::DeviceMotionEventPump()
-    : DeviceSensorEventPump(), listener_(0) {
-}
-
-DeviceMotionEventPump::DeviceMotionEventPump(int pump_delay_millis)
-    : DeviceSensorEventPump(pump_delay_millis), listener_(0) {
+DeviceMotionEventPump::DeviceMotionEventPump(RenderThread* thread)
+    : DeviceSensorEventPump<blink::WebDeviceMotionListener>(thread) {
 }
 
 DeviceMotionEventPump::~DeviceMotionEventPump() {
 }
 
-bool DeviceMotionEventPump::SetListener(
-    blink::WebDeviceMotionListener* listener) {
-  listener_ = listener;
-  return listener_ ? RequestStart() : Stop();
-}
-
 bool DeviceMotionEventPump::OnControlMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
@@ -38,10 +28,10 @@ bool DeviceMotionEventPump::OnControlMessageReceived(
 }
 
 void DeviceMotionEventPump::FireEvent() {
-  DCHECK(listener_);
+  DCHECK(listener());
   blink::WebDeviceMotionData data;
   if (reader_->GetLatestData(&data) && data.allAvailableSensorsAreActive)
-    listener_->didChangeDeviceMotion(data);
+    listener()->didChangeDeviceMotion(data);
 }
 
 bool DeviceMotionEventPump::InitializeReader(base::SharedMemoryHandle handle) {
@@ -50,13 +40,19 @@ bool DeviceMotionEventPump::InitializeReader(base::SharedMemoryHandle handle) {
   return reader_->Initialize(handle);
 }
 
-bool DeviceMotionEventPump::SendStartMessage() {
-  return RenderThread::Get()->Send(new DeviceMotionHostMsg_StartPolling());
+void DeviceMotionEventPump::SendStartMessage() {
+  RenderThread::Get()->Send(new DeviceMotionHostMsg_StartPolling());
+}
+
+void DeviceMotionEventPump::SendStopMessage() {
+  RenderThread::Get()->Send(new DeviceMotionHostMsg_StopPolling());
 }
 
+void DeviceMotionEventPump::SendFakeDataForTesting(void* fake_data) {
+  blink::WebDeviceMotionData data =
+      *static_cast<blink::WebDeviceMotionData*>(fake_data);
 
-bool DeviceMotionEventPump::SendStopMessage() {
-  return RenderThread::Get()->Send(new DeviceMotionHostMsg_StopPolling());
+  listener()->didChangeDeviceMotion(data);
 }
 
 }  // namespace content