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

Unified Diff: content/renderer/render_widget_unittest.cc

Issue 2273703002: Force events to be non blocking if main thread is unresponsive. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Dave's comments. Created 4 years, 4 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 4095fa50f7ab66492f10511539c691d02e4b0f79..59a8695a8c7cfbbac38b1b84e3b39ae0407c6496 100644
--- a/content/renderer/render_widget_unittest.cc
+++ b/content/renderer/render_widget_unittest.cc
@@ -29,6 +29,8 @@ namespace {
const char* EVENT_LISTENER_RESULT_HISTOGRAM = "Event.PassiveListeners";
+// Keep in sync with enum defined in
+// RenderWidgetInputHandler::LogPassiveEventListenersUma.
enum {
PASSIVE_LISTENER_UMA_ENUM_PASSIVE,
PASSIVE_LISTENER_UMA_ENUM_UNCANCELABLE,
@@ -36,6 +38,7 @@ enum {
PASSIVE_LISTENER_UMA_ENUM_CANCELABLE,
PASSIVE_LISTENER_UMA_ENUM_CANCELABLE_AND_CANCELED,
PASSIVE_LISTENER_UMA_ENUM_FORCED_NON_BLOCKING_DUE_TO_FLING,
+ PASSIVE_LISTENER_UMA_ENUM_FORCED_NON_BLOCKING_DUE_TO_MAIN_THREAD_RESPONSIVENESS,
PASSIVE_LISTENER_UMA_ENUM_COUNT
};
@@ -284,7 +287,7 @@ TEST_F(RenderWidgetUnittest, RenderWidgetInputEventUmaMetrics) {
touch.touchStartOrFirstTouchMove = true;
EXPECT_CALL(*widget()->mock_webwidget(), handleInputEvent(_))
- .Times(5)
+ .Times(7)
.WillRepeatedly(
::testing::Return(blink::WebInputEventResult::NotHandled));
@@ -320,6 +323,24 @@ TEST_F(RenderWidgetUnittest, RenderWidgetInputEventUmaMetrics) {
EVENT_LISTENER_RESULT_HISTOGRAM,
PASSIVE_LISTENER_UMA_ENUM_FORCED_NON_BLOCKING_DUE_TO_FLING, 2);
+ touch.dispatchType = blink::WebInputEvent::DispatchType::
+ ListenersForcedNonBlockingDueToMainThreadResponsiveness;
+ widget()->SendInputEvent(touch);
+ histogram_tester().ExpectBucketCount(
+ EVENT_LISTENER_RESULT_HISTOGRAM,
+ PASSIVE_LISTENER_UMA_ENUM_FORCED_NON_BLOCKING_DUE_TO_MAIN_THREAD_RESPONSIVENESS,
+ 1);
+
+ touch.MovePoint(0, 10, 10);
+ touch.touchStartOrFirstTouchMove = true;
+ touch.dispatchType = blink::WebInputEvent::DispatchType::
+ ListenersForcedNonBlockingDueToMainThreadResponsiveness;
+ widget()->SendInputEvent(touch);
+ histogram_tester().ExpectBucketCount(
+ EVENT_LISTENER_RESULT_HISTOGRAM,
+ PASSIVE_LISTENER_UMA_ENUM_FORCED_NON_BLOCKING_DUE_TO_MAIN_THREAD_RESPONSIVENESS,
+ 2);
+
EXPECT_CALL(*widget()->mock_webwidget(), handleInputEvent(_))
.WillOnce(
::testing::Return(blink::WebInputEventResult::HandledSuppressed));

Powered by Google App Engine
This is Rietveld 408576698