Collapse the API surface on WebInputEvent via accessor functions.

content/renderer/input/main_thread_event_queue_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include <new>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/test/histogram_tester.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/test/test_simple_task_runner.h"
 #include "build/build_config.h"
 #include "content/common/input/synthetic_web_input_event_builders.h"
 #include "content/renderer/input/main_thread_event_queue.h"
 #include "content/renderer/render_thread_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/scheduler/test/mock_renderer_scheduler.h"
 
 using blink::WebInputEvent;
 using blink::WebMouseEvent;
 using blink::WebMouseWheelEvent;
 using blink::WebTouchEvent;
 
 namespace blink {
 bool operator==(const WebMouseWheelEvent& lhs, const WebMouseWheelEvent& rhs) {
-  return memcmp(&lhs, &rhs, lhs.size) == 0;
+  return memcmp(&lhs, &rhs, lhs.size()) == 0;
 }
 
 bool operator==(const WebTouchEvent& lhs, const WebTouchEvent& rhs) {
-  return memcmp(&lhs, &rhs, lhs.size) == 0;
+  return memcmp(&lhs, &rhs, lhs.size()) == 0;
 }
 }  // namespace blink
 
 namespace content {
 namespace {
 
 const unsigned kRafAlignedEnabledTouch = 1;
 const unsigned kRafAlignedEnabledMouse = 1 << 1;
 
 const int kTestRoutingID = 13;
@@ skipping 23 matching lines @@
     queue_ = new MainThreadEventQueue(kTestRoutingID, this, main_task_runner_,
                                       &renderer_scheduler_);
   }
 
   void HandleEventOnMainThread(int routing_id,
                                const blink::WebInputEvent* event,
                                const ui::LatencyInfo& latency,
                                InputEventDispatchType type) override {
     EXPECT_EQ(kTestRoutingID, routing_id);
     handled_events_.push_back(ui::WebInputEventTraits::Clone(*event));
-    queue_->EventHandled(event->type, INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
+    queue_->EventHandled(event->type(), INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
   }
 
   void SendInputEventAck(int routing_id,
                          blink::WebInputEvent::Type type,
                          InputEventAckState ack_result,
                          uint32_t touch_event_id) override {
     additional_acked_events_.push_back(touch_event_id);
   }
 
   bool HandleEvent(WebInputEvent& event, InputEventAckState ack_result) {
@@ skipping 60 matching lines @@
 
   EXPECT_EQ(2u, event_queue().size());
   EXPECT_EQ((raf_aligned_input_setting_ & kRafAlignedEnabledMouse) == 0,
             main_task_runner_->HasPendingTask());
   RunPendingTasksWithSimulatedRaf();
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
   EXPECT_EQ(0u, event_queue().size());
   EXPECT_EQ(2u, handled_events_.size());
 
   {
-    EXPECT_EQ(kEvents[0].size, handled_events_.at(0)->size);
-    EXPECT_EQ(kEvents[0].type, handled_events_.at(0)->type);
+    EXPECT_EQ(kEvents[0].size(), handled_events_.at(0)->size());
+    EXPECT_EQ(kEvents[0].type(), handled_events_.at(0)->type());
     const WebMouseWheelEvent* last_wheel_event =
         static_cast<const WebMouseWheelEvent*>(handled_events_.at(0).get());
     EXPECT_EQ(WebInputEvent::DispatchType::ListenersNonBlockingPassive,
               last_wheel_event->dispatchType);
     WebMouseWheelEvent coalesced_event = kEvents[0];
     ui::Coalesce(kEvents[1], &coalesced_event);
     coalesced_event.dispatchType =
         WebInputEvent::DispatchType::ListenersNonBlockingPassive;
     EXPECT_EQ(coalesced_event, *last_wheel_event);
   }
@@ skipping 26 matching lines @@
   for (SyntheticWebTouchEvent& event : kEvents)
     HandleEvent(event, INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING);
 
   EXPECT_EQ(3u, event_queue().size());
   EXPECT_TRUE(main_task_runner_->HasPendingTask());
   RunPendingTasksWithSimulatedRaf();
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
   EXPECT_EQ(0u, event_queue().size());
   EXPECT_EQ(3u, handled_events_.size());
 
-  EXPECT_EQ(kEvents[0].size, handled_events_.at(0)->size);
-  EXPECT_EQ(kEvents[0].type, handled_events_.at(0)->type);
+  EXPECT_EQ(kEvents[0].size(), handled_events_.at(0)->size());
+  EXPECT_EQ(kEvents[0].type(), handled_events_.at(0)->type());
   const WebTouchEvent* last_touch_event =
       static_cast<const WebTouchEvent*>(handled_events_.at(0).get());
   kEvents[0].dispatchType =
       WebInputEvent::DispatchType::ListenersNonBlockingPassive;
   EXPECT_EQ(kEvents[0], *last_touch_event);
 
-  EXPECT_EQ(kEvents[1].size, handled_events_.at(1)->size);
-  EXPECT_EQ(kEvents[1].type, handled_events_.at(1)->type);
+  EXPECT_EQ(kEvents[1].size(), handled_events_.at(1)->size());
+  EXPECT_EQ(kEvents[1].type(), handled_events_.at(1)->type());
   last_touch_event =
       static_cast<const WebTouchEvent*>(handled_events_.at(1).get());
   kEvents[1].dispatchType =
       WebInputEvent::DispatchType::ListenersNonBlockingPassive;
   EXPECT_EQ(kEvents[1], *last_touch_event);
 
-  EXPECT_EQ(kEvents[2].size, handled_events_.at(1)->size);
-  EXPECT_EQ(kEvents[2].type, handled_events_.at(2)->type);
+  EXPECT_EQ(kEvents[2].size(), handled_events_.at(1)->size());
+  EXPECT_EQ(kEvents[2].type(), handled_events_.at(2)->type());
   last_touch_event =
       static_cast<const WebTouchEvent*>(handled_events_.at(2).get());
   WebTouchEvent coalesced_event = kEvents[2];
   ui::Coalesce(kEvents[3], &coalesced_event);
   coalesced_event.dispatchType =
       WebInputEvent::DispatchType::ListenersNonBlockingPassive;
   EXPECT_EQ(coalesced_event, *last_touch_event);
   histogram_tester.ExpectBucketCount(kCoalescedCountHistogram, 0, 1);
   histogram_tester.ExpectBucketCount(kCoalescedCountHistogram, 1, 1);
 }
@@ skipping 55 matching lines @@
 
   EXPECT_EQ(2u, event_queue().size());
   EXPECT_EQ(raf_aligned_input_setting_ !=
                 (kRafAlignedEnabledMouse | kRafAlignedEnabledTouch),
             main_task_runner_->HasPendingTask());
   RunPendingTasksWithSimulatedRaf();
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
   EXPECT_EQ(0u, event_queue().size());
   EXPECT_EQ(2u, handled_events_.size());
   {
-    EXPECT_EQ(kWheelEvents[0].size, handled_events_.at(0)->size);
-    EXPECT_EQ(kWheelEvents[0].type, handled_events_.at(0)->type);
+    EXPECT_EQ(kWheelEvents[0].size(), handled_events_.at(0)->size());
+    EXPECT_EQ(kWheelEvents[0].type(), handled_events_.at(0)->type());
     const WebMouseWheelEvent* last_wheel_event =
         static_cast<const WebMouseWheelEvent*>(handled_events_.at(0).get());
     EXPECT_EQ(WebInputEvent::DispatchType::ListenersNonBlockingPassive,
               last_wheel_event->dispatchType);
     WebMouseWheelEvent coalesced_event = kWheelEvents[0];
     ui::Coalesce(kWheelEvents[1], &coalesced_event);
     coalesced_event.dispatchType =
         WebInputEvent::DispatchType::ListenersNonBlockingPassive;
     EXPECT_EQ(coalesced_event, *last_wheel_event);
   }
   {
-    EXPECT_EQ(kTouchEvents[0].size, handled_events_.at(1)->size);
-    EXPECT_EQ(kTouchEvents[0].type, handled_events_.at(1)->type);
+    EXPECT_EQ(kTouchEvents[0].size(), handled_events_.at(1)->size());
+    EXPECT_EQ(kTouchEvents[0].type(), handled_events_.at(1)->type());
     const WebTouchEvent* last_touch_event =
         static_cast<const WebTouchEvent*>(handled_events_.at(1).get());
     WebTouchEvent coalesced_event = kTouchEvents[0];
     ui::Coalesce(kTouchEvents[1], &coalesced_event);
     coalesced_event.dispatchType =
         WebInputEvent::DispatchType::ListenersNonBlockingPassive;
     EXPECT_EQ(coalesced_event, *last_touch_event);
   }
 }
 
@@ skipping 171 matching lines @@
   kEvents.PressPoint(10, 10);
   kEvents.touchStartOrFirstTouchMove = true;
   set_enable_fling_passive_listener_flag(true);
 
   EXPECT_FALSE(last_touch_start_forced_nonblocking_due_to_fling());
   HandleEvent(kEvents, INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING_DUE_TO_FLING);
   RunPendingTasksWithSimulatedRaf();
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
   EXPECT_EQ(0u, event_queue().size());
   EXPECT_EQ(1u, handled_events_.size());
-  EXPECT_EQ(kEvents.size, handled_events_.at(0)->size);
-  EXPECT_EQ(kEvents.type, handled_events_.at(0)->type);
+  EXPECT_EQ(kEvents.size(), handled_events_.at(0)->size());
+  EXPECT_EQ(kEvents.type(), handled_events_.at(0)->type());
   EXPECT_TRUE(last_touch_start_forced_nonblocking_due_to_fling());
   const WebTouchEvent* last_touch_event =
       static_cast<const WebTouchEvent*>(handled_events_.at(0).get());
   kEvents.dispatchType = WebInputEvent::ListenersForcedNonBlockingDueToFling;
   EXPECT_EQ(kEvents, *last_touch_event);
 
   kEvents.MovePoint(0, 30, 30);
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
   HandleEvent(kEvents, INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING_DUE_TO_FLING);
   EXPECT_EQ((raf_aligned_input_setting_ & kRafAlignedEnabledTouch) == 0,
             main_task_runner_->HasPendingTask());
   RunPendingTasksWithSimulatedRaf();
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
   EXPECT_EQ(0u, event_queue().size());
   EXPECT_EQ(2u, handled_events_.size());
-  EXPECT_EQ(kEvents.size, handled_events_.at(1)->size);
-  EXPECT_EQ(kEvents.type, handled_events_.at(1)->type);
+  EXPECT_EQ(kEvents.size(), handled_events_.at(1)->size());
+  EXPECT_EQ(kEvents.type(), handled_events_.at(1)->type());
   EXPECT_TRUE(last_touch_start_forced_nonblocking_due_to_fling());
   last_touch_event =
       static_cast<const WebTouchEvent*>(handled_events_.at(1).get());
   kEvents.dispatchType = WebInputEvent::ListenersForcedNonBlockingDueToFling;
   EXPECT_EQ(kEvents, *last_touch_event);
 
   kEvents.MovePoint(0, 50, 50);
   kEvents.touchStartOrFirstTouchMove = false;
   HandleEvent(kEvents, INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING_DUE_TO_FLING);
   RunPendingTasksWithSimulatedRaf();
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
   EXPECT_EQ(0u, event_queue().size());
   EXPECT_EQ(3u, handled_events_.size());
-  EXPECT_EQ(kEvents.size, handled_events_.at(2)->size);
-  EXPECT_EQ(kEvents.type, handled_events_.at(2)->type);
+  EXPECT_EQ(kEvents.size(), handled_events_.at(2)->size());
+  EXPECT_EQ(kEvents.type(), handled_events_.at(2)->type());
   EXPECT_EQ(kEvents.dispatchType, WebInputEvent::Blocking);
   last_touch_event =
       static_cast<const WebTouchEvent*>(handled_events_.at(2).get());
   EXPECT_EQ(kEvents, *last_touch_event);
 
   kEvents.ReleasePoint(0);
   HandleEvent(kEvents, INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING_DUE_TO_FLING);
   RunPendingTasksWithSimulatedRaf();
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
   EXPECT_EQ(0u, event_queue().size());
   EXPECT_EQ(4u, handled_events_.size());
-  EXPECT_EQ(kEvents.size, handled_events_.at(3)->size);
-  EXPECT_EQ(kEvents.type, handled_events_.at(3)->type);
+  EXPECT_EQ(kEvents.size(), handled_events_.at(3)->size());
+  EXPECT_EQ(kEvents.type(), handled_events_.at(3)->type());
   EXPECT_EQ(kEvents.dispatchType, WebInputEvent::Blocking);
   last_touch_event =
       static_cast<const WebTouchEvent*>(handled_events_.at(3).get());
   EXPECT_EQ(kEvents, *last_touch_event);
 }
 
 TEST_P(MainThreadEventQueueTest, BlockingTouchesOutsideFling) {
   SyntheticWebTouchEvent kEvents;
   kEvents.PressPoint(10, 10);
   kEvents.touchStartOrFirstTouchMove = true;
   set_enable_fling_passive_listener_flag(false);
 
   HandleEvent(kEvents, INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
   RunPendingTasksWithSimulatedRaf();
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
   EXPECT_EQ(0u, event_queue().size());
   EXPECT_EQ(1u, handled_events_.size());
-  EXPECT_EQ(kEvents.size, handled_events_.at(0)->size);
-  EXPECT_EQ(kEvents.type, handled_events_.at(0)->type);
+  EXPECT_EQ(kEvents.size(), handled_events_.at(0)->size());
+  EXPECT_EQ(kEvents.type(), handled_events_.at(0)->type());
   EXPECT_EQ(kEvents.dispatchType, WebInputEvent::Blocking);
   EXPECT_FALSE(last_touch_start_forced_nonblocking_due_to_fling());
   const WebTouchEvent* last_touch_event =
       static_cast<const WebTouchEvent*>(handled_events_.at(0).get());
   EXPECT_EQ(kEvents, *last_touch_event);
 
   set_enable_fling_passive_listener_flag(false);
   HandleEvent(kEvents, INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
   RunPendingTasksWithSimulatedRaf();
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
   EXPECT_EQ(0u, event_queue().size());
   EXPECT_EQ(2u, handled_events_.size());
-  EXPECT_EQ(kEvents.size, handled_events_.at(1)->size);
-  EXPECT_EQ(kEvents.type, handled_events_.at(1)->type);
+  EXPECT_EQ(kEvents.size(), handled_events_.at(1)->size());
+  EXPECT_EQ(kEvents.type(), handled_events_.at(1)->type());
   EXPECT_EQ(kEvents.dispatchType, WebInputEvent::Blocking);
   EXPECT_FALSE(last_touch_start_forced_nonblocking_due_to_fling());
   last_touch_event =
       static_cast<const WebTouchEvent*>(handled_events_.at(1).get());
   EXPECT_EQ(kEvents, *last_touch_event);
 
   set_enable_fling_passive_listener_flag(true);
   HandleEvent(kEvents, INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
   RunPendingTasksWithSimulatedRaf();
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
   EXPECT_EQ(0u, event_queue().size());
   EXPECT_EQ(3u, handled_events_.size());
-  EXPECT_EQ(kEvents.size, handled_events_.at(2)->size);
-  EXPECT_EQ(kEvents.type, handled_events_.at(2)->type);
+  EXPECT_EQ(kEvents.size(), handled_events_.at(2)->size());
+  EXPECT_EQ(kEvents.type(), handled_events_.at(2)->type());
   EXPECT_EQ(kEvents.dispatchType, WebInputEvent::Blocking);
   EXPECT_FALSE(last_touch_start_forced_nonblocking_due_to_fling());
   last_touch_event =
       static_cast<const WebTouchEvent*>(handled_events_.at(2).get());
   EXPECT_EQ(kEvents, *last_touch_event);
 
   kEvents.MovePoint(0, 30, 30);
   HandleEvent(kEvents, INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
   RunPendingTasksWithSimulatedRaf();
   EXPECT_FALSE(main_task_runner_->HasPendingTask());
   EXPECT_EQ(0u, event_queue().size());
   EXPECT_EQ(4u, handled_events_.size());
-  EXPECT_EQ(kEvents.size, handled_events_.at(3)->size);
-  EXPECT_EQ(kEvents.type, handled_events_.at(3)->type);
+  EXPECT_EQ(kEvents.size(), handled_events_.at(3)->size());
+  EXPECT_EQ(kEvents.type(), handled_events_.at(3)->type());
   EXPECT_EQ(kEvents.dispatchType, WebInputEvent::Blocking);
   EXPECT_FALSE(last_touch_start_forced_nonblocking_due_to_fling());
   last_touch_event =
       static_cast<const WebTouchEvent*>(handled_events_.at(3).get());
   EXPECT_EQ(kEvents, *last_touch_event);
 }
 
 // The boolean parameterized test varies whether rAF aligned input
 // is enabled or not.
 INSTANTIATE_TEST_CASE_P(
     MainThreadEventQueueTests,
     MainThreadEventQueueTest,
     testing::Range(0u,
                    (kRafAlignedEnabledTouch | kRafAlignedEnabledMouse) + 1));
 
 }  // namespace content