touch: Cleanup touch-event mode switching on windows.

touch: Cleanup touch-event mode switching on windows.

On windows, chrome used to switch between raw-touch and gesture modes depending on
whether the touch-start event was processed by the renderer or not. But now, the
switch happens iff touch-events is enabled (using command-line flag) on appropriate
version of windows. So cleanup the relevant code.

BUG=138153
TBR=avi@chromium.org (content/port/)

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=161458

[sadrul, 2012-10-11 16:44:24]

Scott: Please review as the original author for this change.

Scott: Please review as OWNER

[scottmg, 2012-10-11 16:58:52]

otherwise, lgtm

http://codereview.chromium.org/11028144/diff/1/content/browser/renderer_host/...
File content/browser/renderer_host/render_widget_host_view_win.cc (right):

http://codereview.chromium.org/11028144/diff/1/content/browser/renderer_host/...
content/browser/renderer_host/render_widget_host_view_win.cc:996: void
RenderWidgetHostViewWin::UpdateDesiredTouchMode() {
could probably be simplified a  bit more, since it's only called OnCreate now?

[sadrul, 2012-10-11 17:02:08]

http://codereview.chromium.org/11028144/diff/1/content/browser/renderer_host/...
File content/browser/renderer_host/render_widget_host_view_win.cc (right):

http://codereview.chromium.org/11028144/diff/1/content/browser/renderer_host/...
content/browser/renderer_host/render_widget_host_view_win.cc:996: void
RenderWidgetHostViewWin::UpdateDesiredTouchMode() {
On 2012/10/11 16:58:53, scottmg wrote:
> could probably be simplified a  bit more, since it's only called OnCreate now?

Perhaps. What simplification did you have in mind?

[scottmg, 2012-10-11 17:09:28]

http://codereview.chromium.org/11028144/diff/1/content/browser/renderer_host/...
File content/browser/renderer_host/render_widget_host_view_win.cc (right):

http://codereview.chromium.org/11028144/diff/1/content/browser/renderer_host/...
content/browser/renderer_host/render_widget_host_view_win.cc:996: void
RenderWidgetHostViewWin::UpdateDesiredTouchMode() {
On 2012/10/11 17:02:09, sadrul wrote:
> On 2012/10/11 16:58:53, scottmg wrote:
> > could probably be simplified a  bit more, since it's only called OnCreate
now?
> 
> Perhaps. What simplification did you have in mind?

Sorry, wasn't trying to be the riddler...

- SetToTouchMode could be inlined since there's only 2 work lines and the WIN7
guard is redundant
- the if ((touch_mode && ...) || (!touch_mode ...)) can be replaced with just
!touch_mode
- Is touch_events_enabled_ even required any more? (only ref'd in Cancel)

[sadrul, 2012-10-11 17:25:09]

http://codereview.chromium.org/11028144/diff/1/content/browser/renderer_host/...
File content/browser/renderer_host/render_widget_host_view_win.cc (right):

http://codereview.chromium.org/11028144/diff/1/content/browser/renderer_host/...
content/browser/renderer_host/render_widget_host_view_win.cc:996: void
RenderWidgetHostViewWin::UpdateDesiredTouchMode() {
On 2012/10/11 17:09:29, scottmg wrote:
> On 2012/10/11 17:02:09, sadrul wrote:
> > On 2012/10/11 16:58:53, scottmg wrote:
> > > could probably be simplified a  bit more, since it's only called OnCreate
> now?
> > 
> > Perhaps. What simplification did you have in mind?
> 
> Sorry, wasn't trying to be the riddler...
> 
> - SetToTouchMode could be inlined since there's only 2 work lines and the WIN7
> guard is redundant
> - the if ((touch_mode && ...) || (!touch_mode ...)) can be replaced with just
> !touch_mode
> - Is touch_events_enabled_ even required any more? (only ref'd in Cancel)

Ah, indeed. I have made the following changes:
 - Moved code from SetToTouchMode and SetToGestureMode into
UpdateDesiredTouchMode
 - simplified the 'if ((touch_mode...' check as you suggested

I have kept touch_events_enabled_ though, since it looks like it may be possible
that RegisterTouchWindow() may not always return TRUE (and used to check whether
or not to send fake-mouse-events-from-touch to the renderer).

[scottmg, 2012-10-11 17:28:48]

lgtm

[sky, 2012-10-11 17:42:31]

LGTM

[sadrul, 2012-10-11 18:19:06]

+avi for content/port/OWNERS

[sadrul, 2012-10-12 00:20:03]

TBR'ing the trivial change in content/port/