content/browser/renderer_host/render_widget_host_impl.cc - Issue 821223002: Pass gesture detector config type when enabling touch emulator.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 821223002: Pass gesture detector config type when enabling touch emulator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@touch-emulator-enabled

Patch Set: Fixed cursor reset, rebased Created 5 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/render_widget_host_impl.h ('k') | content/browser/renderer_host/render_widget_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_impl.cc

diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc

index 8513644817c5e9004456b687bf0a6c2b779f8ea4..2d695c3d0d42b804dcc5c9295ac012a97d1f70dd 100644

--- a/content/browser/renderer_host/render_widget_host_impl.cc

+++ b/content/browser/renderer_host/render_widget_host_impl.cc

@@ -1587,11 +1587,12 @@ void RenderWidgetHostImpl::OnSetCursor(const WebCursor& cursor) {

SetCursor(cursor);

}

-void RenderWidgetHostImpl::SetTouchEventEmulationEnabled(bool enabled) {

+void RenderWidgetHostImpl::SetTouchEventEmulationEnabled(

+ bool enabled, ui::GestureProviderConfigType config_type) {

if (enabled) {

if (!touch_emulator_)

touch_emulator_.reset(new TouchEmulator(this));

- touch_emulator_->Enable();

+ touch_emulator_->Enable(config_type);

} else {

if (touch_emulator_)

touch_emulator_->Disable();