Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(238)

Unified Diff: content/renderer/render_widget_unittest.cc

Issue 2621303004: Keep track of coalesced events in main thread event queue (Closed)
Patch Set: Rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_widget_unittest.cc
diff --git a/content/renderer/render_widget_unittest.cc b/content/renderer/render_widget_unittest.cc
index d06bc55c520564caa9d8b68d1f9ab062ed32a5fb..6d227f8bd7768aaef2d9bd8a646e8eb24bde34cb 100644
--- a/content/renderer/render_widget_unittest.cc
+++ b/content/renderer/render_widget_unittest.cc
@@ -19,7 +19,7 @@
#include "ipc/ipc_test_sink.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/platform/WebInputEvent.h"
+#include "third_party/WebKit/public/platform/WebCoalescedInputEvent.h"
#include "third_party/WebKit/public/web/WebDeviceEmulationParams.h"
#include "ui/events/base_event_utils.h"
#include "ui/events/blink/web_input_event_traits.h"
@@ -48,8 +48,9 @@ enum {
class MockWebWidget : public blink::WebWidget {
public:
- MOCK_METHOD1(handleInputEvent,
- blink::WebInputEventResult(const blink::WebInputEvent&));
+ MOCK_METHOD1(
+ handleInputEvent,
+ blink::WebInputEventResult(const blink::WebCoalescedInputEvent&));
};
} // namespace
@@ -74,7 +75,7 @@ class InteractiveRenderWidget : public RenderWidget {
void SendInputEvent(const blink::WebInputEvent& event) {
OnHandleInputEvent(
- &event, ui::LatencyInfo(),
+ &event, std::vector<const blink::WebInputEvent*>(), ui::LatencyInfo(),
ui::WebInputEventTraits::ShouldBlockEventStream(event)
? InputEventDispatchType::DISPATCH_TYPE_BLOCKING
: InputEventDispatchType::DISPATCH_TYPE_NON_BLOCKING);

Powered by Google App Engine
This is Rietveld 408576698