Optimizing DateTimeAndroid and ColorChooserAndroid initializations.

components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java

 // Copyright 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.components.web_contents_delegate_android;
 
 import android.content.Context;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
-import org.chromium.content.browser.ContentViewCore;
 import org.chromium.ui.ColorPickerDialog;
 import org.chromium.ui.ColorSuggestion;
 import org.chromium.ui.OnColorChangedListener;
+import org.chromium.ui.base.WindowAndroid;
 
 /**
  * ColorChooserAndroid communicates with the java ColorPickerDialog and the
  * native color_chooser_android.cc
  */
 @JNINamespace("web_contents_delegate_android")
 public class ColorChooserAndroid {
     private final ColorPickerDialog mDialog;
     private final long mNativeColorChooserAndroid;
 
@@ skipping 16 matching lines @@
     }
 
     @CalledByNative
     public void closeColorChooser() {
         mDialog.dismiss();
     }
 
     @CalledByNative
     public static ColorChooserAndroid createColorChooserAndroid(
             long nativeColorChooserAndroid,
-            ContentViewCore contentViewCore,
+            WindowAndroid windowAndroid,
             int initialColor,
             ColorSuggestion[] suggestions) {
         ColorChooserAndroid chooser = new ColorChooserAndroid(nativeColorChooserAndroid,
-                contentViewCore.getContext(), initialColor, suggestions);
+                windowAndroid.getActivity().get(), initialColor, suggestions);

[Ted C, 2014/10/30 00:01:01]

.getActivity().get() can be null in the case of WebView which was not created
with the activity context or if this is called as the activity is garbage
collected, neither of which are very likely cases, but it might be worth
handling it.

Maybe in this case, you could return null from this method if .get() returns
null.  Then in native, you could just call OnColorChosen with the initial color.

I don't know if this will work, but it would be good to try (even just forcing
it to happen to make sure it doesn't crash) to handle this odd cases.

The same will apply in the date time picker.

[AKVT, 2014/10/30 18:26:02]

Done. Thank you

         chooser.openColorChooser();
         return chooser;
     }
 
     @CalledByNative
     private static ColorSuggestion[] createColorSuggestionArray(int size) {
         return new ColorSuggestion[size];
     }
 
     /**
      * @param array ColorSuggestion array that should get a new suggestion added.
      * @param index Index in the array where to place a new suggestion.
      * @param color Color of the suggestion.
      * @param label Label of the suggestion.
      */
     @CalledByNative
     private static void addToColorSuggestionArray(ColorSuggestion[] array, int index,
             int color, String label) {
         array[index] = new ColorSuggestion(color, label);
     }
 
     // Implemented in color_chooser_android.cc
     private native void nativeOnColorChosen(long nativeColorChooserAndroid, int color);
 }