Store suggestions from Android spellchecker in spelling markers

components/spellcheck/browser/android/java/src/org/chromium/components/spellcheck/SpellCheckerSessionBridge.java

 // Copyright 2015 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.components.spellcheck;
 
 import android.content.Context;
 import android.os.SystemClock;
 import android.view.textservice.SentenceSuggestionsInfo;
 import android.view.textservice.SpellCheckerSession;
@@ skipping 88 matching lines @@
     @Override
     public void onGetSentenceSuggestions(SentenceSuggestionsInfo[] results) {
         mStopMs = SystemClock.elapsedRealtime();
 
         if (mNativeSpellCheckerSessionBridge == 0) {
             return;
         }
 
         ArrayList<Integer> offsets = new ArrayList<Integer>();
         ArrayList<Integer> lengths = new ArrayList<Integer>();
+        ArrayList<String[]> suggestions = new ArrayList<String[]>();
 
         for (SentenceSuggestionsInfo result : results) {
             if (result == null) {
                 // In some cases null can be returned by the selected spellchecking service,
                 // see crbug.com/651458. In this case skip to next result to avoid a
                 // NullPointerException later on.
                 continue;
             }
             for (int i = 0; i < result.getSuggestionsCount(); i++) {
                 // If a word looks like a typo, record its offset and length.
                 if ((result.getSuggestionsInfoAt(i).getSuggestionsAttributes()
                         & SuggestionsInfo.RESULT_ATTR_LOOKS_LIKE_TYPO)
                         == SuggestionsInfo.RESULT_ATTR_LOOKS_LIKE_TYPO) {
                     offsets.add(result.getOffsetAt(i));
                     lengths.add(result.getLengthAt(i));
+                    SuggestionsInfo info = result.getSuggestionsInfoAt(i);
+                    ArrayList<String> suggestions_for_word = new ArrayList<String>();
+                    for (int j = 0; j < info.getSuggestionsCount(); ++j) {
+                        suggestions_for_word.add(info.getSuggestionAt(j));
+                    }
+                    suggestions.add(
+                            suggestions_for_word.toArray(new String[suggestions_for_word.size()]));
                 }
             }
         }
         nativeProcessSpellCheckResults(mNativeSpellCheckerSessionBridge,
-                convertListToArray(offsets), convertListToArray(lengths));
+                convertListToArray(offsets), convertListToArray(lengths),
+                suggestions.toArray(new String[suggestions.size()][]));
 
         RecordHistogram.recordTimesHistogram("SpellCheck.Android.Latency",
                 mStopMs - mStartMs, TimeUnit.MILLISECONDS);
     }
 
     /**
      * Helper method to convert an ArrayList of Integer objects into an array of primitive ints
      * for easier JNI handling of these objects on the native side.
      * @param list List to be converted to an array.
      */
     private int[] convertListToArray(ArrayList<Integer> list) {
         int[] array = new int[list.size()];
         for (int index = 0; index < array.length; index++) {
             array[index] = list.get(index).intValue();
         }
         return array;
     }
 
     @Override
     public void onGetSuggestions(SuggestionsInfo[] results) {}
 
-    private native void nativeProcessSpellCheckResults(
-            long nativeSpellCheckerSessionBridge, int[] offsets, int[] lengths);
+    private native void nativeProcessSpellCheckResults(long nativeSpellCheckerSessionBridge,
+            int[] offsets, int[] lengths, String[][] suggestions);
 }