| Index: content/renderer/device_sensors/device_orientation_event_pump.h
|
| diff --git a/content/renderer/device_sensors/device_orientation_event_pump.h b/content/renderer/device_sensors/device_orientation_event_pump.h
|
| index 8f0ce5ef55d81ae7cc3fdd98498cbcecfe4d7d50..7c5da9815fe095133d58851305403ce088905006 100644
|
| --- a/content/renderer/device_sensors/device_orientation_event_pump.h
|
| +++ b/content/renderer/device_sensors/device_orientation_event_pump.h
|
| @@ -6,8 +6,9 @@
|
| #define CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_ORIENTATION_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/WebDeviceOrientationData.h"
|
|
|
| namespace blink {
|
| @@ -16,35 +17,31 @@ class WebDeviceOrientationListener;
|
|
|
| namespace content {
|
|
|
| -typedef SharedMemorySeqLockReader<blink::WebDeviceOrientationData>
|
| - DeviceOrientationSharedMemoryReader;
|
| +typedef shared_memory_seqlock::SharedMemorySeqLockReader<
|
| + blink::WebDeviceOrientationData> DeviceOrientationSharedMemoryReader;
|
|
|
| -class CONTENT_EXPORT DeviceOrientationEventPump
|
| - : public DeviceSensorEventPump<blink::WebDeviceOrientationListener> {
|
| +class CONTENT_EXPORT DeviceOrientationEventPump : public DeviceSensorEventPump {
|
| public:
|
| // Angle threshold beyond which two orientation events are considered
|
| // sufficiently different.
|
| static const double kOrientationThreshold;
|
|
|
| - explicit DeviceOrientationEventPump(RenderThread* thread);
|
| + explicit DeviceOrientationEventPump(
|
| + blink::WebDeviceOrientationListener* listener);
|
| ~DeviceOrientationEventPump() override;
|
|
|
| - // PlatformEventObserver.
|
| - bool OnControlMessageReceived(const IPC::Message& message) override;
|
| void SendFakeDataForTesting(void* data) override;
|
|
|
| protected:
|
| void FireEvent() override;
|
| bool InitializeReader(base::SharedMemoryHandle handle) override;
|
|
|
| - // PlatformEventObserver.
|
| - void SendStartMessage() override;
|
| - void SendStopMessage() override;
|
| -
|
| bool ShouldFireEvent(const blink::WebDeviceOrientationData& data) const;
|
|
|
| blink::WebDeviceOrientationData data_;
|
| scoped_ptr<DeviceOrientationSharedMemoryReader> reader_;
|
| + blink::WebDeviceOrientationListener* listener_;
|
| + device::DeviceSensorsOrientationPtr service_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DeviceOrientationEventPump);
|
| };
|
|
|