Chromium Code Reviews| 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 26587e78041b937bafb14a5ea73d6ea06a00a580..be3432b28db431f54df53fb11083434bfa881a5a 100644 |
| --- a/content/renderer/device_sensors/device_orientation_event_pump.h |
| +++ b/content/renderer/device_sensors/device_orientation_event_pump.h |
| @@ -10,6 +10,7 @@ |
| #include "base/macros.h" |
| #include "content/renderer/device_sensors/device_sensor_event_pump.h" |
| #include "content/renderer/shared_memory_seqlock_reader.h" |
| +#include "device/sensors/public/interfaces/orientation.mojom.h" |
| #include "third_party/WebKit/public/platform/modules/device_orientation/WebDeviceOrientationData.h" |
| namespace blink { |
| @@ -21,36 +22,39 @@ namespace content { |
| typedef SharedMemorySeqLockReader<blink::WebDeviceOrientationData> |
| DeviceOrientationSharedMemoryReader; |
| -class CONTENT_EXPORT DeviceOrientationEventPump |
| +class CONTENT_EXPORT DeviceOrientationEventPumpBase |
|
timvolodine
2016/06/09 17:43:47
do we still need to CONTENT_EXPORT this?
Sam McNally
2016/06/10 01:07:51
Yes, the unit test still needs this.
|
| : public DeviceSensorEventPump<blink::WebDeviceOrientationListener> { |
| public: |
| // Angle threshold beyond which two orientation events are considered |
| // sufficiently different. |
| static const double kOrientationThreshold; |
| - explicit DeviceOrientationEventPump(RenderThread* thread); |
| - ~DeviceOrientationEventPump() override; |
| + explicit DeviceOrientationEventPumpBase(RenderThread* thread); |
| + ~DeviceOrientationEventPumpBase() 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_; |
| std::unique_ptr<DeviceOrientationSharedMemoryReader> reader_; |
| - DISALLOW_COPY_AND_ASSIGN(DeviceOrientationEventPump); |
| + DISALLOW_COPY_AND_ASSIGN(DeviceOrientationEventPumpBase); |
| }; |
| +using DeviceOrientationEventPump = |
| + DeviceMojoClientMixin<DeviceOrientationEventPumpBase, |
| + device::mojom::OrientationSensor>; |
| + |
| +using DeviceOrientationAbsoluteEventPump = |
| + DeviceMojoClientMixin<DeviceOrientationEventPumpBase, |
| + device::mojom::OrientationAbsoluteSensor>; |
| + |
| } // namespace content |
| #endif // CONTENT_RENDERER_DEVICE_SENSORS_DEVICE_ORIENTATION_EVENT_PUMP_H_ |