| Index: content/renderer/device_sensors/device_motion_event_pump.h
|
| diff --git a/content/renderer/device_sensors/device_motion_event_pump.h b/content/renderer/device_sensors/device_motion_event_pump.h
|
| index 61b046d2f6d0c01196f8aa0188433ce783a922f9..1eabc74eb4c190b8f0e58b2d74aa002a286ecdf8 100644
|
| --- a/content/renderer/device_sensors/device_motion_event_pump.h
|
| +++ b/content/renderer/device_sensors/device_motion_event_pump.h
|
| @@ -6,8 +6,9 @@
|
| #define CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_MOTION_EVENT_PUMP_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "components/shared_memory_seqlock/shared_memory_seqlock_reader.h"
|
| #include "content/renderer/device_sensors/device_sensor_event_pump.h"
|
| -#include "content/renderer/shared_memory_seqlock_reader.h"
|
| +#include "device/device_sensors/device_sensors.mojom.h"
|
| #include "third_party/WebKit/public/platform/modules/device_orientation/WebDeviceMotionData.h"
|
|
|
| namespace blink {
|
| @@ -16,28 +17,23 @@ class WebDeviceMotionListener;
|
|
|
| namespace content {
|
|
|
| -typedef SharedMemorySeqLockReader<blink::WebDeviceMotionData>
|
| - DeviceMotionSharedMemoryReader;
|
| +typedef shared_memory_seqlock::SharedMemorySeqLockReader<
|
| + blink::WebDeviceMotionData> DeviceMotionSharedMemoryReader;
|
|
|
| -class CONTENT_EXPORT DeviceMotionEventPump
|
| - : public DeviceSensorEventPump<blink::WebDeviceMotionListener> {
|
| +class CONTENT_EXPORT DeviceMotionEventPump : public DeviceSensorEventPump {
|
| public:
|
| - explicit DeviceMotionEventPump(RenderThread* thread);
|
| + explicit DeviceMotionEventPump(blink::WebDeviceMotionListener* listener);
|
| ~DeviceMotionEventPump() override;
|
|
|
| - // // PlatformEventObserver.
|
| - bool OnControlMessageReceived(const IPC::Message& message) override;
|
| void SendFakeDataForTesting(void* fake_data) override;
|
|
|
| protected:
|
| void FireEvent() override;
|
| bool InitializeReader(base::SharedMemoryHandle handle) override;
|
|
|
| - // PlatformEventObserver.
|
| - void SendStartMessage() override;
|
| - void SendStopMessage() override;
|
| -
|
| scoped_ptr<DeviceMotionSharedMemoryReader> reader_;
|
| + blink::WebDeviceMotionListener* listener_;
|
| + device::DeviceSensorsMotionPtr service_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DeviceMotionEventPump);
|
| };
|
|
|