| Index: content/browser/renderer_host/input/web_input_event_util_unittest.cc
|
| diff --git a/content/browser/renderer_host/input/web_input_event_util_unittest.cc b/content/browser/renderer_host/input/web_input_event_util_unittest.cc
|
| index 2587863d42801bfad960de6e4423b5811b6cee57..6202029385a4c8bf87571c51d4b2d87bb4307373 100644
|
| --- a/content/browser/renderer_host/input/web_input_event_util_unittest.cc
|
| +++ b/content/browser/renderer_host/input/web_input_event_util_unittest.cc
|
| @@ -103,4 +103,30 @@ TEST(WebInputEventUtilTest, ScrollUpdateConversion) {
|
| EXPECT_TRUE(web_event.data.scrollUpdate.previousUpdateInSequencePrevented);
|
| }
|
|
|
| +TEST(WebInputEventUtilTest, RadiusOfZeroUsesOtherAxis) {
|
| + const float nonZeroMajorAxisLength = 36;
|
| + const float nonZeroMinorAxisLength = 80;
|
| +
|
| + // Test zeroed minor axis.
|
| + ui::PointerProperties pointer(5, 10, 40);
|
| + pointer.touch_major = nonZeroMajorAxisLength;
|
| + pointer.touch_minor = 0;
|
| + MotionEventGeneric event(
|
| + MotionEvent::ACTION_DOWN, base::TimeTicks::Now(), pointer);
|
| +
|
| + WebTouchEvent actual_event = CreateWebTouchEventFromMotionEvent(event, false);
|
| + EXPECT_EQ(nonZeroMajorAxisLength / 2, actual_event.touches[0].radiusX);
|
| + EXPECT_EQ(nonZeroMajorAxisLength / 2, actual_event.touches[0].radiusY);
|
| +
|
| + // Test zeroed major axis.
|
| + pointer.touch_major = 0;
|
| + pointer.touch_minor = nonZeroMinorAxisLength;
|
| + MotionEventGeneric event2(MotionEvent::ACTION_DOWN, base::TimeTicks::Now(),
|
| + pointer);
|
| + actual_event = CreateWebTouchEventFromMotionEvent(event2, false);
|
| +
|
| + EXPECT_EQ(nonZeroMinorAxisLength / 2, actual_event.touches[0].radiusX);
|
| + EXPECT_EQ(nonZeroMinorAxisLength / 2, actual_event.touches[0].radiusY);
|
| +}
|
| +
|
| } // namespace content
|
|
|