FilterInterpreter: make all filter interpreters subclasses.

Also, gives FilterInterpreter default implementations of a few
functions that just call next_, and deletes them from the various
interpreters.

With this CL, the only pointer to the next_ interpreter is in the
FilterInterpreter class.

Also, a few small edits to handle null pointers as a result of tests.

BUG=chromium-os:33122
TEST=All unittests pass

Change-Id: Iec508525abb894d3315dc9960efb26f783f4a7d7
Reviewed-on: https://gerrit.chromium.org/gerrit/28852
Reviewed-by: KuanYu Chu <chuwfuny@chromium.org>
Commit-Ready: Andrew de los Reyes <adlr@chromium.org>
Tested-by: Andrew de los Reyes <adlr@chromium.org>

1 files changed, 4 insertions, 15 deletions

diff --git a/src/click_wiggle_filter_interpreter.cc b/src/click_wiggle_filter_interpreter.cc
index c30f953..da0bd95 100644
--- a/src/click_wiggle_filter_interpreter.cc
+++ b/src/click_wiggle_filter_interpreter.cc
@@ -13,7 +13,8 @@ namespace gestures {
 // Takes ownership of |next|:
 ClickWiggleFilterInterpreter::ClickWiggleFilterInterpreter(
     PropRegistry* prop_reg, Interpreter* next)
-    : button_edge_occurred_(0.0),
+    : FilterInterpreter(next),
+      button_edge_occurred_(0.0),
       prev_buttons_(0),
       wiggle_max_dist_(prop_reg, "Wiggle Max Distance", 5.5),
       wiggle_suppress_timeout_(prop_reg, "Wiggle Timeout", 0.075),
@@ -22,11 +23,9 @@ ClickWiggleFilterInterpreter::ClickWiggleFilterInterpreter(
                                   0.75),
       one_finger_click_wiggle_timeout_(prop_reg,
                                        "One Finger Click Wiggle Timeout",
-                                       0.2) {
-  next_.reset(next);
-}
+                                       0.2) {}
 
-Gesture* ClickWiggleFilterInterpreter::SyncInterpret(HardwareState* hwstate,
+Gesture* ClickWiggleFilterInterpreter::SyncInterpretImpl(HardwareState* hwstate,
                                                      stime_t* timeout) {
   UpdateClickWiggle(*hwstate);
   SetWarpFlags(hwstate);
@@ -146,14 +145,4 @@ void ClickWiggleFilterInterpreter::SetWarpFlags(HardwareState* hwstate) const {
   }
 }
 
-Gesture* ClickWiggleFilterInterpreter::HandleTimer(stime_t now,
-                                                   stime_t* timeout) {
-  return next_->HandleTimer(now, timeout);
-}
-
-void ClickWiggleFilterInterpreter::SetHardwareProperties(
-    const HardwareProperties& hw_props) {
-  next_->SetHardwareProperties(hw_props);
-}
-
 }  // namespace gestures