Add a TouchEventStreamValidator

Add a TouchEventStreamValidator

Add touch stream validation similar to the existing gesture stream validation.
Also add validation of the *output* stream from the InputRouter (in addition to
the existing *input* stream validation).

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

[jdduke (slow), 2014-05-20 19:58:29]

tdresser@: PTAL.  I'm considering just merging the gesture/touch stream
validators into the InputEventStreamValidator.  The files aren't that long, and
being able to glance at the validation in a single file could be useful.

[tdresser, 2014-05-20 20:18:32]

LGTM

Does this actually pass on Android?
Aura has a ways to catch up in order to get valid event streams...

I'm a fan of keeping the validators for different event types in different
files, but I don't feel strongly about it.

[jdduke (slow), 2014-06-03 15:06:06]

tdresser@, would you mind taking another look? I've decided to allow hard
resetting of the touch stream, perhaps we can tighten that restriction in the
future but there are currently several parts of the pipeline where that can
occur.  I've also made it so we get all the diagnostic messages for a given
event, rather than just the first.

[tdresser, 2014-06-03 15:21:07]

LGTM, that's looking pretty solid!

https://codereview.chromium.org/290473006/diff/40001/content/common/input/inp...
File content/common/input/input_event_stream_validator.h (right):

https://codereview.chromium.org/290473006/diff/40001/content/common/input/inp...
content/common/input/input_event_stream_validator.h:20: // valid. Currently only
validates WebGestureEvents.
Update comment.

https://codereview.chromium.org/290473006/diff/40001/content/common/input/tou...
File content/common/input/touch_event_stream_validator.cc (right):

https://codereview.chromium.org/290473006/diff/40001/content/common/input/tou...
content/common/input/touch_event_stream_validator.cc:48: for (unsigned i = 0; i
< previous_event.touchesLength; ++i) {
We normally use size_t in this context, don't we? (And below)

[jdduke (slow), 2014-06-03 19:10:28]

https://codereview.chromium.org/290473006/diff/40001/content/common/input/inp...
File content/common/input/input_event_stream_validator.h (right):

https://codereview.chromium.org/290473006/diff/40001/content/common/input/inp...
content/common/input/input_event_stream_validator.h:20: // valid. Currently only
validates WebGestureEvents.
On 2014/06/03 15:21:07, tdresser wrote:
> Update comment.

Done.

https://codereview.chromium.org/290473006/diff/40001/content/common/input/tou...
File content/common/input/touch_event_stream_validator.cc (right):

https://codereview.chromium.org/290473006/diff/40001/content/common/input/tou...
content/common/input/touch_event_stream_validator.cc:48: for (unsigned i = 0; i
< previous_event.touchesLength; ++i) {
On 2014/06/03 15:21:07, tdresser wrote:
> We normally use size_t in this context, don't we? (And below)

Normally yeah, but touchesLength is unsigned in Blink =/

[jdduke (slow), 2014-06-03 19:10:46]

The CQ bit was checked by jdduke@chromium.org

[commit-bot: I haz the power, 2014-06-03 19:11:41]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/jdduke@chromium.org/290473006/60001

[commit-bot: I haz the power, 2014-06-03 22:45:01]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-03 22:45:02]

Failed to apply patch for content/common/input/input_event_stream_validator.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/common/input/input_event_stream_validator.cc
  Hunk #1 FAILED at 9.
  1 out of 1 hunk FAILED -- saving rejects to file
content/common/input/input_event_stream_validator.cc.rej

Patch:       content/common/input/input_event_stream_validator.cc
Index: content/common/input/input_event_stream_validator.cc
diff --git a/content/common/input/input_event_stream_validator.cc
b/content/common/input/input_event_stream_validator.cc
index
b7dcbc2c50183fa460f801cbd3b45168c19a4603..85ac42cb5cf8d6a4e4e0be6624249b9a2fe6f3d4
100644
--- a/content/common/input/input_event_stream_validator.cc
+++ b/content/common/input/input_event_stream_validator.cc
@@ -9,29 +9,40 @@
 #include "content/public/common/content_switches.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 
-namespace content {
-
 using blink::WebInputEvent;
 using blink::WebGestureEvent;
+using blink::WebTouchEvent;
 
-InputEventStreamValidator::InputEventStreamValidator() {
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  enabled_ = command_line->HasSwitch(switches::kValidateInputEventStream);
+namespace content {
+
+InputEventStreamValidator::InputEventStreamValidator()
+    : enabled_(CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kValidateInputEventStream)) {
 }
-InputEventStreamValidator::~InputEventStreamValidator() {}
 
-void InputEventStreamValidator::OnEvent(const WebInputEvent& event) {
+InputEventStreamValidator::~InputEventStreamValidator() {
+}
+
+void InputEventStreamValidator::Validate(const WebInputEvent& event) {
   if (!enabled_)
     return;
-  const char* error_message = NULL;
+
+  DCHECK(ValidateImpl(event, &error_msg_)) << error_msg_;
+}
+
+bool InputEventStreamValidator::ValidateImpl(const blink::WebInputEvent& event,
+                                             std::string* error_msg) {
+  DCHECK(error_msg);
   if (WebInputEvent::isGestureEventType(event.type)) {
-    const WebGestureEvent& gesture_event =
-        static_cast<const WebGestureEvent&>(event);
-    if (gesture_event.sourceDevice == blink::WebGestureEvent::Touchscreen) {
-      if (!gesture_validator_.Validate(gesture_event, &error_message))
-        NOTREACHED() << error_message;
-    }
+    const WebGestureEvent& gesture = static_cast<const
WebGestureEvent&>(event);
+    // TODO(jdduke): Validate touchpad gesture streams.
+    if (gesture.sourceDevice == blink::WebGestureDeviceTouchscreen)
+      return gesture_validator_.Validate(gesture, error_msg);
+  } else if (WebInputEvent::isTouchEventType(event.type)) {
+    const WebTouchEvent& touch = static_cast<const WebTouchEvent&>(event);
+    return touch_validator_.Validate(touch, error_msg);
   }
+  return true;
 }
 
 }  // namespace content

[jdduke (slow), 2014-06-03 23:09:57]

The CQ bit was checked by jdduke@chromium.org

[commit-bot: I haz the power, 2014-06-03 23:11:07]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/jdduke@chromium.org/290473006/80001

[commit-bot: I haz the power, 2014-06-04 09:16:18]

Change committed as 274740