am ae5ebb06: am 93114fa0: am c4f6fc1e: Merge "Revert "[HW6] Split processing and applying the event."" into lmp-dev

* commit 'ae5ebb06cdcc89c6ae8c959dda89ca1cd5165fe3':
  Revert "[HW6] Split processing and applying the event."

1 files changed, 2 insertions, 10 deletions

diff --git a/java/src/com/android/inputmethod/event/CombinerChain.java b/java/src/com/android/inputmethod/event/CombinerChain.java
index 8c6b3d949..61bc11b39 100644
--- a/java/src/com/android/inputmethod/event/CombinerChain.java
+++ b/java/src/com/android/inputmethod/event/CombinerChain.java
@@ -81,11 +81,11 @@ public class CombinerChain {
     }
 
     /**
-     * Process an event through the combining chain, and return a processed event to apply.
+     * Pass a new event through the whole chain.
      * @param previousEvents the list of previous events in this composition
      * @param newEvent the new event to process
      */
-    public Event processEvent(final ArrayList<Event> previousEvents, final Event newEvent) {
+    public void processEvent(final ArrayList<Event> previousEvents, final Event newEvent) {
         final ArrayList<Event> modifiablePreviousEvents = new ArrayList<>(previousEvents);
         Event event = newEvent;
         for (final Combiner combiner : mCombiners) {
@@ -97,14 +97,6 @@ public class CombinerChain {
                 break;
             }
         }
-        return event;
-    }
-
-    /**
-     * Apply a processed event.
-     * @param event the event to be applied
-     */
-    public void applyProcessedEvent(final Event event) {
         if (null != event) {
             // TODO: figure out the generic way of doing this
             if (Constants.CODE_DELETE == event.mKeyCode) {