[Android] Remove zero length composing spans.

content/public/android/java/src/org/chromium/content/browser/ImeAdapter.java

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import android.content.Context;
 import android.os.Handler;
 import android.os.ResultReceiver;
 import android.text.Editable;
@@ skipping 531 matching lines @@
             }
 
             if (prevSelectionStart == selectionStart && prevSelectionEnd == selectionEnd
                     && prevCompositionStart == compositionStart
                     && prevCompositionEnd == compositionEnd) {
                 // Nothing has changed; don't need to do anything
                 return;
             }
 
             Selection.setSelection(editable, selectionStart, selectionEnd);
-            super.setComposingRegion(compositionStart, compositionEnd);
+
+            if (compositionStart == compositionEnd) {
+                removeComposingSpans(getEditable());

[nilesh, 2013/04/10 16:19:05]

Is there a reason to not use the local var 'editable' instead of calling
getEditable() ?

[Fredrik Öhrn, 2013/04/10 16:23:08]

Copy and paste laziness on my part, will fix.

+            } else {
+                super.setComposingRegion(compositionStart, compositionEnd);
+            }
 
             if (mIgnoreTextInputStateUpdates) return;
             updateSelection(selectionStart, selectionEnd, compositionStart, compositionEnd);
         }
 
         @VisibleForTesting
         protected void updateSelection(
                 int selectionStart, int selectionEnd,
                 int compositionStart, int compositionEnd) {
             // Avoid sending update if we sent an exact update already previously.
@@ skipping 172 matching lines @@
             getInputMethodManagerWrapper().restartInput(mInternalView);
             mIgnoreTextInputStateUpdates = false;
             mNumNestedBatchEdits = 0;
         }
 
         @Override
         public boolean setComposingRegion(int start, int end) {
             if (DEBUG) Log.w(TAG, "setComposingRegion [" + start + " " + end + "]");
             int a = Math.min(start, end);
             int b = Math.max(start, end);
-            super.setComposingRegion(a, b);
+            if (a == b) {
+                removeComposingSpans(getEditable());
+            } else {
+                super.setComposingRegion(a, b);
+            }
             return mImeAdapter.setComposingRegion(a, b);
         }
 
         boolean isActive() {
             return getInputMethodManagerWrapper().isActive(mInternalView);
         }
 
         void setIgnoreTextInputStateUpdates(boolean shouldIgnore) {
             mIgnoreTextInputStateUpdates = shouldIgnore;
             if (shouldIgnore) return;
@@ skipping 93 matching lines @@
             int before, int after);
 
     private native void nativeImeBatchStateChanged(int nativeImeAdapterAndroid, boolean isBegin);
 
     private native void nativeUnselect(int nativeImeAdapterAndroid);
     private native void nativeSelectAll(int nativeImeAdapterAndroid);
     private native void nativeCut(int nativeImeAdapterAndroid);
     private native void nativeCopy(int nativeImeAdapterAndroid);
     private native void nativePaste(int nativeImeAdapterAndroid);
 }