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

Unified Diff: content/browser/site_per_process_browsertest.cc

Issue 2632263002: Address creis@'s suggestions for issue 2633723002. (Closed)
Patch Set: 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
« no previous file with comments | « content/browser/renderer_host/input/input_router_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/site_per_process_browsertest.cc
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
index 5802527a02c1ab9e61ac9b9b3b68d4e5dc47ba27..e95cf0d6c7d5412c800e86b086920f93dafa866e 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -5384,6 +5384,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
// aren't at present, and if they become the same this test will need to be
// updated to accommodate.
EXPECT_NE(TOUCH_ACTION_AUTO, TOUCH_ACTION_NONE);
+
// Verify the child's input router is initially set for TOUCH_ACTION_AUTO. The
// TouchStart event will trigger TOUCH_ACTION_NONE being sent back to the
// browser.
@@ -5391,7 +5392,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
root->child_at(0)->current_frame_host()->GetRenderWidgetHost();
InputRouterImpl* child_input_router =
static_cast<InputRouterImpl*>(child_render_widget_host->input_router());
- EXPECT_EQ(TOUCH_ACTION_AUTO, child_input_router->allowed_touch_action());
+ EXPECT_EQ(TOUCH_ACTION_AUTO,
+ child_input_router->touch_action_filter_.allowed_touch_action());
// Simulate touch event to sub-frame.
gfx::Point child_center(150, 150);
@@ -5410,7 +5412,8 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
// Verify the presence of the touch handler in the child frame correctly
// propagates touch-action:none information back to the child's input router.
- EXPECT_EQ(TOUCH_ACTION_NONE, child_input_router->allowed_touch_action());
+ EXPECT_EQ(TOUCH_ACTION_NONE,
+ child_input_router->touch_action_filter_.allowed_touch_action());
}
namespace {
« no previous file with comments | « content/browser/renderer_host/input/input_router_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698