Commit d771a782 authored by jonross's avatar jonross Committed by Commit bot

Test DeviceMotionEventPump to ensure events deliver at 60Hz

Add a unit test for DeviceMotionEventPump to ensure that events are not delivered to Blink at a rate faster than 60 Hz.

TEST=DeviceMotionEventPumpTest.PumpThrottlesEventRate
BUG=421691

Review URL: https://codereview.chromium.org/870053009

Cr-Commit-Position: refs/heads/master@{#314574}
parent 029b5ce9
...@@ -16,7 +16,8 @@ namespace content { ...@@ -16,7 +16,8 @@ namespace content {
class MockDeviceMotionListener : public blink::WebDeviceMotionListener { class MockDeviceMotionListener : public blink::WebDeviceMotionListener {
public: public:
MockDeviceMotionListener() : did_change_device_motion_(false) { MockDeviceMotionListener()
: did_change_device_motion_(false), number_of_events_(0) {
memset(&data_, 0, sizeof(data_)); memset(&data_, 0, sizeof(data_));
} }
virtual ~MockDeviceMotionListener() { } virtual ~MockDeviceMotionListener() { }
...@@ -25,17 +26,22 @@ class MockDeviceMotionListener : public blink::WebDeviceMotionListener { ...@@ -25,17 +26,22 @@ class MockDeviceMotionListener : public blink::WebDeviceMotionListener {
const blink::WebDeviceMotionData& data) override { const blink::WebDeviceMotionData& data) override {
memcpy(&data_, &data, sizeof(data)); memcpy(&data_, &data, sizeof(data));
did_change_device_motion_ = true; did_change_device_motion_ = true;
++number_of_events_;
} }
bool did_change_device_motion() const { bool did_change_device_motion() const {
return did_change_device_motion_; return did_change_device_motion_;
} }
int number_of_events() const { return number_of_events_; }
const blink::WebDeviceMotionData& data() const { const blink::WebDeviceMotionData& data() const {
return data_; return data_;
} }
private: private:
bool did_change_device_motion_; bool did_change_device_motion_;
int number_of_events_;
blink::WebDeviceMotionData data_; blink::WebDeviceMotionData data_;
DISALLOW_COPY_AND_ASSIGN(MockDeviceMotionListener); DISALLOW_COPY_AND_ASSIGN(MockDeviceMotionListener);
...@@ -44,9 +50,17 @@ class MockDeviceMotionListener : public blink::WebDeviceMotionListener { ...@@ -44,9 +50,17 @@ class MockDeviceMotionListener : public blink::WebDeviceMotionListener {
class DeviceMotionEventPumpForTesting : public DeviceMotionEventPump { class DeviceMotionEventPumpForTesting : public DeviceMotionEventPump {
public: public:
DeviceMotionEventPumpForTesting() DeviceMotionEventPumpForTesting()
: DeviceMotionEventPump(0) { } : DeviceMotionEventPump(0), stop_on_fire_event_(true) {}
~DeviceMotionEventPumpForTesting() override {} ~DeviceMotionEventPumpForTesting() override {}
void set_stop_on_fire_event(bool stop_on_fire_event) {
stop_on_fire_event_ = stop_on_fire_event;
}
bool stop_on_fire_event() { return stop_on_fire_event_; }
int pump_delay_microseconds() const { return pump_delay_microseconds_; }
void OnDidStart(base::SharedMemoryHandle renderer_handle) { void OnDidStart(base::SharedMemoryHandle renderer_handle) {
DeviceMotionEventPump::OnDidStart(renderer_handle); DeviceMotionEventPump::OnDidStart(renderer_handle);
} }
...@@ -54,11 +68,15 @@ class DeviceMotionEventPumpForTesting : public DeviceMotionEventPump { ...@@ -54,11 +68,15 @@ class DeviceMotionEventPumpForTesting : public DeviceMotionEventPump {
void SendStopMessage() override {} void SendStopMessage() override {}
void FireEvent() override { void FireEvent() override {
DeviceMotionEventPump::FireEvent(); DeviceMotionEventPump::FireEvent();
Stop(); if (stop_on_fire_event_) {
base::MessageLoop::current()->QuitWhenIdle(); Stop();
base::MessageLoop::current()->QuitWhenIdle();
}
} }
private: private:
bool stop_on_fire_event_;
DISALLOW_COPY_AND_ASSIGN(DeviceMotionEventPumpForTesting); DISALLOW_COPY_AND_ASSIGN(DeviceMotionEventPumpForTesting);
}; };
...@@ -158,4 +176,31 @@ TEST_F(DeviceMotionEventPumpTest, DidStartPollingNotAllSensorsActive) { ...@@ -158,4 +176,31 @@ TEST_F(DeviceMotionEventPumpTest, DidStartPollingNotAllSensorsActive) {
EXPECT_FALSE(received_data.hasRotationRateGamma); EXPECT_FALSE(received_data.hasRotationRateGamma);
} }
// Confirm that the frequency of pumping events is not greater than 60Hz. A rate
// above 60Hz would allow for the detection of keystrokes (crbug.com/421691)
TEST_F(DeviceMotionEventPumpTest, PumpThrottlesEventRate) {
// Confirm that the delay for pumping events is 60 Hz.
EXPECT_GE(60, base::Time::kMicrosecondsPerSecond /
motion_pump()->pump_delay_microseconds());
base::MessageLoopForUI loop;
InitBuffer(true);
motion_pump()->set_stop_on_fire_event(false);
motion_pump()->Start(listener());
motion_pump()->OnDidStart(handle());
base::MessageLoop::current()->PostDelayedTask(
FROM_HERE, base::MessageLoop::QuitClosure(),
base::TimeDelta::FromMilliseconds(100));
base::MessageLoop::current()->Run();
motion_pump()->Stop();
// Check that the blink::WebDeviceMotionListener does not receive excess
// events.
EXPECT_TRUE(listener()->did_change_device_motion());
EXPECT_GE(6, listener()->number_of_events());
}
} // namespace content } // namespace content
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment