Correct behaviour of touch wrt mouse capture.

Correct behaviour of touch wrt mouse capture.

We short circuit emulated mouse events (they are emulated on a touch) so
that these events don't get passed to javascript. The short circuit logic
also short-circuited the mouse capture/release logic, which caused failure
when touch happened during a mouse-capture.  

This commit ensures that only the call to ForwardMouseEvent is short-
circuited for emulated events.

BUG=132068
TEST=


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=148547

[sky, 2012-07-24 16:41:40]

https://chromiumcodereview.appspot.com/10802085/diff/1/content/browser/render...
File content/browser/renderer_host/render_widget_host_view_win.cc (right):

https://chromiumcodereview.appspot.com/10802085/diff/1/content/browser/render...
content/browser/renderer_host/render_widget_host_view_win.cc:296: bool
IsEmulatedMouseEvent(UINT message) {
Move this to ui/base/win/events_win.h/events_win.cc and make this and
native_widget_win share the implementation. It should also be named more
descriptively. Maybe IsMouseEventFromTouch or something.

[girard, 2012-07-24 19:49:01]

Factored common code out of RWHVW and NWW.

https://chromiumcodereview.appspot.com/10802085/diff/1/content/browser/render...
File content/browser/renderer_host/render_widget_host_view_win.cc (right):

https://chromiumcodereview.appspot.com/10802085/diff/1/content/browser/render...
content/browser/renderer_host/render_widget_host_view_win.cc:296: bool
IsEmulatedMouseEvent(UINT message) {
On 2012/07/24 16:41:40, sky wrote:
> Move this to ui/base/win/events_win.h/events_win.cc and make this and
> native_widget_win share the implementation. It should also be named more
> descriptively. Maybe IsMouseEventFromTouch or something.

Done.

[flackr, 2012-07-24 19:53:04]

LGTM

https://chromiumcodereview.appspot.com/10802085/diff/4001/ui/views/widget/nat...
File ui/views/widget/native_widget_win.cc (right):

https://chromiumcodereview.appspot.com/10802085/diff/4001/ui/views/widget/nat...
ui/views/widget/native_widget_win.cc:1631: if (!touch_ids_.empty() ||
base::win::IsMouseEventFromTouch(message)) {
nit: no braces for single line if statement.

[sky, 2012-07-24 21:36:25]

https://chromiumcodereview.appspot.com/10802085/diff/4001/base/win/win_util.h
File base/win/win_util.h (right):

https://chromiumcodereview.appspot.com/10802085/diff/4001/base/win/win_util.h...
base/win/win_util.h:61: // Windows emulates mouse messages for touch events.
Returns true if |message| identifies a mouse event that was generated as the
result of a touch event.

https://chromiumcodereview.appspot.com/10802085/diff/4001/content/browser/ren...
File content/browser/renderer_host/render_widget_host_view_win.cc (right):

https://chromiumcodereview.appspot.com/10802085/diff/4001/content/browser/ren...
content/browser/renderer_host/render_widget_host_view_win.cc:2912: if
(!(touch_events_enabled_ && base::win::IsMouseEventFromTouch(message))) {
nit: !touch_events_enabled || !IsMouseEventFromTouch
is easier to read.

[girard, 2012-07-24 23:54:54]

Thanks for the feedback.  CL updated.

https://chromiumcodereview.appspot.com/10802085/diff/4001/base/win/win_util.h
File base/win/win_util.h (right):

https://chromiumcodereview.appspot.com/10802085/diff/4001/base/win/win_util.h...
base/win/win_util.h:61: // Windows emulates mouse messages for touch events.
On 2012/07/24 21:36:25, sky wrote:
> Returns true if |message| identifies a mouse event that was generated as the
> result of a touch event.

Done.

https://chromiumcodereview.appspot.com/10802085/diff/4001/content/browser/ren...
File content/browser/renderer_host/render_widget_host_view_win.cc (right):

https://chromiumcodereview.appspot.com/10802085/diff/4001/content/browser/ren...
content/browser/renderer_host/render_widget_host_view_win.cc:2912: if
(!(touch_events_enabled_ && base::win::IsMouseEventFromTouch(message))) {
On 2012/07/24 21:36:25, sky wrote:
> nit: !touch_events_enabled || !IsMouseEventFromTouch
> is easier to read.

Done.

https://chromiumcodereview.appspot.com/10802085/diff/4001/ui/views/widget/nat...
File ui/views/widget/native_widget_win.cc (right):

https://chromiumcodereview.appspot.com/10802085/diff/4001/ui/views/widget/nat...
ui/views/widget/native_widget_win.cc:1631: if (!touch_ids_.empty() ||
base::win::IsMouseEventFromTouch(message)) {
On 2012/07/24 19:53:04, flackr wrote:
> nit: no braces for single line if statement.

Done.

[sky, 2012-07-25 00:30:39]

LGTM

[commit-bot: I haz the power, 2012-07-25 00:36:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/girard@chromium.org/10802085/10001

[commit-bot: I haz the power, 2012-07-25 00:36:48]

Presubmit check for 10802085-10001 failed and returned exit status 1.

Running presubmit commit checks ...

** Presubmit Messages **
If this change requires manual test instructions to QA team, add
TEST=[instructions].

** Presubmit ERRORS **
Missing LGTM from an OWNER for files in these directories:
    base

Presubmit checks took 6.8s to calculate.

[sky, 2012-07-25 00:50:11]

https://chromiumcodereview.appspot.com/10802085/diff/10001/base/win/win_util.h
File base/win/win_util.h (right):

https://chromiumcodereview.appspot.com/10802085/diff/10001/base/win/win_util....
base/win/win_util.h:8: // In general, you should not be adding stuff to this
file.
See this comment. Put the function in ui/base/win/events_win.h/events_win.cc .

[girard, 2012-07-25 22:08:29]

https://chromiumcodereview.appspot.com/10802085/diff/10001/base/win/win_util.h
File base/win/win_util.h (right):

https://chromiumcodereview.appspot.com/10802085/diff/10001/base/win/win_util....
base/win/win_util.h:8: // In general, you should not be adding stuff to this
file.
On 2012/07/25 00:50:11, sky wrote:
> See this comment. Put the function in ui/base/win/events_win.h/events_win.cc .

Thanks.  Done.

[sky, 2012-07-26 00:14:25]

LGTM

[commit-bot: I haz the power, 2012-07-26 12:32:57]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/girard@chromium.org/10802085/13002

[commit-bot: I haz the power, 2012-07-26 14:00:30]

Change committed as 148547