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

Unified Diff: content/renderer/input/input_event_filter_unittest.cc

Issue 2734563002: Re-enable passthrough touch event queue. (Closed)
Patch Set: Created 3 years, 10 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/input/input_event_filter_unittest.cc
diff --git a/content/renderer/input/input_event_filter_unittest.cc b/content/renderer/input/input_event_filter_unittest.cc
index 1076f628248a809bdbe34532684e4f99eadedbfe..403f8a8f7f39c27eb7f06b99323e9af9a9c7227a 100644
--- a/content/renderer/input/input_event_filter_unittest.cc
+++ b/content/renderer/input/input_event_filter_unittest.cc
@@ -18,6 +18,7 @@
#include "content/common/input/synthetic_web_input_event_builders.h"
#include "content/common/input_messages.h"
#include "content/common/view_messages.h"
+#include "content/public/common/content_features.h"
#include "content/renderer/input/input_event_filter.h"
#include "content/renderer/input/input_handler_manager.h"
#include "ipc/ipc_listener.h"
@@ -36,6 +37,12 @@ namespace {
const int kTestRoutingID = 13;
+bool ShouldBlockEventStream(const blink::WebInputEvent& event) {
+ return ui::WebInputEventTraits::ShouldBlockEventStream(
+ event,
+ base::FeatureList::IsEnabled(features::kRafAlignedTouchInputEvents));
+}
tdresser 2017/03/06 14:24:08 Should we share the definition of this method?
dtapuska 2017/03/06 14:29:48 I figured it would be gone in cleanup eventually.
+
class InputEventRecorder : public content::InputHandlerManager {
public:
InputEventRecorder(InputEventFilter* filter)
@@ -137,7 +144,7 @@ void AddEventsToFilter(IPC::MessageFilter* message_filter,
messages.push_back(InputMsg_HandleInputEvent(
kTestRoutingID, &events[i], std::vector<const WebInputEvent*>(),
ui::LatencyInfo(),
- ui::WebInputEventTraits::ShouldBlockEventStream(events[i])
+ ShouldBlockEventStream(events[i])
? InputEventDispatchType::DISPATCH_TYPE_BLOCKING
: InputEventDispatchType::DISPATCH_TYPE_NON_BLOCKING));
}
@@ -274,7 +281,7 @@ TEST_F(InputEventFilterTest, PreserveRelativeOrder) {
messages.push_back(InputMsg_HandleInputEvent(
kTestRoutingID, &mouse_down, std::vector<const WebInputEvent*>(),
ui::LatencyInfo(),
- ui::WebInputEventTraits::ShouldBlockEventStream(mouse_down)
+ ShouldBlockEventStream(mouse_down)
? InputEventDispatchType::DISPATCH_TYPE_BLOCKING
: InputEventDispatchType::DISPATCH_TYPE_NON_BLOCKING));
// Control where input events are delivered.
@@ -305,7 +312,7 @@ TEST_F(InputEventFilterTest, PreserveRelativeOrder) {
messages.push_back(InputMsg_HandleInputEvent(
kTestRoutingID, &mouse_up, std::vector<const WebInputEvent*>(),
ui::LatencyInfo(),
- ui::WebInputEventTraits::ShouldBlockEventStream(mouse_up)
+ ShouldBlockEventStream(mouse_up)
? InputEventDispatchType::DISPATCH_TYPE_BLOCKING
: InputEventDispatchType::DISPATCH_TYPE_NON_BLOCKING));
AddMessagesToFilter(filter_.get(), messages);
« no previous file with comments | « content/browser/renderer_host/input/input_router_impl_unittest.cc ('k') | content/renderer/render_widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698